@opengeni/db 5.0.1-canary.0 → 5.0.1-canary.1

package/dist/index.d.ts

@@ -5323,22 +5323,22 @@ export type SessionListSnapshotCursor = {
     offset: number;
     parentSessionFilter: string;
     search: string | null;
-    archiveMode: "active" | "archived";
+    archiveMode: "active" | "archived" | "all";
     /** Additive filter identity; absent on legacy snapshot cursors. */
     filter?: string;
 };
 export type SessionListKeysetCursor = {
     kind: "keyset";
     /** Absent on v2 cursors, which always used session updatedAt. */
-    sortBy?: "updatedAt" | "archivedAt";
+    sortBy?: "updatedAt" | "archivedAt" | "createdAt" | "name";
     /** Decimal committed workspace activity revision frozen on page one. */
     snapshotRevision: string;
-    /** Exact PostgreSQL timestamp text, including microseconds. */
+    /** Exact PostgreSQL timestamp (including microseconds), or normalized name for name order. */
     sortAt: string;
     id: string;
     parentSessionFilter: string;
     search: string | null;
-    archiveMode: "active" | "archived";
+    archiveMode: "active" | "archived" | "all";
     /** Canonical identity for channel, creator, and time-bound filters. */
     filter?: string;
 };
@@ -5372,6 +5372,8 @@ export type ListSessionsForSubjectOptions = ListSessionsOptions & SessionListFil
     pinsOnly?: boolean | undefined;
     /** List personally archived chats instead of active chats. */
     archivedOnly?: boolean | undefined;
+    sortBy?: "updatedAt" | "createdAt" | "name" | undefined;
+    archiveStatus?: "active" | "archived" | "all" | undefined;
     /** Return a continuation cursor. Disable for legacy one-page array reads. */
     materializeSnapshot?: boolean | undefined;
     authorizationScope?: SessionAuthorizationListScope | undefined;

package/dist/index.js

@@ -65069,7 +65069,10 @@ function sessionFilters(options) {
       and archive_state.session_id = ${sessions.rootSessionId}
       and archive_state.archived = true
   )`;
-  filters.push(options.archivedOnly ? archivedRoot : sql86`not (${archivedRoot})`);
+  const archiveStatus = options.archiveStatus ?? (options.archivedOnly ? "archived" : "active");
+  if (archiveStatus !== "all") {
+    filters.push(archiveStatus === "archived" ? archivedRoot : sql86`not (${archivedRoot})`);
+  }
   if (options.authorizationScope) {
     filters.push(sessionAuthorizationScopeFilter(options.authorizationScope));
   }
@@ -65214,7 +65217,8 @@ function encodeSessionListCursor(cursor) {
   return Buffer.from(
     JSON.stringify(
       cursor.kind === "keyset" ? {
-        version: cursor.sortBy === "archivedAt" ? 3 : 2,
+        version: 4,
+        sortBy: cursor.sortBy ?? "updatedAt",
         // Preserve the old cursor envelope until every pre-v2 replica has
         // rolled away. It resolves only to the typed expiry/rebase path.
         snapshotId: SESSION_LIST_KEYSET_LEGACY_SNAPSHOT_ID,
@@ -65244,15 +65248,16 @@ function decodeSessionListCursor(value) {
     const search = parsed.search;
     const archiveMode = parsed.archiveMode ?? "active";
     const filter = parsed.filter ?? "all";
-    const filtersAreValid = (parentSessionFilter === "all" || parentSessionFilter === "null" || typeof parentSessionFilter === "string" && UUID_PATTERN2.test(parentSessionFilter)) && (search === null || typeof search === "string" && search.length <= 200) && (archiveMode === "active" || archiveMode === "archived") && typeof filter === "string" && filter.length <= 2048;
+    const filtersAreValid = (parentSessionFilter === "all" || parentSessionFilter === "null" || typeof parentSessionFilter === "string" && UUID_PATTERN2.test(parentSessionFilter)) && (search === null || typeof search === "string" && search.length <= 200) && (archiveMode === "active" || archiveMode === "archived" || parsed.version === 4 && archiveMode === "all") && typeof filter === "string" && filter.length <= 2048;
     if (!filtersAreValid) return null;
-    if (parsed.version === 2 || parsed.version === 3) {
-      if (parsed.version === 3 && archiveMode !== "archived" || typeof parsed.snapshotRevision !== "string" || typeof parsed.sortAt !== "string" || !isSessionListCursorTimestamp(parsed.sortAt) || typeof parsed.id !== "string" || !UUID_PATTERN2.test(parsed.id)) {
+    if (parsed.version === 2 || parsed.version === 3 || parsed.version === 4) {
+      const sortBy = parsed.version === 4 ? parsed.sortBy : parsed.version === 3 ? "archivedAt" : "updatedAt";
+      if (!["updatedAt", "createdAt", "name", "archivedAt"].includes(sortBy) || sortBy === "archivedAt" && archiveMode !== "archived" || typeof parsed.snapshotRevision !== "string" || typeof parsed.sortAt !== "string" || sortBy !== "name" && !isSessionListCursorTimestamp(parsed.sortAt) || sortBy === "name" && (parsed.sortAt.length > 1e4 || parsed.sortAt.includes("\0")) || typeof parsed.id !== "string" || !UUID_PATTERN2.test(parsed.id)) {
         return null;
       }
       return {
         kind: "keyset",
-        ...parsed.version === 3 ? { sortBy: "archivedAt" } : {},
+        ...parsed.version !== 2 ? { sortBy } : {},
         snapshotRevision: normalizeSessionActivityRevision(
           parsed.snapshotRevision,
           "cursor snapshot revision"
@@ -65265,6 +65270,7 @@ function decodeSessionListCursor(value) {
         filter
       };
     }
+    if (parsed.version !== void 0) return null;
     const offset = parsed.offset;
     if (typeof parsed.snapshotId !== "string" || !UUID_PATTERN2.test(parsed.snapshotId) || typeof offset !== "number" || !Number.isSafeInteger(offset) || offset < 0) {
       return null;
@@ -65316,21 +65322,28 @@ async function listSessionsForSubject(db, workspaceId, options) {
           tx,
           workspaceId
         );
+        const archiveMode = options.archiveStatus ?? (options.archivedOnly ? "archived" : "active");
+        const sortBy = options.sortBy ?? (archiveMode === "archived" ? "archivedAt" : "updatedAt");
+        if (options.archivedOnly && archiveMode !== "archived") {
+          throw new SessionListCursorError("archivedOnly conflicts with archiveStatus");
+        }
         const filters = [eq56(sessions.workspaceId, workspaceId), ...sessionFilters(options)];
-        const ordinaryPinFilter = options.archivedOnly ? sql86`true` : or12(isNull16(sessionPins.id), eq56(sessionPins.pinned, false));
+        const ordinaryPinFilter = archiveMode === "archived" ? sql86`true` : or12(isNull16(sessionPins.id), eq56(sessionPins.pinned, false));
         const parentFilter = sessionParentFilter(options.parentSessionId);
         const searchFilter = sessionSearchFilter(options.search);
-        const archiveMode = options.archivedOnly ? "archived" : "active";
-        const ordinarySortAt = options.archivedOnly ? sql86`(select archive_order.archived_at
+        const archiveSortAt = sql86`(select archive_order.archived_at
               from ${sessionPins} archive_order
               where archive_order.workspace_id = ${sessions.workspaceId}
                 and archive_order.subject_id = ${options.subjectId}
                 and archive_order.session_id = ${sessions.rootSessionId}
-                and archive_order.archived = true)` : sessions.updatedAt;
-        const exactOrdinarySortAt = sql86`to_char(${ordinarySortAt} at time zone 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`;
+                and archive_order.archived = true)`;
+        const ordinarySortAt = sortBy === "name" ? sql86`translate(btrim(coalesce(${sessions.title}, '')), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') collate "C"` : sortBy === "createdAt" ? sessions.createdAt : sortBy === "archivedAt" ? archiveSortAt : sessions.updatedAt;
+        const exactOrdinarySortAt = sortBy === "name" ? sql86`${ordinarySortAt}` : sql86`to_char(${ordinarySortAt} at time zone 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`;
+        const exactArchiveSortAt = archiveMode === "active" ? sql86`null` : sql86`to_char(${archiveSortAt} at time zone 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`;
+        const ordinaryOrder = sortBy === "name" ? [asc22(ordinarySortAt), asc22(sessions.id)] : [desc22(ordinarySortAt), desc22(sessions.id)];
         const listFilter = sessionListFilterIdentity(options);
         const now = /* @__PURE__ */ new Date();
-        if (options.pinsOnly && options.archivedOnly) {
+        if (options.pinsOnly && archiveMode === "archived") {
           throw new SessionListCursorError(
             "pins-only and archived session lists cannot be combined"
           );
@@ -65338,13 +65351,14 @@ async function listSessionsForSubject(db, workspaceId, options) {
         if (options.pinsOnly && options.cursor) {
           throw new SessionListCursorError("pins-only session lists do not accept a cursor");
         }
-        if (options.cursor && options.cursor.archiveMode === "archived" && (options.cursor.kind === "snapshot" || options.cursor.sortBy !== "archivedAt")) {
+        if (options.cursor && (options.cursor.kind === "snapshot" && (sortBy !== "updatedAt" || archiveMode !== "active") || options.cursor.kind === "keyset" && (options.cursor.sortBy ?? "updatedAt") !== sortBy)) {
           throw new SessionListCursorExpiredError();
         }
         let pageIds;
         let selectedOrdinaryRows;
         let nextCursor = null;
         const exactArchiveTimestamps = /* @__PURE__ */ new Map();
+        const exactOrdinaryTimestamps = /* @__PURE__ */ new Map();
         if (options.pinsOnly) {
           pageIds = [];
         } else if (options.cursor?.kind === "snapshot") {
@@ -65420,7 +65434,8 @@ async function listSessionsForSubject(db, workspaceId, options) {
             id: sessions.id,
             session: sessions,
             pin: sessionPins,
-            sortAt: exactOrdinarySortAt
+            sortAt: exactOrdinarySortAt,
+            archiveAt: exactArchiveSortAt
           }).from(sessions).leftJoin(
             sessionPins,
             and55(
@@ -65428,11 +65443,14 @@ async function listSessionsForSubject(db, workspaceId, options) {
               eq56(sessionPins.subjectId, options.subjectId),
               eq56(sessionPins.sessionId, sessions.id)
             )
-          ).where(and55(...filters, ordinaryPinFilter)).orderBy(desc22(ordinarySortAt), desc22(sessions.id)).limit(limit);
+          ).where(and55(...filters, ordinaryPinFilter)).orderBy(...ordinaryOrder).limit(limit);
           pageIds = ordinaryIdRows.map((row) => row.id);
           selectedOrdinaryRows = ordinaryIdRows;
-          if (options.archivedOnly) {
-            for (const row of ordinaryIdRows) exactArchiveTimestamps.set(row.id, row.sortAt);
+          if (sortBy === "updatedAt" || sortBy === "createdAt") {
+            for (const row of ordinaryIdRows) exactOrdinaryTimestamps.set(row.id, row.sortAt);
+          }
+          if (archiveMode !== "active") {
+            for (const row of ordinaryIdRows) exactArchiveTimestamps.set(row.id, row.archiveAt);
           }
         } else {
           const cursor = options.cursor?.kind === "keyset" ? options.cursor : void 0;
@@ -65440,7 +65458,13 @@ async function listSessionsForSubject(db, workspaceId, options) {
             throw new SessionListCursorError("session list cursor does not match its filters");
           }
           const snapshotRevision = cursor ? normalizeSessionActivityRevision(cursor.snapshotRevision, "cursor snapshot revision") : await readWorkspaceSessionActivityRevision(tx, workspaceId);
-          const cursorPredicate = cursor ? or12(
+          const cursorPredicate = cursor ? sortBy === "name" ? or12(
+            sql86`${ordinarySortAt} > ${cursor.sortAt}::text collate "C"`,
+            and55(
+              sql86`${ordinarySortAt} = ${cursor.sortAt}::text collate "C"`,
+              gt9(sessions.id, cursor.id)
+            )
+          ) : or12(
             sql86`${ordinarySortAt} < ${cursor.sortAt}::text::timestamptz`,
             and55(
               sql86`${ordinarySortAt} = ${cursor.sortAt}::text::timestamptz`,
@@ -65451,7 +65475,8 @@ async function listSessionsForSubject(db, workspaceId, options) {
             id: sessions.id,
             session: sessions,
             pin: sessionPins,
-            sortAt: exactOrdinarySortAt
+            sortAt: exactOrdinarySortAt,
+            archiveAt: exactArchiveSortAt
           }).from(sessions).leftJoin(
             sessionPins,
             and55(
@@ -65466,19 +65491,22 @@ async function listSessionsForSubject(db, workspaceId, options) {
               sql86`${sessions.activityRevision} <= ${snapshotRevision}::text::bigint`,
               cursorPredicate
             )
-          ).orderBy(desc22(ordinarySortAt), desc22(sessions.id)).limit(limit + 1);
+          ).orderBy(...ordinaryOrder).limit(limit + 1);
           const hasMore = ordinaryIdRows.length > limit;
           const page = ordinaryIdRows.slice(0, limit);
           pageIds = page.map((row) => row.id);
           selectedOrdinaryRows = page;
-          if (options.archivedOnly) {
-            for (const row of page) exactArchiveTimestamps.set(row.id, row.sortAt);
+          if (sortBy === "updatedAt" || sortBy === "createdAt") {
+            for (const row of page) exactOrdinaryTimestamps.set(row.id, row.sortAt);
+          }
+          if (archiveMode !== "active") {
+            for (const row of page) exactArchiveTimestamps.set(row.id, row.archiveAt);
           }
           const last = page.at(-1);
           if (hasMore && last) {
             nextCursor = encodeSessionListCursor({
               kind: "keyset",
-              ...options.archivedOnly ? { sortBy: "archivedAt" } : {},
+              sortBy,
               snapshotRevision,
               sortAt: last.sortAt,
               id: last.id,
@@ -65489,7 +65517,7 @@ async function listSessionsForSubject(db, workspaceId, options) {
             });
           }
         }
-        const pinnedLookaheadRows = options.archivedOnly ? [] : await tx.select({ session: sessions, pin: sessionPins }).from(sessionPins).innerJoin(sessions, eq56(sessions.id, sessionPins.sessionId)).where(
+        const pinnedLookaheadRows = archiveMode === "archived" ? [] : await tx.select({ session: sessions, pin: sessionPins }).from(sessionPins).innerJoin(sessions, eq56(sessions.id, sessionPins.sessionId)).where(
           and55(
             eq56(sessionPins.workspaceId, workspaceId),
             eq56(sessionPins.subjectId, options.subjectId),
@@ -65571,6 +65599,8 @@ async function listSessionsForSubject(db, workspaceId, options) {
                   },
                   { subjectId: options.subjectId, activated: tenancyActivated }
                 ),
+                ...sortBy === "updatedAt" && exactOrdinaryTimestamps.has(session.id) ? { updatedAt: exactOrdinaryTimestamps.get(session.id) } : {},
+                ...sortBy === "createdAt" && exactOrdinaryTimestamps.has(session.id) ? { createdAt: exactOrdinaryTimestamps.get(session.id) } : {},
                 treeStats: treeStats.get(session.id) ?? EMPTY_SESSION_TREE_STATS
               },
               requiresActionSince
@@ -65582,7 +65612,9 @@ async function listSessionsForSubject(db, workspaceId, options) {
           pinned: pinnedRows.map(mapListSession),
           pinnedTruncated,
           sessions: pageRows.map(mapListSession),
-          nextCursor
+          nextCursor,
+          sortBy,
+          archiveStatus: archiveMode
         };
       },
       { isolationLevel: "read committed" }