👥 feat: Admin Groups API Endpoints (#12387)

* feat: add listGroups and deleteGroup methods to userGroup

* feat: add admin groups handler factory and Express routes

* fix: address convention violations in admin groups handlers

* fix: address Copilot review findings in admin groups handlers

- Escape regex in listGroups to prevent injection/ReDoS
- Validate ObjectId format in all handlers accepting id/userId params
- Replace N+1 findUser loop with batched findUsers query
- Remove unused findGroupsByMemberId from dep interface
- Map Mongoose ValidationError to 400 in create/update handlers
- Validate name in updateGroupHandler (reject empty/whitespace)
- Handle null updateGroupById result (race condition)
- Tighten error message matching in add/remove member handlers

* test: add unit tests for admin groups handlers

* fix: address code review findings for admin groups

Atomic delete/update handlers (single DB trip), pass through
idOnTheSource, add removeMemberById for non-ObjectId members,
deduplicate member results, fix error message exposure, add hard
cap/sort to listGroups, replace GroupListFilter with Pick of
GroupFilterOptions, validate memberIds as array, trim name in
update, fix import order, and improve test hygiene with fresh
IDs per test.

* fix: cascade cleanup, pagination, and test coverage for admin groups

Add deleteGrantsForPrincipal to systemGrant data layer and wire cascade
cleanup (Config, AclEntry, SystemGrant) into deleteGroupHandler. Add
limit/offset pagination to getGroupMembers. Guard empty PATCH bodies with
400. Remove dead type guard and unnecessary type cast. Add 11 new tests
covering cascade delete, idempotent member removal, empty update, search
filter, 500 error paths, and pagination.

* fix: harden admin groups with cascade resilience, type safety, and fallback removal

Wrap cascade cleanup in inner try/catch so partial failure logs but still
returns 200 (group is already deleted). Replace Record<string, unknown> on
deleteAclEntries with proper typed filter. Log warning for unmapped user
ObjectIds in createGroup memberIds. Add removeMemberById fallback when
removeUserFromGroup throws User not found for ObjectId-format userId.
Extract VALID_GROUP_SOURCES constant. Add 3 new tests (60 total).

* refactor: add countGroups, pagination, and projection type to data layer

Extract buildGroupQuery helper, add countGroups method, support
limit/offset/skip in listGroups, standardize session handling to
.session(session ?? null), and tighten projection parameter from
Record<string, unknown> to Record<string, 0 | 1>.

* fix: cascade resilience, pagination, validation, and error clarity for admin groups

- Use Promise.allSettled for cascade cleanup so all steps run even if
  one fails; log individual rejections
- Echo deleted group id in delete response
- Add countGroups dep and wire limit/offset pagination for listGroups
- Deduplicate memberIds before computing total in getGroupMembers
- Use { memberIds: 1 } projection in getGroupMembers
- Cap memberIds at 500 entries in createGroup
- Reject search queries exceeding 200 characters
- Clarify addGroupMember error for non-ObjectId userId
- Document deleted-user fallback limitation in removeGroupMember

* test: extend handler and DB-layer test coverage for admin groups

Handler tests: projection assertion, dedup total, memberIds cap,
search max length, non-ObjectId memberIds passthrough, cascade partial
failure resilience, dedup scenarios, echo id in delete response.

DB-layer tests: listGroups sort/filter/pagination, countGroups,
deleteGroup, removeMemberById, deleteGrantsForPrincipal.

* fix: cast group principalId to ObjectId for ACL entry cleanup

deleteAclEntries is a thin deleteMany wrapper with no type casting,
but grantPermission stores group principalId as ObjectId. Passing the
raw string from req.params would leave orphaned ACL entries on group
deletion.

* refactor: remove redundant pagination clamping from DB listGroups

Handler already clamps limit/offset at the API boundary. The DB
method is a general-purpose building block and should not re-validate.

* fix: add source and name validation, import order, and test coverage for admin groups

- Validate source against VALID_GROUP_SOURCES in createGroupHandler
- Cap name at 500 characters in both create and update handlers
- Document total as upper bound in getGroupMembers response
- Document ObjectId requirement for deleteAclEntries in cascade
- Fix import ordering in test file (local value after type imports)
- Add tests for updateGroup with description, email, avatar fields
- Add tests for invalid source and name max-length in both handlers

* fix: add field length caps, flatten nested try/catch, and fix logger level in admin groups

Add max-length validation for description, email, avatar, and
idOnTheSource in create/update handlers. Extract removeObjectIdMember
helper to flatten nested try/catch per never-nesting convention. Downgrade
unmapped-memberIds log from error to warn. Fix type import ordering and
add missing await in removeMemberById for consistency.

api/server/index.js

@@ -144,6 +144,7 @@ const startServer = async () => {
   app.use('/api/auth', routes.auth);
   app.use('/api/admin', routes.adminAuth);
   app.use('/api/admin/config', routes.adminConfig);
+  app.use('/api/admin/groups', routes.adminGroups);
   app.use('/api/actions', routes.actions);
   app.use('/api/keys', routes.keys);
   app.use('/api/api-keys', routes.apiKeys);

api/server/routes/admin/groups.js

@@ -0,0 +1,41 @@
+const express = require('express');
+const { createAdminGroupsHandlers } = require('@librechat/api');
+const { SystemCapabilities } = require('@librechat/data-schemas');
+const { requireCapability } = require('~/server/middleware/roles/capabilities');
+const { requireJwtAuth } = require('~/server/middleware');
+const db = require('~/models');
+
+const router = express.Router();
+
+const requireAdminAccess = requireCapability(SystemCapabilities.ACCESS_ADMIN);
+const requireReadGroups = requireCapability(SystemCapabilities.READ_GROUPS);
+const requireManageGroups = requireCapability(SystemCapabilities.MANAGE_GROUPS);
+
+const handlers = createAdminGroupsHandlers({
+  listGroups: db.listGroups,
+  countGroups: db.countGroups,
+  findGroupById: db.findGroupById,
+  createGroup: db.createGroup,
+  updateGroupById: db.updateGroupById,
+  deleteGroup: db.deleteGroup,
+  addUserToGroup: db.addUserToGroup,
+  removeUserFromGroup: db.removeUserFromGroup,
+  removeMemberById: db.removeMemberById,
+  findUsers: db.findUsers,
+  deleteConfig: db.deleteConfig,
+  deleteAclEntries: db.deleteAclEntries,
+  deleteGrantsForPrincipal: db.deleteGrantsForPrincipal,
+});
+
+router.use(requireJwtAuth, requireAdminAccess);
+
+router.get('/', requireReadGroups, handlers.listGroups);
+router.post('/', requireManageGroups, handlers.createGroup);
+router.get('/:id', requireReadGroups, handlers.getGroup);
+router.patch('/:id', requireManageGroups, handlers.updateGroup);
+router.delete('/:id', requireManageGroups, handlers.deleteGroup);
+router.get('/:id/members', requireReadGroups, handlers.getGroupMembers);
+router.post('/:id/members', requireManageGroups, handlers.addGroupMember);
+router.delete('/:id/members/:userId', requireManageGroups, handlers.removeGroupMember);
+
+module.exports = router;

api/server/routes/index.js

@@ -3,6 +3,7 @@ const assistants = require('./assistants');
 const categories = require('./categories');
 const adminAuth = require('./admin/auth');
 const adminConfig = require('./admin/config');
+const adminGroups = require('./admin/groups');
 const endpoints = require('./endpoints');
 const staticRoute = require('./static');
 const messages = require('./messages');
@@ -33,6 +34,7 @@ module.exports = {
   auth,
   adminAuth,
   adminConfig,
+  adminGroups,
   keys,
   apiKeys,
   user,

packages/api/src/admin/groups.ts

@@ -0,0 +1,482 @@
+import { Types } from 'mongoose';
+import { PrincipalType } from 'librechat-data-provider';
+import { logger, isValidObjectIdString } from '@librechat/data-schemas';
+import type {
+  IGroup,
+  IUser,
+  IConfig,
+  CreateGroupRequest,
+  UpdateGroupRequest,
+  GroupFilterOptions,
+} from '@librechat/data-schemas';
+import type { FilterQuery, ClientSession, DeleteResult } from 'mongoose';
+import type { Response } from 'express';
+import type { ValidationError } from '~/types/error';
+import type { ServerRequest } from '~/types/http';
+
+type GroupListFilter = Pick<GroupFilterOptions, 'source' | 'search'>;
+
+const VALID_GROUP_SOURCES: ReadonlySet<string> = new Set(['local', 'entra']);
+const MAX_CREATE_MEMBER_IDS = 500;
+const MAX_SEARCH_LENGTH = 200;
+const MAX_NAME_LENGTH = 500;
+const MAX_DESCRIPTION_LENGTH = 2000;
+const MAX_EMAIL_LENGTH = 500;
+const MAX_AVATAR_LENGTH = 2000;
+const MAX_EXTERNAL_ID_LENGTH = 500;
+
+interface GroupIdParams {
+  id: string;
+}
+
+interface GroupMemberParams extends GroupIdParams {
+  userId: string;
+}
+
+export interface AdminGroupsDeps {
+  listGroups: (
+    filter?: GroupListFilter & { limit?: number; offset?: number },
+    session?: ClientSession,
+  ) => Promise<IGroup[]>;
+  countGroups: (filter?: GroupListFilter, session?: ClientSession) => Promise<number>;
+  findGroupById: (
+    groupId: string | Types.ObjectId,
+    projection?: Record<string, 0 | 1>,
+    session?: ClientSession,
+  ) => Promise<IGroup | null>;
+  createGroup: (groupData: Partial<IGroup>, session?: ClientSession) => Promise<IGroup>;
+  updateGroupById: (
+    groupId: string | Types.ObjectId,
+    data: Partial<Pick<IGroup, 'name' | 'description' | 'email' | 'avatar'>>,
+    session?: ClientSession,
+  ) => Promise<IGroup | null>;
+  deleteGroup: (
+    groupId: string | Types.ObjectId,
+    session?: ClientSession,
+  ) => Promise<IGroup | null>;
+  addUserToGroup: (
+    userId: string | Types.ObjectId,
+    groupId: string | Types.ObjectId,
+    session?: ClientSession,
+  ) => Promise<{ user: IUser; group: IGroup | null }>;
+  removeUserFromGroup: (
+    userId: string | Types.ObjectId,
+    groupId: string | Types.ObjectId,
+    session?: ClientSession,
+  ) => Promise<{ user: IUser; group: IGroup | null }>;
+  removeMemberById: (
+    groupId: string | Types.ObjectId,
+    memberId: string,
+    session?: ClientSession,
+  ) => Promise<IGroup | null>;
+  findUsers: (
+    searchCriteria: FilterQuery<IUser>,
+    fieldsToSelect?: string | string[] | null,
+  ) => Promise<IUser[]>;
+  deleteConfig: (
+    principalType: PrincipalType,
+    principalId: string | Types.ObjectId,
+  ) => Promise<IConfig | null>;
+  deleteAclEntries: (filter: {
+    principalType: PrincipalType;
+    principalId: string | Types.ObjectId;
+  }) => Promise<DeleteResult>;
+  deleteGrantsForPrincipal: (
+    principalType: PrincipalType,
+    principalId: string | Types.ObjectId,
+  ) => Promise<void>;
+}
+
+export function createAdminGroupsHandlers(deps: AdminGroupsDeps) {
+  const {
+    listGroups,
+    countGroups,
+    findGroupById,
+    createGroup,
+    updateGroupById,
+    deleteGroup,
+    addUserToGroup,
+    removeUserFromGroup,
+    removeMemberById,
+    findUsers,
+    deleteConfig,
+    deleteAclEntries,
+    deleteGrantsForPrincipal,
+  } = deps;
+
+  async function listGroupsHandler(req: ServerRequest, res: Response) {
+    try {
+      const { search, source } = req.query as { search?: string; source?: string };
+      const filter: GroupListFilter = {};
+      if (source && VALID_GROUP_SOURCES.has(source)) {
+        filter.source = source as IGroup['source'];
+      }
+      if (search && search.length > MAX_SEARCH_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `search must not exceed ${MAX_SEARCH_LENGTH} characters` });
+      }
+      if (search) {
+        filter.search = search;
+      }
+      const limit = Math.min(Math.max(Number(req.query.limit) || 50, 1), 200);
+      const offset = Math.max(Number(req.query.offset) || 0, 0);
+      const [groups, total] = await Promise.all([
+        listGroups({ ...filter, limit, offset }),
+        countGroups(filter),
+      ]);
+      return res.status(200).json({ groups, total, limit, offset });
+    } catch (error) {
+      logger.error('[adminGroups] listGroups error:', error);
+      return res.status(500).json({ error: 'Failed to list groups' });
+    }
+  }
+
+  async function getGroupHandler(req: ServerRequest, res: Response) {
+    try {
+      const { id } = req.params as GroupIdParams;
+      if (!isValidObjectIdString(id)) {
+        return res.status(400).json({ error: 'Invalid group ID format' });
+      }
+      const group = await findGroupById(id);
+      if (!group) {
+        return res.status(404).json({ error: 'Group not found' });
+      }
+      return res.status(200).json({ group });
+    } catch (error) {
+      logger.error('[adminGroups] getGroup error:', error);
+      return res.status(500).json({ error: 'Failed to get group' });
+    }
+  }
+
+  async function createGroupHandler(req: ServerRequest, res: Response) {
+    try {
+      const body = req.body as CreateGroupRequest;
+      if (!body.name || typeof body.name !== 'string' || !body.name.trim()) {
+        return res.status(400).json({ error: 'name is required' });
+      }
+      if (body.name.trim().length > MAX_NAME_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `name must not exceed ${MAX_NAME_LENGTH} characters` });
+      }
+      if (body.source && !VALID_GROUP_SOURCES.has(body.source)) {
+        return res.status(400).json({ error: 'Invalid source value' });
+      }
+      if (body.description && body.description.length > MAX_DESCRIPTION_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `description must not exceed ${MAX_DESCRIPTION_LENGTH} characters` });
+      }
+      if (body.email && body.email.length > MAX_EMAIL_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `email must not exceed ${MAX_EMAIL_LENGTH} characters` });
+      }
+      if (body.avatar && body.avatar.length > MAX_AVATAR_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `avatar must not exceed ${MAX_AVATAR_LENGTH} characters` });
+      }
+      if (body.idOnTheSource && body.idOnTheSource.length > MAX_EXTERNAL_ID_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `idOnTheSource must not exceed ${MAX_EXTERNAL_ID_LENGTH} characters` });
+      }
+
+      const rawIds = Array.isArray(body.memberIds) ? body.memberIds : [];
+      if (rawIds.length > MAX_CREATE_MEMBER_IDS) {
+        return res
+          .status(400)
+          .json({ error: `memberIds must not exceed ${MAX_CREATE_MEMBER_IDS} entries` });
+      }
+      let memberIds = rawIds;
+      const objectIds = rawIds.filter(isValidObjectIdString);
+      if (objectIds.length > 0) {
+        const users = await findUsers({ _id: { $in: objectIds } }, 'idOnTheSource');
+        const idMap = new Map<string, string>();
+        for (const user of users) {
+          const uid = user._id?.toString() ?? '';
+          idMap.set(uid, user.idOnTheSource || uid);
+        }
+        const unmapped = objectIds.filter((oid) => !idMap.has(oid));
+        if (unmapped.length > 0) {
+          logger.warn(
+            '[adminGroups] createGroup: memberIds contain unknown user ObjectIds:',
+            unmapped,
+          );
+        }
+        memberIds = rawIds.map((id) => idMap.get(id) || id);
+      }
+
+      const group = await createGroup({
+        name: body.name.trim(),
+        description: body.description,
+        email: body.email,
+        avatar: body.avatar,
+        source: body.source || 'local',
+        memberIds,
+        ...(body.idOnTheSource ? { idOnTheSource: body.idOnTheSource } : {}),
+      });
+      return res.status(201).json({ group });
+    } catch (error) {
+      if ((error as ValidationError).name === 'ValidationError') {
+        return res.status(400).json({ error: (error as ValidationError).message });
+      }
+      logger.error('[adminGroups] createGroup error:', error);
+      return res.status(500).json({ error: 'Failed to create group' });
+    }
+  }
+
+  async function updateGroupHandler(req: ServerRequest, res: Response) {
+    try {
+      const { id } = req.params as GroupIdParams;
+      if (!isValidObjectIdString(id)) {
+        return res.status(400).json({ error: 'Invalid group ID format' });
+      }
+      const body = req.body as UpdateGroupRequest;
+
+      if (
+        body.name !== undefined &&
+        (!body.name || typeof body.name !== 'string' || !body.name.trim())
+      ) {
+        return res.status(400).json({ error: 'name must be a non-empty string' });
+      }
+      if (body.name !== undefined && body.name.trim().length > MAX_NAME_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `name must not exceed ${MAX_NAME_LENGTH} characters` });
+      }
+      if (body.description !== undefined && body.description.length > MAX_DESCRIPTION_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `description must not exceed ${MAX_DESCRIPTION_LENGTH} characters` });
+      }
+      if (body.email !== undefined && body.email.length > MAX_EMAIL_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `email must not exceed ${MAX_EMAIL_LENGTH} characters` });
+      }
+      if (body.avatar !== undefined && body.avatar.length > MAX_AVATAR_LENGTH) {
+        return res
+          .status(400)
+          .json({ error: `avatar must not exceed ${MAX_AVATAR_LENGTH} characters` });
+      }
+
+      const updateData: Partial<Pick<IGroup, 'name' | 'description' | 'email' | 'avatar'>> = {};
+      if (body.name !== undefined) {
+        updateData.name = body.name.trim();
+      }
+      if (body.description !== undefined) {
+        updateData.description = body.description;
+      }
+      if (body.email !== undefined) {
+        updateData.email = body.email;
+      }
+      if (body.avatar !== undefined) {
+        updateData.avatar = body.avatar;
+      }
+
+      if (Object.keys(updateData).length === 0) {
+        return res.status(400).json({ error: 'No valid fields to update' });
+      }
+
+      const group = await updateGroupById(id, updateData);
+      if (!group) {
+        return res.status(404).json({ error: 'Group not found' });
+      }
+      return res.status(200).json({ group });
+    } catch (error) {
+      if ((error as ValidationError).name === 'ValidationError') {
+        return res.status(400).json({ error: (error as ValidationError).message });
+      }
+      logger.error('[adminGroups] updateGroup error:', error);
+      return res.status(500).json({ error: 'Failed to update group' });
+    }
+  }
+
+  async function deleteGroupHandler(req: ServerRequest, res: Response) {
+    try {
+      const { id } = req.params as GroupIdParams;
+      if (!isValidObjectIdString(id)) {
+        return res.status(400).json({ error: 'Invalid group ID format' });
+      }
+      const deleted = await deleteGroup(id);
+      if (!deleted) {
+        return res.status(404).json({ error: 'Group not found' });
+      }
+      /**
+       * deleteAclEntries is a raw deleteMany wrapper with no type casting.
+       * grantPermission stores group principalId as ObjectId, so we must
+       * cast here. deleteConfig and deleteGrantsForPrincipal normalize internally.
+       */
+      const cleanupResults = await Promise.allSettled([
+        deleteConfig(PrincipalType.GROUP, id),
+        deleteAclEntries({
+          principalType: PrincipalType.GROUP,
+          principalId: new Types.ObjectId(id),
+        }),
+        deleteGrantsForPrincipal(PrincipalType.GROUP, id),
+      ]);
+      for (const result of cleanupResults) {
+        if (result.status === 'rejected') {
+          logger.error('[adminGroups] cascade cleanup step failed for group:', id, result.reason);
+        }
+      }
+      return res.status(200).json({ success: true, id });
+    } catch (error) {
+      logger.error('[adminGroups] deleteGroup error:', error);
+      return res.status(500).json({ error: 'Failed to delete group' });
+    }
+  }
+
+  async function getGroupMembersHandler(req: ServerRequest, res: Response) {
+    try {
+      const { id } = req.params as GroupIdParams;
+      if (!isValidObjectIdString(id)) {
+        return res.status(400).json({ error: 'Invalid group ID format' });
+      }
+      const group = await findGroupById(id, { memberIds: 1 });
+      if (!group) {
+        return res.status(404).json({ error: 'Group not found' });
+      }
+
+      /**
+       * `total` counts unique raw memberId strings. After user resolution, two
+       * distinct strings may map to the same user, so `members.length` can be
+       * less than the page size. Write paths prevent this for well-formed data.
+       */
+      const allMemberIds = [...new Set(group.memberIds || [])];
+      const total = allMemberIds.length;
+      const limit = Math.min(Math.max(Number(req.query.limit) || 50, 1), 200);
+      const offset = Math.max(Number(req.query.offset) || 0, 0);
+
+      if (total === 0 || offset >= total) {
+        return res.status(200).json({ members: [], total, limit, offset });
+      }
+
+      const memberIds = allMemberIds.slice(offset, offset + limit);
+
+      const validObjectIds = memberIds.filter(isValidObjectIdString);
+      const conditions: FilterQuery<IUser>[] = [{ idOnTheSource: { $in: memberIds } }];
+      if (validObjectIds.length > 0) {
+        conditions.push({ _id: { $in: validObjectIds } });
+      }
+      const users = await findUsers({ $or: conditions }, 'name email avatar idOnTheSource');
+
+      const userMap = new Map<string, IUser>();
+      for (const user of users) {
+        if (user.idOnTheSource) {
+          userMap.set(user.idOnTheSource, user);
+        }
+        if (user._id) {
+          userMap.set(user._id.toString(), user);
+        }
+      }
+
+      const seen = new Set<string>();
+      const members: { userId: string; name: string; email: string; avatarUrl?: string }[] = [];
+      for (const memberId of memberIds) {
+        const user = userMap.get(memberId);
+        const userId = user?._id?.toString() ?? memberId;
+        if (seen.has(userId)) {
+          continue;
+        }
+        seen.add(userId);
+        members.push({
+          userId,
+          name: user?.name ?? memberId,
+          email: user?.email ?? '',
+          avatarUrl: user?.avatar,
+        });
+      }
+
+      return res.status(200).json({ members, total, limit, offset });
+    } catch (error) {
+      logger.error('[adminGroups] getGroupMembers error:', error);
+      return res.status(500).json({ error: 'Failed to get group members' });
+    }
+  }
+
+  async function addGroupMemberHandler(req: ServerRequest, res: Response) {
+    try {
+      const { id } = req.params as GroupIdParams;
+      if (!isValidObjectIdString(id)) {
+        return res.status(400).json({ error: 'Invalid group ID format' });
+      }
+      const { userId } = req.body as { userId: string };
+      if (!userId || typeof userId !== 'string') {
+        return res.status(400).json({ error: 'userId is required' });
+      }
+      if (!isValidObjectIdString(userId)) {
+        return res
+          .status(400)
+          .json({ error: 'Only native user ObjectIds can be added via this endpoint' });
+      }
+
+      const { group } = await addUserToGroup(userId, id);
+      if (!group) {
+        return res.status(404).json({ error: 'Group not found' });
+      }
+      return res.status(200).json({ group });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : '';
+      const isNotFound = message === 'User not found' || message.startsWith('User not found:');
+      if (isNotFound) {
+        return res.status(404).json({ error: 'User not found' });
+      }
+      logger.error('[adminGroups] addGroupMember error:', error);
+      return res.status(500).json({ error: 'Failed to add member' });
+    }
+  }
+
+  /**
+   * Attempt removal of an ObjectId-format member: first via removeUserFromGroup
+   * (which resolves the user), falling back to a raw $pull if the user record
+   * no longer exists. Returns null only when the group itself is not found.
+   */
+  async function removeObjectIdMember(groupId: string, userId: string): Promise<IGroup | null> {
+    try {
+      const { group } = await removeUserFromGroup(userId, groupId);
+      return group;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : '';
+      if (msg === 'User not found' || msg.startsWith('User not found:')) {
+        return removeMemberById(groupId, userId);
+      }
+      throw err;
+    }
+  }
+
+  async function removeGroupMemberHandler(req: ServerRequest, res: Response) {
+    try {
+      const { id, userId } = req.params as GroupMemberParams;
+      if (!isValidObjectIdString(id)) {
+        return res.status(400).json({ error: 'Invalid group ID format' });
+      }
+
+      const group = isValidObjectIdString(userId)
+        ? await removeObjectIdMember(id, userId)
+        : await removeMemberById(id, userId);
+
+      if (!group) {
+        return res.status(404).json({ error: 'Group not found' });
+      }
+      return res.status(200).json({ success: true });
+    } catch (error) {
+      logger.error('[adminGroups] removeGroupMember error:', error);
+      return res.status(500).json({ error: 'Failed to remove member' });
+    }
+  }
+
+  return {
+    listGroups: listGroupsHandler,
+    getGroup: getGroupHandler,
+    createGroup: createGroupHandler,
+    updateGroup: updateGroupHandler,
+    deleteGroup: deleteGroupHandler,
+    getGroupMembers: getGroupMembersHandler,
+    addGroupMember: addGroupMemberHandler,
+    removeGroupMember: removeGroupMemberHandler,
+  };
+}

packages/api/src/admin/index.ts

@@ -1,2 +1,4 @@
 export { createAdminConfigHandlers } from './config';
+export { createAdminGroupsHandlers } from './groups';
 export type { AdminConfigDeps } from './config';
+export type { AdminGroupsDeps } from './groups';

packages/data-schemas/src/methods/systemGrant.spec.ts

@@ -702,6 +702,68 @@ describe('systemGrant methods', () => {
     });
   });
 
+  describe('deleteGrantsForPrincipal', () => {
+    it('deletes all grants for a principal', async () => {
+      const groupId = new Types.ObjectId();
+
+      await methods.grantCapability({
+        principalType: PrincipalType.GROUP,
+        principalId: groupId,
+        capability: SystemCapabilities.READ_USERS,
+      });
+      await methods.grantCapability({
+        principalType: PrincipalType.GROUP,
+        principalId: groupId,
+        capability: SystemCapabilities.READ_CONFIGS,
+      });
+
+      await methods.deleteGrantsForPrincipal(PrincipalType.GROUP, groupId);
+
+      const remaining = await SystemGrant.countDocuments({
+        principalType: PrincipalType.GROUP,
+        principalId: groupId,
+      });
+      expect(remaining).toBe(0);
+    });
+
+    it('is a no-op for principal with no grants', async () => {
+      const groupId = new Types.ObjectId();
+
+      await expect(
+        methods.deleteGrantsForPrincipal(PrincipalType.GROUP, groupId),
+      ).resolves.not.toThrow();
+    });
+
+    it('does not affect other principals', async () => {
+      const groupA = new Types.ObjectId();
+      const groupB = new Types.ObjectId();
+
+      await methods.grantCapability({
+        principalType: PrincipalType.GROUP,
+        principalId: groupA,
+        capability: SystemCapabilities.READ_USERS,
+      });
+      await methods.grantCapability({
+        principalType: PrincipalType.GROUP,
+        principalId: groupB,
+        capability: SystemCapabilities.READ_USERS,
+      });
+
+      await methods.deleteGrantsForPrincipal(PrincipalType.GROUP, groupA);
+
+      const remainingA = await SystemGrant.countDocuments({
+        principalType: PrincipalType.GROUP,
+        principalId: groupA,
+      });
+      const remainingB = await SystemGrant.countDocuments({
+        principalType: PrincipalType.GROUP,
+        principalId: groupB,
+      });
+      expect(remainingA).toBe(0);
+      expect(remainingB).toBe(1);
+    });
+  });
+
   describe('schema validation', () => {
     it('rejects null tenantId at the schema level', async () => {
       await expect(

packages/data-schemas/src/methods/systemGrant.ts

@@ -246,12 +246,28 @@ export function createSystemGrantMethods(mongoose: typeof import('mongoose')) {
     }
   }
 
+  /**
+   * Delete all system grants for a principal.
+   * Used for cascade cleanup when a principal (group, role) is deleted.
+   */
+  async function deleteGrantsForPrincipal(
+    principalType: PrincipalType,
+    principalId: string | Types.ObjectId,
+    session?: ClientSession,
+  ): Promise<void> {
+    const SystemGrant = mongoose.models.SystemGrant as Model<ISystemGrant>;
+    const normalizedPrincipalId = normalizePrincipalId(principalId, principalType);
+    const options = session ? { session } : {};
+    await SystemGrant.deleteMany({ principalType, principalId: normalizedPrincipalId }, options);
+  }
+
   return {
     grantCapability,
     seedSystemGrants,
     revokeCapability,
     hasCapabilityForPrincipals,
     getCapabilitiesForPrincipal,
+    deleteGrantsForPrincipal,
   };
 }
 

packages/data-schemas/src/methods/user.ts

@@ -44,6 +44,19 @@ export function createUserMethods(mongoose: typeof import('mongoose')) {
     return (await query.lean()) as IUser | null;
   }
 
+  async function findUsers(
+    searchCriteria: FilterQuery<IUser>,
+    fieldsToSelect?: string | string[] | null,
+  ): Promise<IUser[]> {
+    const User = mongoose.models.User;
+    const normalizedCriteria = normalizeEmailInCriteria(searchCriteria);
+    const query = User.find(normalizedCriteria);
+    if (fieldsToSelect) {
+      query.select(fieldsToSelect);
+    }
+    return (await query.lean()) as IUser[];
+  }
+
   /**
    * Count the number of user documents in the collection based on the provided filter.
    */
@@ -323,6 +336,7 @@ export function createUserMethods(mongoose: typeof import('mongoose')) {
 
   return {
     findUser,
+    findUsers,
     countUsers,
     createUser,
     updateUser,

packages/data-schemas/src/methods/userGroup.methods.spec.ts

@@ -600,6 +600,155 @@ describe('UserGroup Methods - Detailed Tests', () => {
     });
   });
 
+  describe('listGroups', () => {
+    beforeEach(async () => {
+      await Group.create([
+        { name: 'Beta', source: 'local', memberIds: [], email: 'beta@test.com' },
+        { name: 'Alpha', source: 'local', memberIds: [], description: 'first group' },
+        { name: 'Gamma', source: 'entra', idOnTheSource: 'ext-g', memberIds: [] },
+      ]);
+    });
+
+    test('returns groups sorted by name', async () => {
+      const groups = await methods.listGroups();
+
+      expect(groups).toHaveLength(3);
+      expect(groups[0].name).toBe('Alpha');
+      expect(groups[1].name).toBe('Beta');
+      expect(groups[2].name).toBe('Gamma');
+    });
+
+    test('filters by source', async () => {
+      const groups = await methods.listGroups({ source: 'entra' });
+
+      expect(groups).toHaveLength(1);
+      expect(groups[0].name).toBe('Gamma');
+    });
+
+    test('filters by search (name)', async () => {
+      const groups = await methods.listGroups({ search: 'alpha' });
+
+      expect(groups).toHaveLength(1);
+      expect(groups[0].name).toBe('Alpha');
+    });
+
+    test('filters by search (email)', async () => {
+      const groups = await methods.listGroups({ search: 'beta@test' });
+
+      expect(groups).toHaveLength(1);
+      expect(groups[0].name).toBe('Beta');
+    });
+
+    test('filters by search (description)', async () => {
+      const groups = await methods.listGroups({ search: 'first group' });
+
+      expect(groups).toHaveLength(1);
+      expect(groups[0].name).toBe('Alpha');
+    });
+
+    test('respects limit and offset', async () => {
+      const groups = await methods.listGroups({ limit: 1, offset: 1 });
+
+      expect(groups).toHaveLength(1);
+      expect(groups[0].name).toBe('Beta');
+    });
+
+    test('returns empty for no matches', async () => {
+      const groups = await methods.listGroups({ search: 'nonexistent' });
+
+      expect(groups).toHaveLength(0);
+    });
+  });
+
+  describe('countGroups', () => {
+    beforeEach(async () => {
+      await Group.create([
+        { name: 'A', source: 'local', memberIds: [] },
+        { name: 'B', source: 'local', memberIds: [] },
+        { name: 'C', source: 'entra', idOnTheSource: 'ext-c', memberIds: [] },
+      ]);
+    });
+
+    test('returns total count', async () => {
+      const count = await methods.countGroups();
+
+      expect(count).toBe(3);
+    });
+
+    test('respects source filter', async () => {
+      const count = await methods.countGroups({ source: 'local' });
+
+      expect(count).toBe(2);
+    });
+
+    test('respects search filter', async () => {
+      const count = await methods.countGroups({ search: 'A' });
+
+      expect(count).toBe(1);
+    });
+  });
+
+  describe('deleteGroup', () => {
+    test('returns deleted group', async () => {
+      const group = await Group.create({ name: 'ToDelete', source: 'local', memberIds: [] });
+
+      const deleted = await methods.deleteGroup(group._id as mongoose.Types.ObjectId);
+
+      expect(deleted).toBeDefined();
+      expect(deleted?.name).toBe('ToDelete');
+      const remaining = await Group.findById(group._id);
+      expect(remaining).toBeNull();
+    });
+
+    test('returns null for non-existent ID', async () => {
+      const fakeId = new mongoose.Types.ObjectId();
+      const result = await methods.deleteGroup(fakeId);
+
+      expect(result).toBeNull();
+    });
+  });
+
+  describe('removeMemberById', () => {
+    test('removes member from memberIds array', async () => {
+      const group = await Group.create({
+        name: 'Test',
+        source: 'local',
+        memberIds: ['m1', 'm2', 'm3'],
+      });
+
+      const updated = await methods.removeMemberById(
+        group._id as mongoose.Types.ObjectId,
+        'm2',
+      );
+
+      expect(updated).toBeDefined();
+      expect(updated?.memberIds).toEqual(['m1', 'm3']);
+    });
+
+    test('is idempotent when memberId not present', async () => {
+      const group = await Group.create({
+        name: 'Test',
+        source: 'local',
+        memberIds: ['m1'],
+      });
+
+      const updated = await methods.removeMemberById(
+        group._id as mongoose.Types.ObjectId,
+        'nonexistent',
+      );
+
+      expect(updated).toBeDefined();
+      expect(updated?.memberIds).toEqual(['m1']);
+    });
+
+    test('returns null for non-existent group', async () => {
+      const fakeId = new mongoose.Types.ObjectId();
+      const result = await methods.removeMemberById(fakeId, 'any-id');
+
+      expect(result).toBeNull();
+    });
+  });
+
   describe('sortPrincipalsByRelevance', () => {
     test('should sort principals by relevance score', async () => {
       const principals = [

packages/data-schemas/src/methods/userGroup.ts

@@ -1,8 +1,9 @@
 import { Types } from 'mongoose';
 import { PrincipalType } from 'librechat-data-provider';
 import type { TUser, TPrincipalSearchResult } from 'librechat-data-provider';
-import type { Model, ClientSession } from 'mongoose';
+import type { Model, ClientSession, FilterQuery } from 'mongoose';
 import type { IGroup, IRole, IUser } from '~/types';
+import { escapeRegExp } from '~/utils/string';
 
 export function createUserGroupMethods(mongoose: typeof import('mongoose')) {
   /**
@@ -14,7 +15,7 @@ export function createUserGroupMethods(mongoose: typeof import('mongoose')) {
    */
   async function findGroupById(
     groupId: string | Types.ObjectId,
-    projection: Record<string, unknown> = {},
+    projection: Record<string, 0 | 1> = {},
     session?: ClientSession,
   ): Promise<IGroup | null> {
     const Group = mongoose.models.Group as Model<IGroup>;
@@ -36,7 +37,7 @@ export function createUserGroupMethods(mongoose: typeof import('mongoose')) {
   async function findGroupByExternalId(
     idOnTheSource: string,
     source: 'entra' | 'local' = 'entra',
-    projection: Record<string, unknown> = {},
+    projection: Record<string, 0 | 1> = {},
     session?: ClientSession,
   ): Promise<IGroup | null> {
     const Group = mongoose.models.Group as Model<IGroup>;
@@ -658,6 +659,97 @@ export function createUserGroupMethods(mongoose: typeof import('mongoose')) {
     return Group.updateMany(filter, update, options || {});
   }
 
+  function buildGroupQuery(filter: {
+    source?: 'local' | 'entra';
+    search?: string;
+  }): FilterQuery<IGroup> {
+    const query: FilterQuery<IGroup> = {};
+    if (filter.source) {
+      query.source = filter.source;
+    }
+    if (filter.search) {
+      const regex = new RegExp(escapeRegExp(filter.search), 'i');
+      query.$or = [{ name: regex }, { email: regex }, { description: regex }];
+    }
+    return query;
+  }
+
+  /**
+   * List groups with optional source, search, and pagination filters.
+   * Results are sorted by name.
+   * @param filter - Optional filter with source, search, limit, and offset fields
+   * @param session - Optional MongoDB session for transactions
+   */
+  async function listGroups(
+    filter: {
+      source?: 'local' | 'entra';
+      search?: string;
+      limit?: number;
+      offset?: number;
+    } = {},
+    session?: ClientSession,
+  ): Promise<IGroup[]> {
+    const Group = mongoose.models.Group as Model<IGroup>;
+    const query = buildGroupQuery(filter);
+    const limit = filter.limit ?? 50;
+    const offset = filter.offset ?? 0;
+    return await Group.find(query)
+      .sort({ name: 1 })
+      .skip(offset)
+      .limit(limit)
+      .session(session ?? null)
+      .lean();
+  }
+
+  /**
+   * Count groups matching optional source and search filters.
+   * @param filter - Optional filter with source and search fields
+   * @param session - Optional MongoDB session for transactions
+   */
+  async function countGroups(
+    filter: { source?: 'local' | 'entra'; search?: string } = {},
+    session?: ClientSession,
+  ): Promise<number> {
+    const Group = mongoose.models.Group as Model<IGroup>;
+    const query = buildGroupQuery(filter);
+    return await Group.countDocuments(query).session(session ?? null);
+  }
+
+  /**
+   * Delete a group by its ID.
+   * @param groupId - The group's ObjectId
+   * @param session - Optional MongoDB session for transactions
+   */
+  async function deleteGroup(
+    groupId: string | Types.ObjectId,
+    session?: ClientSession,
+  ): Promise<IGroup | null> {
+    const Group = mongoose.models.Group as Model<IGroup>;
+    const options = session ? { session } : {};
+    return await Group.findByIdAndDelete(groupId, options).lean();
+  }
+
+  /**
+   * Remove a member from a group by raw memberId string ($pull from memberIds).
+   * Unlike removeUserFromGroup, this does not look up the user first.
+   * @param groupId - The group's ObjectId
+   * @param memberId - The raw memberId string to remove (ObjectId or idOnTheSource)
+   * @param session - Optional MongoDB session for transactions
+   */
+  async function removeMemberById(
+    groupId: string | Types.ObjectId,
+    memberId: string,
+    session?: ClientSession,
+  ): Promise<IGroup | null> {
+    const Group = mongoose.models.Group as Model<IGroup>;
+    const options = { new: true, ...(session ? { session } : {}) };
+    return await Group.findByIdAndUpdate(
+      groupId,
+      { $pull: { memberIds: memberId } },
+      options,
+    ).lean();
+  }
+
   return {
     findGroupById,
     findGroupByExternalId,
@@ -677,6 +769,10 @@ export function createUserGroupMethods(mongoose: typeof import('mongoose')) {
     searchPrincipals,
     calculateRelevanceScore,
     sortPrincipalsByRelevance,
+    listGroups,
+    countGroups,
+    deleteGroup,
+    removeMemberById,
   };
 }