From dd72b7b17e4aa56beb05143777cedbafcbd83e99 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Mon, 16 Mar 2026 08:26:55 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20chore:=20Consolidate=20agent=20m?=
 =?UTF-8?q?odel=20imports=20across=20middleware=20and=20tests=20from=20reb?=
 =?UTF-8?q?ase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Updated imports for `createAgent` and `getAgent` to streamline access from a unified `~/models` path.
- Enhanced test files to reflect the new import structure, ensuring consistency and maintainability across the codebase.
- Improved clarity by removing redundant imports and aligning with the latest model updates.
---
 .../middleware/accessResources/canAccessAgentFromBody.spec.js | 2 +-
 api/server/routes/files/images.agents.test.js                 | 2 +-
 api/server/routes/files/images.js                             | 4 ++--
 api/server/services/Endpoints/agents/initialize.spec.js       | 2 +-
 api/server/services/Files/permissions.spec.js                 | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/server/middleware/accessResources/canAccessAgentFromBody.spec.js b/api/server/middleware/accessResources/canAccessAgentFromBody.spec.js
index 47f1130d13..9e5e0b093a 100644
--- a/api/server/middleware/accessResources/canAccessAgentFromBody.spec.js
+++ b/api/server/middleware/accessResources/canAccessAgentFromBody.spec.js
@@ -8,7 +8,7 @@ const {
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const { canAccessAgentFromBody } = require('./canAccessAgentFromBody');
 const { User, Role, AclEntry } = require('~/db/models');
-const { createAgent } = require('~/models/Agent');
+const { createAgent } = require('~/models');
 
 describe('canAccessAgentFromBody middleware', () => {
   let mongoServer;
diff --git a/api/server/routes/files/images.agents.test.js b/api/server/routes/files/images.agents.test.js
index 862ab87d63..f855a436d4 100644
--- a/api/server/routes/files/images.agents.test.js
+++ b/api/server/routes/files/images.agents.test.js
@@ -10,7 +10,7 @@ const {
   ResourceType,
   PrincipalType,
 } = require('librechat-data-provider');
-const { createAgent } = require('~/models/Agent');
+const { createAgent } = require('~/models');
 
 jest.mock('~/server/services/Files/process', () => ({
   processAgentFileUpload: jest.fn().mockImplementation(async ({ res }) => {
diff --git a/api/server/routes/files/images.js b/api/server/routes/files/images.js
index d5d8f51193..353557dc4f 100644
--- a/api/server/routes/files/images.js
+++ b/api/server/routes/files/images.js
@@ -10,7 +10,7 @@ const {
   filterFile,
 } = require('~/server/services/Files/process');
 const { checkPermission } = require('~/server/services/PermissionService');
-const { getAgent } = require('~/models/Agent');
+const db = require('~/models');
 
 const router = express.Router();
 
@@ -29,7 +29,7 @@ router.post('/', async (req, res) => {
         req,
         res,
         metadata,
-        getAgent,
+        getAgent: db.getAgent,
         checkPermission,
       });
       if (denied) {
diff --git a/api/server/services/Endpoints/agents/initialize.spec.js b/api/server/services/Endpoints/agents/initialize.spec.js
index 16b41aca65..8027744965 100644
--- a/api/server/services/Endpoints/agents/initialize.spec.js
+++ b/api/server/services/Endpoints/agents/initialize.spec.js
@@ -58,8 +58,8 @@ jest.mock('~/cache', () => ({
 }));
 
 const { initializeClient } = require('./initialize');
-const { createAgent } = require('~/models/Agent');
 const { User, AclEntry } = require('~/db/models');
+const { createAgent } = require('~/models');
 
 const PRIMARY_ID = 'agent_primary';
 const TARGET_ID = 'agent_target';
diff --git a/api/server/services/Files/permissions.spec.js b/api/server/services/Files/permissions.spec.js
index 85e7b2dc5b..c926e83464 100644
--- a/api/server/services/Files/permissions.spec.js
+++ b/api/server/services/Files/permissions.spec.js
@@ -6,14 +6,14 @@ jest.mock('~/server/services/PermissionService', () => ({
   checkPermission: jest.fn(),
 }));
 
-jest.mock('~/models/Agent', () => ({
+jest.mock('~/models', () => ({
   getAgent: jest.fn(),
 }));
 
 const { logger } = require('@librechat/data-schemas');
 const { Constants, PermissionBits, ResourceType } = require('librechat-data-provider');
 const { checkPermission } = require('~/server/services/PermissionService');
-const { getAgent } = require('~/models/Agent');
+const { getAgent } = require('~/models');
 const { filterFilesByAgentAccess, hasAccessToFilesViaAgent } = require('./permissions');
 
 const AUTHOR_ID = 'author-user-id';