From a28df821d6d0e699f88ef7b71f013f4704bd0fe7 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Wed, 9 Jul 2025 15:03:27 -0700
Subject: [PATCH 1/6] configurable message limit for embed widget

---
 .../EmbedRow/CodeSnippetModal/index.jsx       |  2 +-
 .../EmbedRow/EditEmbedModal/index.jsx         |  6 +++++
 .../EmbedConfigs/NewEmbedModal/index.jsx      |  8 ++++++
 server/models/embedConfig.js                  |  9 +++++++
 .../20250709210936_init/migration.sql         | 27 +++++++++++++++++++
 server/prisma/schema.prisma                   |  1 +
 server/utils/chats/embed.js                   |  3 ++-
 7 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 server/prisma/migrations/20250709210936_init/migration.sql

diff --git a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx
index dc91c57e243..07418ceb1e5 100644
--- a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx
+++ b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx
@@ -101,7 +101,7 @@ const ScriptTag = ({ embed }) => {
       <button
         disabled={copied}
         onClick={handleClick}
-        className={`disabled:border disabled:border-green-300 disabled:light:border-green-600 border border-transparent relative w-full font-mono flex hljs ${theme} light:border light:border-gray-700 text-white placeholder:text-theme-settings-input-placeholder text-sm rounded-lg focus:outline-primary-button active:outline-primary-button outline-none p-2.5`}
+        className={`disabled:border disabled:border-green-300 disabled:light:border-green-600 border border-transparent relative w-full font-mono flex hljs ${theme} light:border light:border-gray-700 text-white placeholder:text-theme-settings-input-placeholder text-sm rounded-lg focus:outline-primary-button active:outline-primary-button outline-none p-2.5 m-1`}
       >
         <div
           className="flex w-full text-left flex-col gap-y-1 pr-6 pl-4 whitespace-pre-line"
diff --git a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx
index 0593181dcd2..ef615ab10dd 100644
--- a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx
+++ b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx
@@ -70,6 +70,12 @@ export default function EditEmbedModal({ embed, closeModal }) {
                 hint="Limit the amount of chats a session user can send with this embed in a 24 hour period. Zero is unlimited."
                 defaultValue={embed.max_chats_per_session}
               />
+              <NumberInput
+                name="message_limit"
+                title="Message History Limit"
+                hint="The number of previous messages to include in the chat context. Default is 20."
+                defaultValue={embed.message_limit}
+              />
               <BooleanInput
                 name="allow_model_override"
                 title="Enable dynamic model use"
diff --git a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx
index c0e4f977bcb..46bd111974c 100644
--- a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx
+++ b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx
@@ -20,6 +20,7 @@ export function enforceSubmissionSchema(form) {
     data.allow_temperature_override = false;
   if (!data.hasOwnProperty("allow_prompt_override"))
     data.allow_prompt_override = false;
+  if (!data.hasOwnProperty("message_limit")) data.message_limit = 20;
   return data;
 }
 
@@ -69,6 +70,12 @@ export default function NewEmbedModal({ closeModal }) {
                 title="Max chats per session"
                 hint="Limit the amount of chats a session user can send with this embed in a 24 hour period. Zero is unlimited."
               />
+              <NumberInput
+                name="message_limit"
+                title="Message History Limit"
+                hint="The number of previous messages to include in the chat context. Default is 20."
+                defaultValue={20}
+              />
               <BooleanInput
                 name="allow_model_override"
                 title="Enable dynamic model use"
@@ -150,6 +157,7 @@ export const WorkspaceSelection = ({ defaultValue = null }) => {
         {workspaces.map((workspace) => {
           return (
             <option
+              key={workspace.id}
               selected={defaultValue === workspace.id}
               value={workspace.id}
             >
diff --git a/server/models/embedConfig.js b/server/models/embedConfig.js
index bdeb13cfba1..a23239f1ea6 100644
--- a/server/models/embedConfig.js
+++ b/server/models/embedConfig.js
@@ -14,6 +14,7 @@ const EmbedConfig = {
     "max_chats_per_session",
     "chat_mode",
     "workspace_id",
+    "message_limit",
   ],
 
   new: async function (data, creatorId = null) {
@@ -47,6 +48,10 @@ const EmbedConfig = {
             data?.max_chats_per_session,
             "max_chats_per_session"
           ),
+          message_limit: validatedCreationData(
+            data?.message_limit,
+            "message_limit"
+          ),
           createdBy: Number(creatorId) ?? null,
           workspace: {
             connect: { id: Number(data.workspace_id) },
@@ -190,6 +195,7 @@ const NUMBER_KEYS = [
   "max_chats_per_day",
   "max_chats_per_session",
   "workspace_id",
+  "message_limit",
 ];
 
 // Helper to validate a data object strictly into the proper format
@@ -230,6 +236,9 @@ function validatedCreationData(value, field) {
   }
 
   if (NUMBER_KEYS.includes(field)) {
+    if (field === "message_limit") {
+      return !isNaN(value) && Number(value) >= 0 ? Number(value) : 20;
+    }
     return isNaN(value) || Number(value) <= 0 ? null : Number(value);
   }
 
diff --git a/server/prisma/migrations/20250709210936_init/migration.sql b/server/prisma/migrations/20250709210936_init/migration.sql
new file mode 100644
index 00000000000..508afedc89a
--- /dev/null
+++ b/server/prisma/migrations/20250709210936_init/migration.sql
@@ -0,0 +1,27 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_embed_configs" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "uuid" TEXT NOT NULL,
+    "enabled" BOOLEAN NOT NULL DEFAULT false,
+    "chat_mode" TEXT NOT NULL DEFAULT 'query',
+    "allowlist_domains" TEXT,
+    "allow_model_override" BOOLEAN NOT NULL DEFAULT false,
+    "allow_temperature_override" BOOLEAN NOT NULL DEFAULT false,
+    "allow_prompt_override" BOOLEAN NOT NULL DEFAULT false,
+    "max_chats_per_day" INTEGER,
+    "max_chats_per_session" INTEGER,
+    "message_limit" INTEGER NOT NULL DEFAULT 20,
+    "workspace_id" INTEGER NOT NULL,
+    "createdBy" INTEGER,
+    "usersId" INTEGER,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "embed_configs_workspace_id_fkey" FOREIGN KEY ("workspace_id") REFERENCES "workspaces" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "embed_configs_usersId_fkey" FOREIGN KEY ("usersId") REFERENCES "users" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_embed_configs" ("allow_model_override", "allow_prompt_override", "allow_temperature_override", "allowlist_domains", "chat_mode", "createdAt", "createdBy", "enabled", "id", "max_chats_per_day", "max_chats_per_session", "usersId", "uuid", "workspace_id") SELECT "allow_model_override", "allow_prompt_override", "allow_temperature_override", "allowlist_domains", "chat_mode", "createdAt", "createdBy", "enabled", "id", "max_chats_per_day", "max_chats_per_session", "usersId", "uuid", "workspace_id" FROM "embed_configs";
+DROP TABLE "embed_configs";
+ALTER TABLE "new_embed_configs" RENAME TO "embed_configs";
+CREATE UNIQUE INDEX "embed_configs_uuid_key" ON "embed_configs"("uuid");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index dbfbb7ebe40..59dc37ea4f2 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -240,6 +240,7 @@ model embed_configs {
   allow_prompt_override      Boolean       @default(false)
   max_chats_per_day          Int?
   max_chats_per_session      Int?
+  message_limit              Int           @default(20)
   workspace_id               Int
   createdBy                  Int?
   usersId                    Int?
diff --git a/server/utils/chats/embed.js b/server/utils/chats/embed.js
index 67528d8e487..8346348248f 100644
--- a/server/utils/chats/embed.js
+++ b/server/utils/chats/embed.js
@@ -34,7 +34,8 @@ async function streamChatWithForEmbed(
   });
   const VectorDb = getVectorDbClass();
 
-  const messageLimit = 20;
+  const messageLimit = embed.message_limit;
+  console.log("messageLimit", messageLimit);
   const hasVectorizedSpace = await VectorDb.hasNamespace(embed.workspace.slug);
   const embeddingsCount = await VectorDb.namespaceCount(embed.workspace.slug);
 

From a8bedb1ec63a71b161825fef92d94a08e31a2a26 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Wed, 9 Jul 2025 15:12:38 -0700
Subject: [PATCH 2/6] remove console log

---
 server/utils/chats/embed.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/utils/chats/embed.js b/server/utils/chats/embed.js
index 8346348248f..4945f8c2813 100644
--- a/server/utils/chats/embed.js
+++ b/server/utils/chats/embed.js
@@ -35,7 +35,6 @@ async function streamChatWithForEmbed(
   const VectorDb = getVectorDbClass();
 
   const messageLimit = embed.message_limit;
-  console.log("messageLimit", messageLimit);
   const hasVectorizedSpace = await VectorDb.hasNamespace(embed.workspace.slug);
   const embeddingsCount = await VectorDb.namespaceCount(embed.workspace.slug);
 

From 647a0fd9cf9eeb1b03bf5e09178e752da8118067 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Wed, 9 Jul 2025 16:29:51 -0700
Subject: [PATCH 3/6] make field optional + add fallback

---
 .../20250709210936_init/migration.sql         | 27 -------------------
 .../20250709230835_init/migration.sql         |  2 ++
 server/prisma/schema.prisma                   |  2 +-
 server/utils/chats/embed.js                   |  2 +-
 4 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 server/prisma/migrations/20250709210936_init/migration.sql
 create mode 100644 server/prisma/migrations/20250709230835_init/migration.sql

diff --git a/server/prisma/migrations/20250709210936_init/migration.sql b/server/prisma/migrations/20250709210936_init/migration.sql
deleted file mode 100644
index 508afedc89a..00000000000
--- a/server/prisma/migrations/20250709210936_init/migration.sql
+++ /dev/null
@@ -1,27 +0,0 @@
--- RedefineTables
-PRAGMA foreign_keys=OFF;
-CREATE TABLE "new_embed_configs" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "uuid" TEXT NOT NULL,
-    "enabled" BOOLEAN NOT NULL DEFAULT false,
-    "chat_mode" TEXT NOT NULL DEFAULT 'query',
-    "allowlist_domains" TEXT,
-    "allow_model_override" BOOLEAN NOT NULL DEFAULT false,
-    "allow_temperature_override" BOOLEAN NOT NULL DEFAULT false,
-    "allow_prompt_override" BOOLEAN NOT NULL DEFAULT false,
-    "max_chats_per_day" INTEGER,
-    "max_chats_per_session" INTEGER,
-    "message_limit" INTEGER NOT NULL DEFAULT 20,
-    "workspace_id" INTEGER NOT NULL,
-    "createdBy" INTEGER,
-    "usersId" INTEGER,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    CONSTRAINT "embed_configs_workspace_id_fkey" FOREIGN KEY ("workspace_id") REFERENCES "workspaces" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
-    CONSTRAINT "embed_configs_usersId_fkey" FOREIGN KEY ("usersId") REFERENCES "users" ("id") ON DELETE SET NULL ON UPDATE CASCADE
-);
-INSERT INTO "new_embed_configs" ("allow_model_override", "allow_prompt_override", "allow_temperature_override", "allowlist_domains", "chat_mode", "createdAt", "createdBy", "enabled", "id", "max_chats_per_day", "max_chats_per_session", "usersId", "uuid", "workspace_id") SELECT "allow_model_override", "allow_prompt_override", "allow_temperature_override", "allowlist_domains", "chat_mode", "createdAt", "createdBy", "enabled", "id", "max_chats_per_day", "max_chats_per_session", "usersId", "uuid", "workspace_id" FROM "embed_configs";
-DROP TABLE "embed_configs";
-ALTER TABLE "new_embed_configs" RENAME TO "embed_configs";
-CREATE UNIQUE INDEX "embed_configs_uuid_key" ON "embed_configs"("uuid");
-PRAGMA foreign_key_check;
-PRAGMA foreign_keys=ON;
diff --git a/server/prisma/migrations/20250709230835_init/migration.sql b/server/prisma/migrations/20250709230835_init/migration.sql
new file mode 100644
index 00000000000..a183c5c2d3c
--- /dev/null
+++ b/server/prisma/migrations/20250709230835_init/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "embed_configs" ADD COLUMN "message_limit" INTEGER DEFAULT 20;
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 59dc37ea4f2..999cf65dfb2 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -240,7 +240,7 @@ model embed_configs {
   allow_prompt_override      Boolean       @default(false)
   max_chats_per_day          Int?
   max_chats_per_session      Int?
-  message_limit              Int           @default(20)
+  message_limit              Int?          @default(20)
   workspace_id               Int
   createdBy                  Int?
   usersId                    Int?
diff --git a/server/utils/chats/embed.js b/server/utils/chats/embed.js
index 4945f8c2813..c932bd773ac 100644
--- a/server/utils/chats/embed.js
+++ b/server/utils/chats/embed.js
@@ -34,7 +34,7 @@ async function streamChatWithForEmbed(
   });
   const VectorDb = getVectorDbClass();
 
-  const messageLimit = embed.message_limit;
+  const messageLimit = embed.message_limit || 20;
   const hasVectorizedSpace = await VectorDb.hasNamespace(embed.workspace.slug);
   const embeddingsCount = await VectorDb.namespaceCount(embed.workspace.slug);
 

From 9b8e7b31d3bcf7325c17ec3986c03b37c967ecb6 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Wed, 9 Jul 2025 16:36:51 -0700
Subject: [PATCH 4/6] rework validation logic

---
 server/models/embedConfig.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/models/embedConfig.js b/server/models/embedConfig.js
index a23239f1ea6..75c26313075 100644
--- a/server/models/embedConfig.js
+++ b/server/models/embedConfig.js
@@ -236,10 +236,10 @@ function validatedCreationData(value, field) {
   }
 
   if (NUMBER_KEYS.includes(field)) {
-    if (field === "message_limit") {
-      return !isNaN(value) && Number(value) >= 0 ? Number(value) : 20;
-    }
-    return isNaN(value) || Number(value) <= 0 ? null : Number(value);
+    const num = Number(value);
+    if (isNaN(num)) return null;
+    if (field === "message_limit") return num >= 0 ? num : null;
+    return num <= 0 ? null : num;
   }
 
   return null;

From f0ee331befaf2faae0adece65a7e53ae5bdd6c7b Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Thu, 10 Jul 2025 12:44:50 -0700
Subject: [PATCH 5/6] lint

---
 server/models/embedConfig.js | 9 +++++----
 server/utils/chats/embed.js  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/models/embedConfig.js b/server/models/embedConfig.js
index 75c26313075..e1eab97693b 100644
--- a/server/models/embedConfig.js
+++ b/server/models/embedConfig.js
@@ -231,15 +231,16 @@ function validatedCreationData(value, field) {
     }
   }
 
+  if (field === "message_limit") {
+    return isNaN(value) || Number(value) <= 0 ? 20 : Number(value);
+  }
+
   if (BOOLEAN_KEYS.includes(field)) {
     return value === true || value === false ? value : false;
   }
 
   if (NUMBER_KEYS.includes(field)) {
-    const num = Number(value);
-    if (isNaN(num)) return null;
-    if (field === "message_limit") return num >= 0 ? num : null;
-    return num <= 0 ? null : num;
+    return isNaN(value) || Number(value) <= 0 ? null : Number(value);
   }
 
   return null;
diff --git a/server/utils/chats/embed.js b/server/utils/chats/embed.js
index c932bd773ac..d9320241b35 100644
--- a/server/utils/chats/embed.js
+++ b/server/utils/chats/embed.js
@@ -34,7 +34,7 @@ async function streamChatWithForEmbed(
   });
   const VectorDb = getVectorDbClass();
 
-  const messageLimit = embed.message_limit || 20;
+  const messageLimit = embed.message_limit ?? 20;
   const hasVectorizedSpace = await VectorDb.hasNamespace(embed.workspace.slug);
   const embeddingsCount = await VectorDb.namespaceCount(embed.workspace.slug);
 

From 7c72dbef11a4d383f3dcb0f3a802c7c24b1a3463 Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Thu, 10 Jul 2025 12:45:30 -0700
Subject: [PATCH 6/6] remove field specific guard, it cannot be lte 0 like all
 other fields

---
 server/models/embedConfig.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/models/embedConfig.js b/server/models/embedConfig.js
index e1eab97693b..202c5a68fbd 100644
--- a/server/models/embedConfig.js
+++ b/server/models/embedConfig.js
@@ -231,10 +231,6 @@ function validatedCreationData(value, field) {
     }
   }
 
-  if (field === "message_limit") {
-    return isNaN(value) || Number(value) <= 0 ? 20 : Number(value);
-  }
-
   if (BOOLEAN_KEYS.includes(field)) {
     return value === true || value === false ? value : false;
   }