From 18d5a75cdc8ed48150dd4b53a112dbc0f370e712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro=20Silva?= <sobreiro.pedro@gmail.com>
Date: Wed, 27 Aug 2025 07:00:18 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=90=20feat:=20Add=20support=20to=20Sub?=
 =?UTF-8?q?Directory=20hosting=20(#9155)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add support to SubDirectory hosting

* fix: address linting and failing test

* fix: browser context validation

---------

Co-authored-by: Danny Avila <danny@librechat.ai>
---
 api/app/clients/tools/manifest.json           |   6 +-
 api/server/index.js                           |  18 +-
 client/index.html                             |   7 +-
 client/src/App.jsx                            |   2 +-
 client/src/components/Auth/AuthLayout.tsx     |   2 +-
 .../Messages/Content/MarkdownComponents.tsx   |  10 +-
 .../SidePanel/Agents/Code/ApiKeyDialog.tsx    |   2 +-
 client/src/hooks/Endpoint/UnknownIcon.tsx     |  36 ++--
 client/src/hooks/SSE/useAttachmentHandler.ts  |   2 +-
 client/src/routes/index.tsx                   | 190 +++++++++---------
 client/vite.config.ts                         |  12 +-
 packages/data-provider/src/api-endpoints.ts   | 151 ++++++++------
 packages/data-provider/src/config.ts          |   7 +-
 packages/data-provider/src/data-service.ts    |   6 +-
 14 files changed, 252 insertions(+), 199 deletions(-)

diff --git a/api/app/clients/tools/manifest.json b/api/app/clients/tools/manifest.json
index 55c1b1c51..664434f21 100644
--- a/api/app/clients/tools/manifest.json
+++ b/api/app/clients/tools/manifest.json
@@ -49,7 +49,7 @@
     "pluginKey": "image_gen_oai",
     "toolkit": true,
     "description": "Image Generation and Editing using OpenAI's latest state-of-the-art models",
-    "icon": "/assets/image_gen_oai.png",
+    "icon": "assets/image_gen_oai.png",
     "authConfig": [
       {
         "authField": "IMAGE_GEN_OAI_API_KEY",
@@ -75,7 +75,7 @@
     "name": "Browser",
     "pluginKey": "web-browser",
     "description": "Scrape and summarize webpage data",
-    "icon": "/assets/web-browser.svg",
+    "icon": "assets/web-browser.svg",
     "authConfig": [
       {
         "authField": "OPENAI_API_KEY",
@@ -170,7 +170,7 @@
     "name": "OpenWeather",
     "pluginKey": "open_weather",
     "description": "Get weather forecasts and historical data from the OpenWeather API",
-    "icon": "/assets/openweather.png",
+    "icon": "assets/openweather.png",
     "authConfig": [
       {
         "authField": "OPENWEATHER_API_KEY",
diff --git a/api/server/index.js b/api/server/index.js
index c28418b86..76fa5b7ae 100644
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -52,7 +52,20 @@ const startServer = async () => {
   const appConfig = await getAppConfig();
   await updateInterfacePermissions(appConfig);
   const indexPath = path.join(appConfig.paths.dist, 'index.html');
-  const indexHTML = fs.readFileSync(indexPath, 'utf8');
+  let indexHTML = fs.readFileSync(indexPath, 'utf8');
+
+  // In order to provide support to serving the application in a sub-directory
+  // We need to update the base href if the DOMAIN_CLIENT is specified and not the root path
+  if (process.env.DOMAIN_CLIENT) {
+    const clientUrl = new URL(process.env.DOMAIN_CLIENT);
+    const baseHref = clientUrl.pathname.endsWith('/')
+      ? clientUrl.pathname
+      : `${clientUrl.pathname}/`;
+    if (baseHref !== '/') {
+      logger.info(`Setting base href to ${baseHref}`);
+      indexHTML = indexHTML.replace(/base href="\/"/, `base href="${baseHref}"`);
+    }
+  }
 
   app.get('/health', (_req, res) => res.status(200).send('OK'));
 
@@ -135,7 +148,8 @@ const startServer = async () => {
 
     const lang = req.cookies.lang || req.headers['accept-language']?.split(',')[0] || 'en-US';
     const saneLang = lang.replace(/"/g, '&quot;');
-    const updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);
+    let updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);
+
     res.type('html');
     res.send(updatedIndexHtml);
   });
diff --git a/client/index.html b/client/index.html
index c05fbea5a..c94c3981b 100644
--- a/client/index.html
+++ b/client/index.html
@@ -2,15 +2,16 @@
 <html lang="en-US">
   <head>
     <meta charset="utf-8" />
+    <base href="/" />
     <meta name="theme-color" content="#171717" />
     <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <meta name="description" content="LibreChat - An open source chat application with support for multiple AI models" />
     <title>LibreChat</title>
-    <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon-16x16.png" />
-    <link rel="apple-touch-icon" href="/assets/apple-touch-icon-180x180.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="assets/favicon-16x16.png" />
+    <link rel="apple-touch-icon" href="assets/apple-touch-icon-180x180.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1, interactive-widget=resizes-content" />
     <style>
       html,
diff --git a/client/src/App.jsx b/client/src/App.jsx
index d329bdd9b..decad9392 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -62,7 +62,7 @@ export default () => (
   <ScreenshotProvider>
     <App />
     <iframe
-      src="/assets/silence.mp3"
+      src="assets/silence.mp3"
       allow="autoplay"
       id="audio"
       title="audio-silence"
diff --git a/client/src/components/Auth/AuthLayout.tsx b/client/src/components/Auth/AuthLayout.tsx
index c49ba2a7d..d948cb1a6 100644
--- a/client/src/components/Auth/AuthLayout.tsx
+++ b/client/src/components/Auth/AuthLayout.tsx
@@ -62,7 +62,7 @@ function AuthLayout({
       <BlinkAnimation active={isFetching}>
         <div className="mt-6 h-10 w-full bg-cover">
           <img
-            src="/assets/logo.svg"
+            src="assets/logo.svg"
             className="h-full w-full object-contain"
             alt={localize('com_ui_logo', { 0: startupConfig?.appTitle ?? 'LibreChat' })}
           />
diff --git a/client/src/components/Chat/Messages/Content/MarkdownComponents.tsx b/client/src/components/Chat/Messages/Content/MarkdownComponents.tsx
index de1e82443..ed69c677b 100644
--- a/client/src/components/Chat/Messages/Content/MarkdownComponents.tsx
+++ b/client/src/components/Chat/Messages/Content/MarkdownComponents.tsx
@@ -1,7 +1,7 @@
 import React, { memo, useMemo, useRef, useEffect } from 'react';
 import { useRecoilValue } from 'recoil';
 import { useToastContext } from '@librechat/client';
-import { PermissionTypes, Permissions } from 'librechat-data-provider';
+import { PermissionTypes, Permissions, dataService } from 'librechat-data-provider';
 import CodeBlock from '~/components/Messages/Content/CodeBlock';
 import useHasAccess from '~/hooks/Roles/useHasAccess';
 import { useFileDownload } from '~/data-provider';
@@ -135,9 +135,15 @@ export const a: React.ElementType = memo(({ href, children }: TAnchorProps) => {
   props.onClick = handleDownload;
   props.target = '_blank';
 
+  const domainServerBaseUrl = dataService.getDomainServerBaseUrl();
+
   return (
     <a
-      href={filepath?.startsWith('files/') ? `/api/${filepath}` : `/api/files/${filepath}`}
+      href={
+        filepath?.startsWith('files/')
+          ? `${domainServerBaseUrl}/${filepath}`
+          : `${domainServerBaseUrl}/files/${filepath}`
+      }
       {...props}
     >
       {children}
diff --git a/client/src/components/SidePanel/Agents/Code/ApiKeyDialog.tsx b/client/src/components/SidePanel/Agents/Code/ApiKeyDialog.tsx
index af586cdb9..b59d3dbda 100644
--- a/client/src/components/SidePanel/Agents/Code/ApiKeyDialog.tsx
+++ b/client/src/components/SidePanel/Agents/Code/ApiKeyDialog.tsx
@@ -65,7 +65,7 @@ export default function ApiKeyDialog({
                 {languageIcons.map((icon) => (
                   <div key={icon} className="h-6 w-6">
                     <img
-                      src={`/assets/${icon}`}
+                      src={`assets/${icon}`}
                       alt=""
                       className="h-full w-full object-contain opacity-[0.85] dark:invert"
                     />
diff --git a/client/src/hooks/Endpoint/UnknownIcon.tsx b/client/src/hooks/Endpoint/UnknownIcon.tsx
index 157c35ded..74df8536f 100644
--- a/client/src/hooks/Endpoint/UnknownIcon.tsx
+++ b/client/src/hooks/Endpoint/UnknownIcon.tsx
@@ -5,24 +5,24 @@ import { IconContext } from '~/common';
 import { cn } from '~/utils';
 
 const knownEndpointAssets = {
-  [KnownEndpoints.anyscale]: '/assets/anyscale.png',
-  [KnownEndpoints.apipie]: '/assets/apipie.png',
-  [KnownEndpoints.cohere]: '/assets/cohere.png',
-  [KnownEndpoints.deepseek]: '/assets/deepseek.svg',
-  [KnownEndpoints.fireworks]: '/assets/fireworks.png',
-  [KnownEndpoints.google]: '/assets/google.svg',
-  [KnownEndpoints.groq]: '/assets/groq.png',
-  [KnownEndpoints.huggingface]: '/assets/huggingface.svg',
-  [KnownEndpoints.mistral]: '/assets/mistral.png',
-  [KnownEndpoints.mlx]: '/assets/mlx.png',
-  [KnownEndpoints.ollama]: '/assets/ollama.png',
-  [KnownEndpoints.openai]: '/assets/openai.svg',
-  [KnownEndpoints.openrouter]: '/assets/openrouter.png',
-  [KnownEndpoints.perplexity]: '/assets/perplexity.png',
-  [KnownEndpoints.qwen]: '/assets/qwen.svg',
-  [KnownEndpoints.shuttleai]: '/assets/shuttleai.png',
-  [KnownEndpoints['together.ai']]: '/assets/together.png',
-  [KnownEndpoints.unify]: '/assets/unify.webp',
+  [KnownEndpoints.anyscale]: 'assets/anyscale.png',
+  [KnownEndpoints.apipie]: 'assets/apipie.png',
+  [KnownEndpoints.cohere]: 'assets/cohere.png',
+  [KnownEndpoints.deepseek]: 'assets/deepseek.svg',
+  [KnownEndpoints.fireworks]: 'assets/fireworks.png',
+  [KnownEndpoints.google]: 'assets/google.svg',
+  [KnownEndpoints.groq]: 'assets/groq.png',
+  [KnownEndpoints.huggingface]: 'assets/huggingface.svg',
+  [KnownEndpoints.mistral]: 'assets/mistral.png',
+  [KnownEndpoints.mlx]: 'assets/mlx.png',
+  [KnownEndpoints.ollama]: 'assets/ollama.png',
+  [KnownEndpoints.openai]: 'assets/openai.svg',
+  [KnownEndpoints.openrouter]: 'assets/openrouter.png',
+  [KnownEndpoints.perplexity]: 'assets/perplexity.png',
+  [KnownEndpoints.qwen]: 'assets/qwen.svg',
+  [KnownEndpoints.shuttleai]: 'assets/shuttleai.png',
+  [KnownEndpoints['together.ai']]: 'assets/together.png',
+  [KnownEndpoints.unify]: 'assets/unify.webp',
 };
 
 const knownEndpointClasses = {
diff --git a/client/src/hooks/SSE/useAttachmentHandler.ts b/client/src/hooks/SSE/useAttachmentHandler.ts
index d9711718b..8ac9f35eb 100644
--- a/client/src/hooks/SSE/useAttachmentHandler.ts
+++ b/client/src/hooks/SSE/useAttachmentHandler.ts
@@ -11,7 +11,7 @@ export default function useAttachmentHandler(queryClient?: QueryClient) {
   return ({ data }: { data: TAttachment; submission: EventSubmission }) => {
     const { messageId } = data;
 
-    if (queryClient && data?.filepath && !data.filepath.startsWith('/api/files')) {
+    if (queryClient && data?.filepath && !data.filepath.includes('/api/files')) {
       queryClient.setQueryData([QueryKeys.files], (oldData: TAttachment[] | undefined) => {
         return [data, ...(oldData || [])];
       });
diff --git a/client/src/routes/index.tsx b/client/src/routes/index.tsx
index e62c06e9e..2b3ab56db 100644
--- a/client/src/routes/index.tsx
+++ b/client/src/routes/index.tsx
@@ -27,95 +27,101 @@ const AuthLayout = () => (
   </AuthContextProvider>
 );
 
-export const router = createBrowserRouter([
-  {
-    path: 'share/:shareId',
-    element: <ShareRoute />,
-    errorElement: <RouteErrorBoundary />,
-  },
-  {
-    path: 'oauth',
-    errorElement: <RouteErrorBoundary />,
-    children: [
-      {
-        path: 'success',
-        element: <OAuthSuccess />,
-      },
-      {
-        path: 'error',
-        element: <OAuthError />,
-      },
-    ],
-  },
-  {
-    path: '/',
-    element: <StartupLayout />,
-    errorElement: <RouteErrorBoundary />,
-    children: [
-      {
-        path: 'register',
-        element: <Registration />,
-      },
-      {
-        path: 'forgot-password',
-        element: <RequestPasswordReset />,
-      },
-      {
-        path: 'reset-password',
-        element: <ResetPassword />,
-      },
-    ],
-  },
-  {
-    path: 'verify',
-    element: <VerifyEmail />,
-    errorElement: <RouteErrorBoundary />,
-  },
-  {
-    element: <AuthLayout />,
-    errorElement: <RouteErrorBoundary />,
-    children: [
-      {
-        path: '/',
-        element: <LoginLayout />,
-        children: [
-          {
-            path: 'login',
-            element: <Login />,
-          },
-          {
-            path: 'login/2fa',
-            element: <TwoFactorScreen />,
-          },
-        ],
-      },
-      dashboardRoutes,
-      {
-        path: '/',
-        element: <Root />,
-        children: [
-          {
-            index: true,
-            element: <Navigate to="/c/new" replace={true} />,
-          },
-          {
-            path: 'c/:conversationId?',
-            element: <ChatRoute />,
-          },
-          {
-            path: 'search',
-            element: <Search />,
-          },
-          {
-            path: 'agents',
-            element: <AgentMarketplace />,
-          },
-          {
-            path: 'agents/:category',
-            element: <AgentMarketplace />,
-          },
-        ],
-      },
-    ],
-  },
-]);
+const baseEl = document.querySelector('base');
+const baseHref = baseEl?.getAttribute('href') || '/';
+
+export const router = createBrowserRouter(
+  [
+    {
+      path: 'share/:shareId',
+      element: <ShareRoute />,
+      errorElement: <RouteErrorBoundary />,
+    },
+    {
+      path: 'oauth',
+      errorElement: <RouteErrorBoundary />,
+      children: [
+        {
+          path: 'success',
+          element: <OAuthSuccess />,
+        },
+        {
+          path: 'error',
+          element: <OAuthError />,
+        },
+      ],
+    },
+    {
+      path: '/',
+      element: <StartupLayout />,
+      errorElement: <RouteErrorBoundary />,
+      children: [
+        {
+          path: 'register',
+          element: <Registration />,
+        },
+        {
+          path: 'forgot-password',
+          element: <RequestPasswordReset />,
+        },
+        {
+          path: 'reset-password',
+          element: <ResetPassword />,
+        },
+      ],
+    },
+    {
+      path: 'verify',
+      element: <VerifyEmail />,
+      errorElement: <RouteErrorBoundary />,
+    },
+    {
+      element: <AuthLayout />,
+      errorElement: <RouteErrorBoundary />,
+      children: [
+        {
+          path: '/',
+          element: <LoginLayout />,
+          children: [
+            {
+              path: 'login',
+              element: <Login />,
+            },
+            {
+              path: 'login/2fa',
+              element: <TwoFactorScreen />,
+            },
+          ],
+        },
+        dashboardRoutes,
+        {
+          path: '/',
+          element: <Root />,
+          children: [
+            {
+              index: true,
+              element: <Navigate to="/c/new" replace={true} />,
+            },
+            {
+              path: 'c/:conversationId?',
+              element: <ChatRoute />,
+            },
+            {
+              path: 'search',
+              element: <Search />,
+            },
+            {
+              path: 'agents',
+              element: <AgentMarketplace />,
+            },
+            {
+              path: 'agents/:category',
+              element: <AgentMarketplace />,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+  { basename: baseHref },
+);
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 152cf4255..c06434011 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -8,6 +8,7 @@ import { VitePWA } from 'vite-plugin-pwa';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command }) => ({
+  base: '',
   server: {
     host: 'localhost',
     port: 3090,
@@ -54,33 +55,32 @@ export default defineConfig(({ command }) => ({
       manifest: {
         name: 'LibreChat',
         short_name: 'LibreChat',
-        start_url: '/',
         display: 'standalone',
         background_color: '#000000',
         theme_color: '#009688',
         icons: [
           {
-            src: '/assets/favicon-32x32.png',
+            src: 'assets/favicon-32x32.png',
             sizes: '32x32',
             type: 'image/png',
           },
           {
-            src: '/assets/favicon-16x16.png',
+            src: 'assets/favicon-16x16.png',
             sizes: '16x16',
             type: 'image/png',
           },
           {
-            src: '/assets/apple-touch-icon-180x180.png',
+            src: 'assets/apple-touch-icon-180x180.png',
             sizes: '180x180',
             type: 'image/png',
           },
           {
-            src: '/assets/icon-192x192.png',
+            src: 'assets/icon-192x192.png',
             sizes: '192x192',
             type: 'image/png',
           },
           {
-            src: '/assets/maskable-icon.png',
+            src: 'assets/maskable-icon.png',
             sizes: '512x512',
             type: 'image/png',
             purpose: 'maskable',
diff --git a/packages/data-provider/src/api-endpoints.ts b/packages/data-provider/src/api-endpoints.ts
index 3b3608f63..59ede0905 100644
--- a/packages/data-provider/src/api-endpoints.ts
+++ b/packages/data-provider/src/api-endpoints.ts
@@ -2,6 +2,21 @@ import type { AssistantsEndpoint } from './schemas';
 import * as q from './types/queries';
 import { ResourceType } from './accessPermissions';
 
+let BASE_URL = '';
+if (typeof process === 'undefined' || process.browser === true) {
+  // process is only available in node context, or process.browser is true in client-side code
+  // This is to ensure that the BASE_URL is set correctly based on the <base>
+  // element in the HTML document, if it exists.
+  const baseEl = document.querySelector('base');
+  BASE_URL = baseEl?.getAttribute('href') || '/';
+}
+
+if (BASE_URL && BASE_URL.endsWith('/')) {
+  BASE_URL = BASE_URL.slice(0, -1);
+}
+
+export const apiBaseUrl = () => BASE_URL;
+
 // Testing this buildQuery function
 const buildQuery = (params: Record<string, unknown>): string => {
   const query = Object.entries(params)
@@ -21,30 +36,34 @@ const buildQuery = (params: Record<string, unknown>): string => {
   return query ? `?${query}` : '';
 };
 
-export const health = () => '/health';
-export const user = () => '/api/user';
+export const health = () => `${BASE_URL}/health`;
+export const user = () => `${BASE_URL}/api/user`;
 
-export const balance = () => '/api/balance';
+export const balance = () => `${BASE_URL}/api/balance`;
 
-export const userPlugins = () => '/api/user/plugins';
+export const userPlugins = () => `${BASE_URL}/api/user/plugins`;
 
-export const deleteUser = () => '/api/user/delete';
+export const deleteUser = () => `${BASE_URL}/api/user/delete`;
+
+const messagesRoot = `${BASE_URL}/api/messages`;
 
 export const messages = (params: q.MessagesListParams) => {
   const { conversationId, messageId, ...rest } = params;
 
   if (conversationId && messageId) {
-    return `/api/messages/${conversationId}/${messageId}`;
+    return `${messagesRoot}/${conversationId}/${messageId}`;
   }
 
   if (conversationId) {
-    return `/api/messages/${conversationId}`;
+    return `${messagesRoot}/${conversationId}`;
   }
 
-  return `/api/messages${buildQuery(rest)}`;
+  return `${messagesRoot}{buildQuery(rest)}`;
 };
 
-const shareRoot = '/api/share';
+export const messagesArtifacts = (messageId: string) => `${messagesRoot}/artifacts/${messageId}`;
+
+const shareRoot = `${BASE_URL}/api/share`;
 export const shareMessages = (shareId: string) => `${shareRoot}/${shareId}`;
 export const getSharedLink = (conversationId: string) => `${shareRoot}/link/${conversationId}`;
 export const getSharedLinks = (
@@ -61,7 +80,7 @@ export const getSharedLinks = (
 export const createSharedLink = (conversationId: string) => `${shareRoot}/${conversationId}`;
 export const updateSharedLink = (shareId: string) => `${shareRoot}/${shareId}`;
 
-const keysEndpoint = '/api/keys';
+const keysEndpoint = `${BASE_URL}/api/keys`;
 
 export const keys = () => keysEndpoint;
 
@@ -71,7 +90,7 @@ export const revokeUserKey = (name: string) => `${keysEndpoint}/${name}`;
 
 export const revokeAllUserKeys = () => `${keysEndpoint}?all=true`;
 
-export const conversationsRoot = '/api/convos';
+export const conversationsRoot = `${BASE_URL}/api/convos`;
 
 export const conversations = (params: q.ConversationListParams) => {
   return `${conversationsRoot}${buildQuery(params)}`;
@@ -94,60 +113,62 @@ export const forkConversation = () => `${conversationsRoot}/fork`;
 export const duplicateConversation = () => `${conversationsRoot}/duplicate`;
 
 export const search = (q: string, cursor?: string | null) =>
-  `/api/search?q=${q}${cursor ? `&cursor=${cursor}` : ''}`;
+  `${BASE_URL}/api/search?q=${q}${cursor ? `&cursor=${cursor}` : ''}`;
 
-export const searchEnabled = () => '/api/search/enable';
+export const searchEnabled = () => `${BASE_URL}/api/search/enable`;
 
-export const presets = () => '/api/presets';
+export const presets = () => `${BASE_URL}/api/presets`;
 
-export const deletePreset = () => '/api/presets/delete';
+export const deletePreset = () => `${BASE_URL}/api/presets/delete`;
 
-export const aiEndpoints = () => '/api/endpoints';
+export const aiEndpoints = () => `${BASE_URL}/api/endpoints`;
 
-export const models = () => '/api/models';
+export const models = () => `${BASE_URL}/api/models`;
 
-export const tokenizer = () => '/api/tokenizer';
+export const tokenizer = () => `${BASE_URL}/api/tokenizer`;
 
-export const login = () => '/api/auth/login';
+export const login = () => `${BASE_URL}/api/auth/login`;
 
-export const logout = () => '/api/auth/logout';
+export const logout = () => `${BASE_URL}/api/auth/logout`;
 
-export const register = () => '/api/auth/register';
+export const register = () => `${BASE_URL}/api/auth/register`;
 
-export const loginFacebook = () => '/api/auth/facebook';
+export const loginFacebook = () => `${BASE_URL}/api/auth/facebook`;
 
-export const loginGoogle = () => '/api/auth/google';
+export const loginGoogle = () => `${BASE_URL}/api/auth/google`;
 
 export const refreshToken = (retry?: boolean) =>
-  `/api/auth/refresh${retry === true ? '?retry=true' : ''}`;
+  `${BASE_URL}/api/auth/refresh${retry === true ? '?retry=true' : ''}`;
 
-export const requestPasswordReset = () => '/api/auth/requestPasswordReset';
+export const requestPasswordReset = () => `${BASE_URL}/api/auth/requestPasswordReset`;
 
-export const resetPassword = () => '/api/auth/resetPassword';
+export const resetPassword = () => `${BASE_URL}/api/auth/resetPassword`;
 
-export const verifyEmail = () => '/api/user/verify';
+export const verifyEmail = () => `${BASE_URL}/api/user/verify`;
 
-export const resendVerificationEmail = () => '/api/user/verify/resend';
+export const resendVerificationEmail = () => `${BASE_URL}/api/user/verify/resend`;
 
-export const plugins = () => '/api/plugins';
+export const plugins = () => `${BASE_URL}/api/plugins`;
 
-export const mcpReinitialize = (serverName: string) => `/api/mcp/${serverName}/reinitialize`;
-export const mcpConnectionStatus = () => '/api/mcp/connection/status';
+export const mcpReinitialize = (serverName: string) =>
+  `${BASE_URL}/api/mcp/${serverName}/reinitialize`;
+export const mcpConnectionStatus = () => `${BASE_URL}/api/mcp/connection/status`;
 export const mcpServerConnectionStatus = (serverName: string) =>
-  `/api/mcp/connection/status/${serverName}`;
+  `${BASE_URL}/api/mcp/connection/status/${serverName}`;
 export const mcpAuthValues = (serverName: string) => {
-  return `/api/mcp/${serverName}/auth-values`;
+  return `${BASE_URL}/api/mcp/${serverName}/auth-values`;
 };
 
 export const cancelMCPOAuth = (serverName: string) => {
-  return `/api/mcp/oauth/cancel/${serverName}`;
+  return `${BASE_URL}/api/mcp/oauth/cancel/${serverName}`;
 };
 
-export const config = () => '/api/config';
+export const config = () => `${BASE_URL}/api/config`;
 
-export const prompts = () => '/api/prompts';
+export const prompts = () => `${BASE_URL}/api/prompts`;
 
-export const addPromptToGroup = (groupId: string) => `/api/prompts/groups/${groupId}/prompts`;
+export const addPromptToGroup = (groupId: string) =>
+  `${BASE_URL}/api/prompts/groups/${groupId}/prompts`;
 
 export const assistants = ({
   path = '',
@@ -162,7 +183,7 @@ export const assistants = ({
   version: number | string;
   isAvatar?: boolean;
 }) => {
-  let url = isAvatar === true ? `${images()}/assistants` : `/api/assistants/v${version}`;
+  let url = isAvatar === true ? `${images()}/assistants` : `${BASE_URL}/api/assistants/v${version}`;
 
   if (path && path !== '') {
     url += `/${path}`;
@@ -184,7 +205,7 @@ export const assistants = ({
 };
 
 export const agents = ({ path = '', options }: { path?: string; options?: object }) => {
-  let url = '/api/agents';
+  let url = `${BASE_URL}/api/agents`;
 
   if (path && path !== '') {
     url += `/${path}`;
@@ -200,13 +221,13 @@ export const agents = ({ path = '', options }: { path?: string; options?: object
 
 export const revertAgentVersion = (agent_id: string) => `${agents({ path: `${agent_id}/revert` })}`;
 
-export const files = () => '/api/files';
-export const fileUpload = () => '/api/files';
-export const fileDelete = () => '/api/files';
+export const files = () => `${BASE_URL}/api/files`;
+export const fileUpload = () => `${BASE_URL}/api/files`;
+export const fileDelete = () => `${BASE_URL}/api/files`;
 export const fileDownload = (userId: string, fileId: string) =>
-  `/api/files/download/${userId}/${fileId}`;
-export const fileConfig = () => '/api/files/config';
-export const agentFiles = (agentId: string) => `/api/files/agent/${agentId}`;
+  `${BASE_URL}/api/files/download/${userId}/${fileId}`;
+export const fileConfig = () => `${BASE_URL}/api/files/config`;
+export const agentFiles = (agentId: string) => `${BASE_URL}/api/files/agent/${agentId}`;
 
 export const images = () => `${files()}/images`;
 
@@ -263,12 +284,12 @@ export const deletePrompt = ({ _id, groupId }: { _id: string; groupId: string })
   return `${prompts()}/${_id}?groupId=${groupId}`;
 };
 
-export const getCategories = () => '/api/categories';
+export const getCategories = () => `${BASE_URL}/api/categories`;
 
 export const getAllPromptGroups = () => `${prompts()}/all`;
 
 /* Roles */
-export const roles = () => '/api/roles';
+export const roles = () => `${BASE_URL}/api/roles`;
 export const getRole = (roleName: string) => `${roles()}/${roleName.toLowerCase()}`;
 export const updatePromptPermissions = (roleName: string) => `${getRole(roleName)}/prompts`;
 export const updateMemoryPermissions = (roleName: string) => `${getRole(roleName)}/memories`;
@@ -281,7 +302,7 @@ export const updateMarketplacePermissions = (roleName: string) =>
 
 /* Conversation Tags */
 export const conversationTags = (tag?: string) =>
-  `/api/tags${tag != null && tag ? `/${encodeURIComponent(tag)}` : ''}`;
+  `${BASE_URL}/api/tags${tag != null && tag ? `/${encodeURIComponent(tag)}` : ''}`;
 
 export const conversationTagsList = (pageNumber: string, sort?: string, order?: string) =>
   `${conversationTags()}/list?pageNumber=${pageNumber}${sort ? `&sort=${sort}` : ''}${
@@ -291,30 +312,30 @@ export const conversationTagsList = (pageNumber: string, sort?: string, order?:
 export const addTagToConversation = (conversationId: string) =>
   `${conversationTags()}/convo/${conversationId}`;
 
-export const userTerms = () => '/api/user/terms';
-export const acceptUserTerms = () => '/api/user/terms/accept';
-export const banner = () => '/api/banner';
+export const userTerms = () => `${BASE_URL}/api/user/terms`;
+export const acceptUserTerms = () => `${BASE_URL}/api/user/terms/accept`;
+export const banner = () => `${BASE_URL}/api/banner`;
 
 // Message Feedback
 export const feedback = (conversationId: string, messageId: string) =>
-  `/api/messages/${conversationId}/${messageId}/feedback`;
+  `${BASE_URL}/api/messages/${conversationId}/${messageId}/feedback`;
 
 // Two-Factor Endpoints
-export const enableTwoFactor = () => '/api/auth/2fa/enable';
-export const verifyTwoFactor = () => '/api/auth/2fa/verify';
-export const confirmTwoFactor = () => '/api/auth/2fa/confirm';
-export const disableTwoFactor = () => '/api/auth/2fa/disable';
-export const regenerateBackupCodes = () => '/api/auth/2fa/backup/regenerate';
-export const verifyTwoFactorTemp = () => '/api/auth/2fa/verify-temp';
+export const enableTwoFactor = () => `${BASE_URL}/api/auth/2fa/enable`;
+export const verifyTwoFactor = () => `${BASE_URL}/api/auth/2fa/verify`;
+export const confirmTwoFactor = () => `${BASE_URL}/api/auth/2fa/confirm`;
+export const disableTwoFactor = () => `${BASE_URL}/api/auth/2fa/disable`;
+export const regenerateBackupCodes = () => `${BASE_URL}/api/auth/2fa/backup/regenerate`;
+export const verifyTwoFactorTemp = () => `${BASE_URL}/api/auth/2fa/verify-temp`;
 
 /* Memories */
-export const memories = () => '/api/memories';
+export const memories = () => `${BASE_URL}/api/memories`;
 export const memory = (key: string) => `${memories()}/${encodeURIComponent(key)}`;
 export const memoryPreferences = () => `${memories()}/preferences`;
 
 export const searchPrincipals = (params: q.PrincipalSearchParams) => {
   const { q: query, limit, types } = params;
-  let url = `/api/permissions/search-principals?q=${encodeURIComponent(query)}`;
+  let url = `${BASE_URL}/api/permissions/search-principals?q=${encodeURIComponent(query)}`;
 
   if (limit !== undefined) {
     url += `&limit=${limit}`;
@@ -328,17 +349,17 @@ export const searchPrincipals = (params: q.PrincipalSearchParams) => {
 };
 
 export const getAccessRoles = (resourceType: ResourceType) =>
-  `/api/permissions/${resourceType}/roles`;
+  `${BASE_URL}/api/permissions/${resourceType}/roles`;
 
 export const getResourcePermissions = (resourceType: ResourceType, resourceId: string) =>
-  `/api/permissions/${resourceType}/${resourceId}`;
+  `${BASE_URL}/api/permissions/${resourceType}/${resourceId}`;
 
 export const updateResourcePermissions = (resourceType: ResourceType, resourceId: string) =>
-  `/api/permissions/${resourceType}/${resourceId}`;
+  `${BASE_URL}/api/permissions/${resourceType}/${resourceId}`;
 
 export const getEffectivePermissions = (resourceType: ResourceType, resourceId: string) =>
-  `/api/permissions/${resourceType}/${resourceId}/effective`;
+  `${BASE_URL}/api/permissions/${resourceType}/${resourceId}/effective`;
 
 // SharePoint Graph API Token
 export const graphToken = (scopes: string) =>
-  `/api/auth/graph-token?scopes=${encodeURIComponent(scopes)}`;
+  `${BASE_URL}/api/auth/graph-token?scopes=${encodeURIComponent(scopes)}`;
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index 533081479..12056dab2 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -6,6 +6,7 @@ import { specsConfigSchema, TSpecsConfig } from './models';
 import { fileConfigSchema } from './file-config';
 import { FileSources } from './types/files';
 import { MCPServersSchema } from './mcp';
+import { apiBaseUrl } from './api-endpoints';
 
 export const defaultSocialLogins = ['google', 'facebook', 'openid', 'github', 'discord', 'saml'];
 
@@ -1043,9 +1044,9 @@ export const initialModelsConfig: TModelsConfig = {
 };
 
 export const EndpointURLs = {
-  [EModelEndpoint.assistants]: '/api/assistants/v2/chat',
-  [EModelEndpoint.azureAssistants]: '/api/assistants/v1/chat',
-  [EModelEndpoint.agents]: `/api/${EModelEndpoint.agents}/chat`,
+  [EModelEndpoint.assistants]: `${apiBaseUrl()}/api/assistants/v2/chat`,
+  [EModelEndpoint.azureAssistants]: `${apiBaseUrl()}/api/assistants/v1/chat`,
+  [EModelEndpoint.agents]: `${apiBaseUrl()}/api/${EModelEndpoint.agents}/chat`,
 } as const;
 
 export const modularEndpoints = new Set<EModelEndpoint | string>([
diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.ts
index bdcd93311..7116f0d7c 100644
--- a/packages/data-provider/src/data-service.ts
+++ b/packages/data-provider/src/data-service.ts
@@ -684,7 +684,7 @@ export const editArtifact = async ({
   messageId,
   ...params
 }: m.TEditArtifactRequest): Promise<m.TEditArtifactResponse> => {
-  return request.post(`/api/messages/artifact/${messageId}`, params);
+  return request.post(endpoints.messagesArtifacts(messageId), params);
 };
 
 export function getMessagesByConvoId(conversationId: string): Promise<s.TMessage[]> {
@@ -952,3 +952,7 @@ export function getEffectivePermissions(
 export function getGraphApiToken(params: q.GraphTokenParams): Promise<q.GraphTokenResponse> {
   return request.get(endpoints.graphToken(params.scopes));
 }
+
+export function getDomainServerBaseUrl(): string {
+  return `${endpoints.apiBaseUrl()}/api`;
+}