From 008ac9d47e7b817f37dd0fd6d0ddce4917c19789 Mon Sep 17 00:00:00 2001
From: Deathspike <meister.deathspike@outlook.com>
Date: Fri, 15 Dec 2023 15:30:02 +0100
Subject: [PATCH 01/11] Add SD character-prefixed free-mode

---
 .../extensions/stable-diffusion/index.js      | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index 9a57bcd8e..8e4305d6b 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -58,6 +58,7 @@ const generationMode = {
     CHARACTER_MULTIMODAL: 8,
     USER_MULTIMODAL: 9,
     FACE_MULTIMODAL: 10,
+    CHARACTER_FREE: 11,
 };
 
 const multimodalMap = {
@@ -1563,6 +1564,10 @@ function getGenerationType(prompt) {
         mode = multimodalMap[mode];
     }
 
+    if (mode === generationMode.FREE && /^char\s/.test(prompt)) {
+        mode = generationMode.CHARACTER_FREE;
+    }
+
     return mode;
 }
 
@@ -1718,6 +1723,9 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
         case generationMode.USER_MULTIMODAL:
             prompt = await generateMultimodalPrompt(generationType, quietPrompt);
             break;
+        case generationMode.CHARACTER_FREE:
+            prompt = generateFreeCharacterPrompt(trigger);
+            break;
         default:
             prompt = await generatePrompt(quietPrompt);
             break;
@@ -1730,6 +1738,41 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
     return prompt;
 }
 
+/**
+ * Generates a free prompt with a character-specific prompt prefix.
+ * @param {string} trigger - The prompt to use for the image generation.
+ * @returns {string}
+ */
+function generateFreeCharacterPrompt(trigger) {
+    const context = getContext();
+
+    const getCharacterPrefix = () => {
+        const key = getLastCharacterKey();
+        const value = (extension_settings.sd.character_prompts[key] || '').trim();
+        return value ? value + ' ' : '';
+    };
+
+    const getLastCharacterKey = () => {
+        if (typeof this_chid !== 'undefined') {
+            return getCharaFilename(this_chid);
+        }
+        for (let i = context.chat.length - 1; i >= 0; i--) {
+            const message = context.chat[i];
+            if (context.is_user || message.is_system) {
+                continue;
+            } else if (typeof message.original_avatar === 'string') {
+                return message.original_avatar.replace(/\.[^/.]+$/, '');
+            }
+        }
+        throw new Error('No usable messages found.');
+    };
+
+    const prefix = getCharacterPrefix();
+    const pieces = trigger.split(/\s+/g);
+    const prompt = pieces.slice(1).join(' ');
+    return (prefix + prompt).trim();
+}
+
 /**
  * Generates a prompt using multimodal captioning.
  * @param {number} generationType - The type of image generation to perform.

From 8aa18142876bff24ac7052a358a0e5c2c3ebd047 Mon Sep 17 00:00:00 2001
From: Deathspike <meister.deathspike@outlook.com>
Date: Fri, 15 Dec 2023 19:34:29 +0100
Subject: [PATCH 02/11] Fix SD character-prefixed free-mode user detection

---
 public/scripts/extensions/stable-diffusion/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index 8e4305d6b..751815f94 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -1758,7 +1758,7 @@ function generateFreeCharacterPrompt(trigger) {
         }
         for (let i = context.chat.length - 1; i >= 0; i--) {
             const message = context.chat[i];
-            if (context.is_user || message.is_system) {
+            if (message.is_user || message.is_system) {
                 continue;
             } else if (typeof message.original_avatar === 'string') {
                 return message.original_avatar.replace(/\.[^/.]+$/, '');

From 9b9026b12e7464f05d0409bb20ee8882b78a4f61 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 16 Dec 2023 01:35:28 +0200
Subject: [PATCH 03/11] Add toggle for compact input area (mobile)

---
 public/css/mobile-styles.css |  4 ++++
 public/index.html            |  4 ++++
 public/scripts/power-user.js | 28 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/public/css/mobile-styles.css b/public/css/mobile-styles.css
index d62534876..ebcd5eda2 100644
--- a/public/css/mobile-styles.css
+++ b/public/css/mobile-styles.css
@@ -1,5 +1,9 @@
 /*will apply to anything 1000px or less. this catches ipads, horizontal phones, and vertical phones)*/
 @media screen and (max-width: 1000px) {
+    #send_form.compact #leftSendForm, #send_form.compact #rightSendForm {
+        flex-wrap: nowrap;
+        width: unset;
+    }
 
     .bg_button {
         font-size: 15px;
diff --git a/public/index.html b/public/index.html
index b0d21d081..7456a65b5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2972,6 +2972,10 @@
                                 <input id="messageTokensEnabled" type="checkbox" />
                                 <span data-i18n="Show Message Token Count">Message Token Count</span>
                             </label>
+                            <label for="compact_input_area" class="checkbox_label">
+                                <input id="compact_input_area" type="checkbox" />
+                                <span data-i18n="Compact Input Area (Mobile)">Compact Input Area&nbsp;<i class="fa-solid fa-mobile-screen-button"></i></span>
+                            </label>
                             <label data-newbie-hidden for="hotswapEnabled" class="checkbox_label">
                                 <input id="hotswapEnabled" type="checkbox" />
                                 <span data-i18n="Characters Hotswap">Characters Hotswap</span>
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index b5ac27f9d..82398c4dc 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -232,6 +232,7 @@ let power_user = {
     aux_field: 'character_version',
     restore_user_input: true,
     reduced_motion: false,
+    compact_input_area: true,
 };
 
 let themes = [];
@@ -273,6 +274,7 @@ const storage_keys = {
     enableZenSliders: 'enableZenSliders',
     enableLabMode: 'enableLabMode',
     reduced_motion: 'reduced_motion',
+    compact_input_area: 'compact_input_area',
 };
 
 const contextControls = [
@@ -450,6 +452,13 @@ function switchReducedMotion() {
     $('#reduced_motion').prop('checked', power_user.reduced_motion);
 }
 
+function switchCompactInputArea() {
+    const value = localStorage.getItem(storage_keys.compact_input_area);
+    power_user.compact_input_area = value === null ? true : value == 'true';
+    $('#send_form').toggleClass('compact', power_user.compact_input_area);
+    $('#compact_input_area').prop('checked', power_user.compact_input_area);
+}
+
 var originalSliderValues = [];
 
 async function switchLabMode() {
@@ -1246,6 +1255,15 @@ async function applyTheme(name) {
             action: async () => {
                 localStorage.setItem(storage_keys.reduced_motion, String(power_user.reduced_motion));
                 $('#reduced_motion').prop('checked', power_user.reduced_motion);
+                switchReducedMotion();
+            },
+        },
+        {
+            key: 'compact_input_area',
+            action: async () => {
+                localStorage.setItem(storage_keys.compact_input_area, String(power_user.compact_input_area));
+                $('#compact_input_area').prop('checked', power_user.compact_input_area);
+                switchCompactInputArea();
             },
         },
     ];
@@ -1504,6 +1522,7 @@ function loadPowerUserSettings(settings, data) {
 
     $(`#character_sort_order option[data-order="${power_user.sort_order}"][data-field="${power_user.sort_field}"]`).prop('selected', true);
     switchReducedMotion();
+    switchCompactInputArea();
     reloadMarkdownProcessor(power_user.render_formulas);
     loadInstructMode(data);
     loadContextSettings();
@@ -1932,6 +1951,8 @@ async function saveTheme() {
         hotswap_enabled: power_user.hotswap_enabled,
         custom_css: power_user.custom_css,
         bogus_folders: power_user.bogus_folders,
+        reduced_motion: power_user.reduced_motion,
+        compact_input_area: power_user.compact_input_area,
     };
 
     const response = await fetch('/savetheme', {
@@ -3151,6 +3172,13 @@ $(document).ready(() => {
         saveSettingsDebounced();
     });
 
+    $('#compact_input_area').on('input', function () {
+        power_user.compact_input_area = !!$(this).prop('checked');
+        localStorage.setItem(storage_keys.compact_input_area, String(power_user.compact_input_area));
+        switchCompactInputArea();
+        saveSettingsDebounced();
+    });
+
     $(document).on('click', '#debug_table [data-debug-function]', function () {
         const functionId = $(this).data('debug-function');
         const functionRecord = debug_functions.find(f => f.functionId === functionId);

From 6774ec3eb9df949158936b5e8c903092749e1aa4 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 16 Dec 2023 01:45:48 +0200
Subject: [PATCH 04/11] Add a separate button to update current UI theme

---
 public/index.html            |  5 ++++-
 public/scripts/power-user.js | 26 +++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7456a65b5..81e696a22 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2776,9 +2776,12 @@
                             <div class="flex-container flexnowrap alignitemscenter">
                                 <select id="themes" class="margin0">
                                 </select>
-                                <div id="ui-preset-save-button" title="Save changes to a new theme file" data-i18n="[title]Save changes to a new theme file" class="menu_button margin0">
+                                <div id="ui-preset-update-button" title="Update a theme file" data-i18n="[title]Update a theme file" class="menu_button margin0">
                                     <i class="fa-solid fa-save"></i>
                                 </div>
+                                <div id="ui-preset-save-button" title="Save as a new theme" data-i18n="[title]Save as a new theme" class="menu_button margin0">
+                                    <i class="fa-solid fa-paste"></i>
+                                </div>
                             </div>
                         </div>
                         <div name="themeElements" data-newbie-hidden class="flex-container flexFlowColumn flexNoGap">
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 82398c4dc..7153bfd2d 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -1912,11 +1912,26 @@ function sortEntitiesList(entities) {
     });
 }
 
-async function saveTheme() {
-    const name = await callPopup('Enter a theme preset name:', 'input');
+/**
+ * Updates the current UI theme file.
+ */
+async function updateTheme() {
+    await saveTheme(power_user.theme);
+    toastr.success('Theme saved.');
+}
 
-    if (!name) {
-        return;
+/**
+ * Saves the current theme to the server.
+ * @param {string|undefined} name Theme name. If undefined, a popup will be shown to enter a name.
+ * @returns {Promise<void>} A promise that resolves when the theme is saved.
+ */
+async function saveTheme(name = undefined) {
+    if (typeof name !== 'string') {
+        name = await callPopup('Enter a theme preset name:', 'input', power_user.theme);
+
+        if (!name) {
+            return;
+        }
     }
 
     const theme = {
@@ -2825,7 +2840,8 @@ $(document).ready(() => {
         saveSettingsDebounced();
     });
 
-    $('#ui-preset-save-button').on('click', saveTheme);
+    $('#ui-preset-save-button').on('click', () => saveTheme());
+    $('#ui-preset-update-button').on('click', () => updateTheme());
     $('#movingui-preset-save-button').on('click', saveMovingUI);
 
     $('#never_resize_avatars').on('input', function () {

From e609789f8d8adc7d67b4ec0f50a54f5e168d0265 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 16 Dec 2023 01:58:52 +0200
Subject: [PATCH 05/11] Adjust step for OAI TTS speed

---
 public/scripts/extensions/tts/openai.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/extensions/tts/openai.js b/public/scripts/extensions/tts/openai.js
index f08e62a13..98d1bce49 100644
--- a/public/scripts/extensions/tts/openai.js
+++ b/public/scripts/extensions/tts/openai.js
@@ -44,7 +44,7 @@ class OpenAITtsProvider {
         </div>
         <div>
             <label for="openai-tts-speed">Speed: <span id="openai-tts-speed-output"></span></label>
-            <input type="range" id="openai-tts-speed" value="1" min="0.25" max="4" step="0.25">
+            <input type="range" id="openai-tts-speed" value="1" min="0.25" max="4" step="0.05">
         </div>`;
         return html;
     }

From b569d74552cad7916cb184d4b642509665c63873 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 16 Dec 2023 02:52:48 +0200
Subject: [PATCH 06/11] Configurable auto-mode delay

---
 public/index.html             |  1 +
 public/scripts/group-chats.js | 24 +++++++++++++++++++++++-
 src/endpoints/groups.js       |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 81e696a22..681c33801 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3630,6 +3630,7 @@
                                             <label id="rm_group_automode_label" class="checkbox_label whitespacenowrap">
                                                 <input id="rm_group_automode" type="checkbox" />
                                                 <span data-i18n="Auto Mode">Auto Mode</span>
+                                                <input id="rm_group_automode_delay" class="text_pole textarea_compact widthUnset" type="number" min="1" max="999" step="1" value="5" title="Auto Mode delay" />
                                             </label>
                                             <label id="rm_group_hidemutedsprites_label" class="checkbox_label whitespacenowrap">
                                                 <input id="rm_group_hidemutedsprites" type="checkbox" />
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index 57d54a036..7108a9914 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -110,10 +110,18 @@ export const group_generation_mode = {
     APPEND: 1,
 };
 
+const DEFAULT_AUTO_MODE_DELAY = 5;
+
 export const groupCandidatesFilter = new FilterHelper(debounce(printGroupCandidates, 100));
-setInterval(groupChatAutoModeWorker, 5000);
+let autoModeWorker = null;
 const saveGroupDebounced = debounce(async (group, reload) => await _save(group, reload), 500);
 
+function setAutoModeWorker() {
+    clearInterval(autoModeWorker);
+    const autoModeDelay = groups.find(x => x.id === selected_group)?.auto_mode_delay ?? DEFAULT_AUTO_MODE_DELAY;
+    autoModeWorker = setInterval(groupChatAutoModeWorker, autoModeDelay * 1000);
+}
+
 async function _save(group, reload = true) {
     await fetch('/api/groups/edit', {
         method: 'POST',
@@ -1035,6 +1043,15 @@ async function onGroupGenerationModeInput(e) {
     }
 }
 
+async function onGroupAutoModeDelayInput(e) {
+    if (openGroupId) {
+        let _thisGroup = groups.find((x) => x.id == openGroupId);
+        _thisGroup.auto_mode_delay = Number(e.target.value);
+        await editGroup(openGroupId, false, false);
+        setAutoModeWorker();
+    }
+}
+
 async function onGroupNameInput() {
     if (openGroupId) {
         let _thisGroup = groups.find((x) => x.id == openGroupId);
@@ -1231,6 +1248,7 @@ function select_group_chats(groupId, skipAnimation) {
     $('#rm_group_submit').prop('disabled', !groupHasMembers);
     $('#rm_group_allow_self_responses').prop('checked', group && group.allow_self_responses);
     $('#rm_group_hidemutedsprites').prop('checked', group && group.hideMutedSprites);
+    $('#rm_group_automode_delay').val(group?.auto_mode_delay ?? DEFAULT_AUTO_MODE_DELAY);
 
     // bottom buttons
     if (openGroupId) {
@@ -1249,6 +1267,7 @@ function select_group_chats(groupId, skipAnimation) {
     }
 
     updateFavButtonState(group?.fav ?? false);
+    setAutoModeWorker();
 
     // top bar
     if (group) {
@@ -1441,6 +1460,7 @@ async function createGroup() {
     let allowSelfResponses = !!$('#rm_group_allow_self_responses').prop('checked');
     let activationStrategy = Number($('#rm_group_activation_strategy').find(':selected').val()) ?? group_activation_strategy.NATURAL;
     let generationMode = Number($('#rm_group_generation_mode').find(':selected').val()) ?? group_generation_mode.SWAP;
+    let autoModeDelay = Number($('#rm_group_automode_delay').val()) ?? DEFAULT_AUTO_MODE_DELAY;
     const members = newGroupMembers;
     const memberNames = characters.filter(x => members.includes(x.avatar)).map(x => x.name).join(', ');
 
@@ -1469,6 +1489,7 @@ async function createGroup() {
             fav: fav_grp_checked,
             chat_id: chatName,
             chats: chats,
+            auto_mode_delay: autoModeDelay,
         }),
     });
 
@@ -1741,6 +1762,7 @@ jQuery(() => {
     $('#rm_group_allow_self_responses').on('input', onGroupSelfResponsesClick);
     $('#rm_group_activation_strategy').on('change', onGroupActivationStrategyInput);
     $('#rm_group_generation_mode').on('change', onGroupGenerationModeInput);
+    $('#rm_group_automode_delay').on('input', onGroupAutoModeDelayInput);
     $('#group_avatar_button').on('input', uploadGroupAvatar);
     $('#rm_group_restore_avatar').on('click', restoreGroupAvatar);
     $(document).on('click', '.group_member .right_menu_button', onGroupActionClick);
diff --git a/src/endpoints/groups.js b/src/endpoints/groups.js
index d7341ff04..f8a117e84 100644
--- a/src/endpoints/groups.js
+++ b/src/endpoints/groups.js
@@ -73,6 +73,7 @@ router.post('/create', jsonParser, (request, response) => {
         fav: request.body.fav,
         chat_id: request.body.chat_id ?? id,
         chats: request.body.chats ?? [id],
+        auto_mode_delay: request.body.auto_mode_delay ?? 5,
     };
     const pathToFile = path.join(DIRECTORIES.groups, `${id}.json`);
     const fileData = JSON.stringify(groupMetadata);

From 14400b05f97633bdf5ee84d62510f744ceba27cf Mon Sep 17 00:00:00 2001
From: Deathspike <meister.deathspike@outlook.com>
Date: Sat, 16 Dec 2023 11:29:34 +0100
Subject: [PATCH 07/11] Rework character-prefixed free-mode to support macro

---
 .../extensions/stable-diffusion/index.js      | 61 ++++++++-----------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index 751815f94..302a0a5ca 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -58,7 +58,6 @@ const generationMode = {
     CHARACTER_MULTIMODAL: 8,
     USER_MULTIMODAL: 9,
     FACE_MULTIMODAL: 10,
-    CHARACTER_FREE: 11,
 };
 
 const multimodalMap = {
@@ -1564,10 +1563,6 @@ function getGenerationType(prompt) {
         mode = multimodalMap[mode];
     }
 
-    if (mode === generationMode.FREE && /^char\s/.test(prompt)) {
-        mode = generationMode.CHARACTER_FREE;
-    }
-
     return mode;
 }
 
@@ -1716,16 +1711,13 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
             prompt = message || getRawLastMessage();
             break;
         case generationMode.FREE:
-            prompt = trigger.trim();
+            prompt = generateFreeModePrompt(trigger.trim());
             break;
         case generationMode.FACE_MULTIMODAL:
         case generationMode.CHARACTER_MULTIMODAL:
         case generationMode.USER_MULTIMODAL:
             prompt = await generateMultimodalPrompt(generationType, quietPrompt);
             break;
-        case generationMode.CHARACTER_FREE:
-            prompt = generateFreeCharacterPrompt(trigger);
-            break;
         default:
             prompt = await generatePrompt(quietPrompt);
             break;
@@ -1739,38 +1731,33 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
 }
 
 /**
- * Generates a free prompt with a character-specific prompt prefix.
+ * Generates a free prompt with a character-specific prompt prefix support.
  * @param {string} trigger - The prompt to use for the image generation.
  * @returns {string}
  */
-function generateFreeCharacterPrompt(trigger) {
-    const context = getContext();
+function generateFreeModePrompt(trigger) {
+    return trigger
+        .replace(/(?:^char(\s)|\{\{charPrefix\}\})/gi, (_, suffix) => {
+            const getLastCharacterKey = () => {
+                if (typeof this_chid !== 'undefined') {
+                    return getCharaFilename(this_chid);
+                }
+                const context = getContext();
+                for (let i = context.chat.length - 1; i >= 0; i--) {
+                    const message = context.chat[i];
+                    if (message.is_user || message.is_system) {
+                        continue;
+                    } else if (typeof message.original_avatar === 'string') {
+                        return message.original_avatar.replace(/\.[^/.]+$/, '');
+                    }
+                }
+                throw new Error('No usable messages found.');
+            };
 
-    const getCharacterPrefix = () => {
-        const key = getLastCharacterKey();
-        const value = (extension_settings.sd.character_prompts[key] || '').trim();
-        return value ? value + ' ' : '';
-    };
-
-    const getLastCharacterKey = () => {
-        if (typeof this_chid !== 'undefined') {
-            return getCharaFilename(this_chid);
-        }
-        for (let i = context.chat.length - 1; i >= 0; i--) {
-            const message = context.chat[i];
-            if (message.is_user || message.is_system) {
-                continue;
-            } else if (typeof message.original_avatar === 'string') {
-                return message.original_avatar.replace(/\.[^/.]+$/, '');
-            }
-        }
-        throw new Error('No usable messages found.');
-    };
-
-    const prefix = getCharacterPrefix();
-    const pieces = trigger.split(/\s+/g);
-    const prompt = pieces.slice(1).join(' ');
-    return (prefix + prompt).trim();
+            const key = getLastCharacterKey();
+            const value = (extension_settings.sd.character_prompts[key] || '').trim();
+            return value ? value + (suffix || '') : '';
+        });
 }
 
 /**

From 16795dd5cc1c4e7eddd9743262c48763c0e12b74 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 16 Dec 2023 22:21:40 +0200
Subject: [PATCH 08/11] Add server plugin loader

---
 .eslintrc.js         |   2 +-
 .gitignore           |   1 +
 default/config.yaml  |   2 +
 plugins/.gitkeep     |   0
 server.js            |  16 ++++-
 src/plugin-loader.js | 161 +++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 179 insertions(+), 3 deletions(-)
 create mode 100644 plugins/.gitkeep
 create mode 100644 src/plugin-loader.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 6aef11686..6e926dee9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,7 +12,7 @@ module.exports = {
     overrides: [
         {
             // Server-side files (plus this configuration file)
-            files: ['src/**/*.js', './*.js'],
+            files: ['src/**/*.js', './*.js', 'plugins/**/*.js'],
             env: {
                 node: true,
             },
diff --git a/.gitignore b/.gitignore
index de17c931f..d82301d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ access.log
 /vectors/
 /cache/
 public/css/user.css
+/plugins/
diff --git a/default/config.yaml b/default/config.yaml
index b6e52f834..fd0be655c 100644
--- a/default/config.yaml
+++ b/default/config.yaml
@@ -58,3 +58,5 @@ openai:
 deepl:
   # Available options: default, more, less, prefer_more, prefer_less
   formality: default
+# -- SERVER PLUGIN CONFIGURATION --
+enableServerPlugins: false
diff --git a/plugins/.gitkeep b/plugins/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/server.js b/server.js
index 090dcdacd..153cb908f 100644
--- a/server.js
+++ b/server.js
@@ -93,9 +93,9 @@ const cliArguments = yargs(hideBin(process.argv))
     }).parseSync();
 
 // change all relative paths
-const directory = process['pkg'] ? path.dirname(process.execPath) : __dirname;
+const serverDirectory = process['pkg'] ? path.dirname(process.execPath) : __dirname;
 console.log(process['pkg'] ? 'Running from binary' : 'Running from source');
-process.chdir(directory);
+process.chdir(serverDirectory);
 
 const app = express();
 app.use(compression());
@@ -621,6 +621,8 @@ const setupTasks = async function () {
         exitProcess();
     });
 
+    await loadPlugins();
+
     console.log('Launching...');
 
     if (autorun) open(autorunUrl.toString());
@@ -632,6 +634,16 @@ const setupTasks = async function () {
     }
 };
 
+async function loadPlugins() {
+    try {
+        const pluginDirectory = path.join(serverDirectory, 'plugins');
+        const loader = require('./src/plugin-loader');
+        await loader.loadPlugins(app, pluginDirectory);
+    } catch {
+        console.log('Plugin loading failed.');
+    }
+}
+
 if (listen && !getConfigValue('whitelistMode', true) && !getConfigValue('basicAuthMode', false)) {
     if (getConfigValue('securityOverride', false)) {
         console.warn(color.red('Security has been overridden. If it\'s not a trusted network, change the settings.'));
diff --git a/src/plugin-loader.js b/src/plugin-loader.js
new file mode 100644
index 000000000..a644e5e33
--- /dev/null
+++ b/src/plugin-loader.js
@@ -0,0 +1,161 @@
+const fs = require('fs');
+const path = require('path');
+const { getConfigValue } = require('./util');
+const enableServerPlugins = getConfigValue('enableServerPlugins', false);
+
+/**
+ * Determine if a file is a CommonJS module.
+ * @param {string} file Path to file
+ * @returns {boolean} True if file is a CommonJS module
+ */
+const isCommonJS = (file) => path.extname(file) === '.js';
+
+/**
+ * Determine if a file is an ECMAScript module.
+ * @param {string} file Path to file
+ * @returns {boolean} True if file is an ECMAScript module
+ */
+const isESModule = (file) => path.extname(file) === '.mjs';
+
+/**
+ * Load and initialize server plugins from a directory if they are enabled.
+ * @param {import('express').Express} app Express app
+ * @param {string} pluginsPath Path to plugins directory
+ * @returns {Promise<any>} Promise that resolves when all plugins are loaded
+ */
+async function loadPlugins(app, pluginsPath) {
+    // Server plugins are disabled.
+    if (!enableServerPlugins) {
+        return;
+    }
+
+    // Plugins directory does not exist.
+    if (!fs.existsSync(pluginsPath)) {
+        return;
+    }
+
+    const files = fs.readdirSync(pluginsPath);
+
+    // No plugins to load.
+    if (files.length === 0) {
+        return;
+    }
+
+    for (const file of files) {
+        const pluginFilePath = path.join(pluginsPath, file);
+
+        if (fs.statSync(pluginFilePath).isDirectory()) {
+            await loadFromDirectory(app, pluginFilePath);
+        }
+
+        // Not a JavaScript file.
+        if (!isCommonJS(file) && !isESModule(file)) {
+            continue;
+        }
+
+        await loadFromFile(app, pluginFilePath);
+    }
+}
+
+async function loadFromDirectory(app, pluginDirectoryPath) {
+    const files = fs.readdirSync(pluginDirectoryPath);
+
+    // No plugins to load.
+    if (files.length === 0) {
+        return;
+    }
+
+    // Plugin is an npm package.
+    const packageJsonFilePath = path.join(pluginDirectoryPath, 'package.json');
+    if (fs.existsSync(packageJsonFilePath)) {
+        if (await loadFromPackage(app, packageJsonFilePath)) {
+            return;
+        }
+    }
+
+    // Plugin is a CommonJS module.
+    const cjsFilePath = path.join(pluginDirectoryPath, 'index.js');
+    if (fs.existsSync(cjsFilePath)) {
+        if (await loadFromFile(app, cjsFilePath)) {
+            return;
+        }
+    }
+
+    // Plugin is an ECMAScript module.
+    const esmFilePath = path.join(pluginDirectoryPath, 'index.mjs');
+    if (fs.existsSync(esmFilePath)) {
+        if (await loadFromFile(app, esmFilePath)) {
+            return;
+        }
+    }
+}
+
+/**
+ * Loads and initializes a plugin from an npm package.
+ * @param {import('express').Express} app Express app
+ * @param {string} packageJsonPath Path to package.json file
+ * @returns {Promise<boolean>} Promise that resolves to true if plugin was loaded successfully
+ */
+async function loadFromPackage(app, packageJsonPath) {
+    try {
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+        if (packageJson.main) {
+            const pluginFilePath = path.join(path.dirname(packageJsonPath), packageJson.main);
+            return await loadFromFile(app, pluginFilePath);
+        }
+    } catch (error) {
+        console.error(`Failed to load plugin from ${packageJsonPath}: ${error}`);
+    }
+    return false;
+}
+
+/**
+ * Loads and initializes a plugin from a file.
+ * @param {import('express').Express} app Express app
+ * @param {string} pluginFilePath Path to plugin directory
+ * @returns {Promise<boolean>} Promise that resolves to true if plugin was loaded successfully
+ */
+async function loadFromFile(app, pluginFilePath) {
+    try {
+        const plugin = await getPluginModule(pluginFilePath);
+        console.log(`Initializing plugin from ${pluginFilePath}`);
+        return await initPlugin(app, plugin);
+    } catch (error) {
+        console.error(`Failed to load plugin from ${pluginFilePath}: ${error}`);
+        return false;
+    }
+}
+
+/**
+ * Initializes a plugin module.
+ * @param {import('express').Express} app Express app
+ * @param {any} plugin Plugin module
+ * @returns {Promise<boolean>} Promise that resolves to true if plugin was initialized successfully
+ */
+async function initPlugin(app, plugin) {
+    if (typeof plugin.init === 'function') {
+        await plugin.init(app);
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Loads a module from a file depending on the module type.
+ * @param {string} pluginFilePath Path to plugin file
+ * @returns {Promise<any>} Promise that resolves to plugin module
+ */
+async function getPluginModule(pluginFilePath) {
+    if (isCommonJS(pluginFilePath)) {
+        return require(pluginFilePath);
+    }
+    if (isESModule(pluginFilePath)) {
+        return await import(pluginFilePath);
+    }
+    throw new Error(`Unsupported module type in ${pluginFilePath}`);
+}
+
+module.exports = {
+    loadPlugins,
+};

From 26e822046eb34f07bd9e9f91fba69486a0570982 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 16 Dec 2023 22:33:09 +0200
Subject: [PATCH 09/11] Hide "Summarize now" for extras source

---
 public/scripts/extensions/memory/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/scripts/extensions/memory/index.js b/public/scripts/extensions/memory/index.js
index 8ebeb2380..f3373ddad 100644
--- a/public/scripts/extensions/memory/index.js
+++ b/public/scripts/extensions/memory/index.js
@@ -322,6 +322,11 @@ async function onChatEvent() {
 }
 
 async function forceSummarizeChat() {
+    if (extension_settings.memory.source === summary_sources.extras) {
+        toastr.warning('Force summarization is not supported for Extras API');
+        return;
+    }
+
     const context = getContext();
 
     const skipWIAN = extension_settings.memory.SkipWIAN;
@@ -664,7 +669,7 @@ jQuery(function () {
 
                         <textarea id="memory_contents" class="text_pole textarea_compact" rows="6" placeholder="Summary will be generated here..."></textarea>
                         <div class="memory_contents_controls">
-                            <div id="memory_force_summarize" class="menu_button menu_button_icon">
+                            <div id="memory_force_summarize" data-source="main" class="menu_button menu_button_icon">
                                 <i class="fa-solid fa-database"></i>
                                 <span>Summarize now</span>
                             </div>

From 940f701691b5e531b976d843d93c3f75b3655592 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 17 Dec 2023 01:23:28 +0200
Subject: [PATCH 10/11] Don't try to load directories as files

---
 src/plugin-loader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugin-loader.js b/src/plugin-loader.js
index a644e5e33..ba19fa603 100644
--- a/src/plugin-loader.js
+++ b/src/plugin-loader.js
@@ -46,6 +46,7 @@ async function loadPlugins(app, pluginsPath) {
 
         if (fs.statSync(pluginFilePath).isDirectory()) {
             await loadFromDirectory(app, pluginFilePath);
+            continue;
         }
 
         // Not a JavaScript file.

From 7fb9d9bfc11250607978402f026a7b57ce0e5c20 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 17 Dec 2023 02:34:42 +0200
Subject: [PATCH 11/11] Allow comma after "char" prefix

---
 public/scripts/extensions/stable-diffusion/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index 302a0a5ca..6fac89fd1 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -1737,7 +1737,7 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
  */
 function generateFreeModePrompt(trigger) {
     return trigger
-        .replace(/(?:^char(\s)|\{\{charPrefix\}\})/gi, (_, suffix) => {
+        .replace(/(?:^char(\s|,)|\{\{charPrefix\}\})/gi, (_, suffix) => {
             const getLastCharacterKey = () => {
                 if (typeof this_chid !== 'undefined') {
                     return getCharaFilename(this_chid);