From eb29f03ab01072eae8cd860608869f3756bcde9f Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Sat, 23 Nov 2024 20:11:46 -0800
Subject: [PATCH 01/31] Sped up character search by 93%

---
 public/scripts/power-user.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 43c26bf21..088a56a10 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -330,6 +330,12 @@ const debug_functions = [];
 
 const setHotswapsDebounced = debounce(favsToHotswap);
 
+const fuzzySearchCharactersCache = new Map();
+const fuzzySearchWorldInfoCache = new Map();
+const fuzzySearchPersonasCache = new Map();
+const fuzzySearchTagsCache = new Map();
+const fuzzySearchGroupsCache = new Map();
+
 function playMessageSound() {
     if (!power_user.play_message_sound) {
         return;
@@ -1830,6 +1836,11 @@ async function loadContextSettings() {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchCharacters(searchValue) {
+
+    if (fuzzySearchCharactersCache.has(searchValue)) {
+        return fuzzySearchCharactersCache.get(searchValue);
+    }
+
     // @ts-ignore
     const fuse = new Fuse(characters, {
         keys: [
@@ -1853,6 +1864,7 @@ export function fuzzySearchCharacters(searchValue) {
 
     const results = fuse.search(searchValue);
     console.debug('Characters fuzzy search results for ' + searchValue, results);
+    fuzzySearchCharactersCache.set(searchValue, results);
     return results;
 }
 
@@ -1863,6 +1875,10 @@ export function fuzzySearchCharacters(searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchWorldInfo(data, searchValue) {
+    if (fuzzySearchWorldInfoCache.has(searchValue)) {
+        return fuzzySearchWorldInfoCache.get(searchValue);
+    }
+
     // @ts-ignore
     const fuse = new Fuse(data, {
         keys: [
@@ -1882,6 +1898,7 @@ export function fuzzySearchWorldInfo(data, searchValue) {
 
     const results = fuse.search(searchValue);
     console.debug('World Info fuzzy search results for ' + searchValue, results);
+    fuzzySearchWorldInfoCache.set(searchValue, results);
     return results;
 }
 
@@ -1892,6 +1909,10 @@ export function fuzzySearchWorldInfo(data, searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchPersonas(data, searchValue) {
+    if (fuzzySearchPersonasCache.has(searchValue)) {
+        return fuzzySearchPersonasCache.get(searchValue);
+    }
+
     data = data.map(x => ({ key: x, name: power_user.personas[x] ?? '', description: power_user.persona_descriptions[x]?.description ?? '' }));
     // @ts-ignore
     const fuse = new Fuse(data, {
@@ -1907,6 +1928,7 @@ export function fuzzySearchPersonas(data, searchValue) {
 
     const results = fuse.search(searchValue);
     console.debug('Personas fuzzy search results for ' + searchValue, results);
+    fuzzySearchPersonasCache.set(searchValue, results);
     return results;
 }
 
@@ -1916,6 +1938,10 @@ export function fuzzySearchPersonas(data, searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchTags(searchValue) {
+    if (fuzzySearchTagsCache.has(searchValue)) {
+        return fuzzySearchTagsCache.get(searchValue);
+    }
+
     // @ts-ignore
     const fuse = new Fuse(tags, {
         keys: [
@@ -1929,6 +1955,7 @@ export function fuzzySearchTags(searchValue) {
 
     const results = fuse.search(searchValue);
     console.debug('Tags fuzzy search results for ' + searchValue, results);
+    fuzzySearchTagsCache.set(searchValue, results);
     return results;
 }
 
@@ -1938,6 +1965,10 @@ export function fuzzySearchTags(searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchGroups(searchValue) {
+    if (fuzzySearchGroupsCache.has(searchValue)) {
+        return fuzzySearchGroupsCache.get(searchValue);
+    }
+
     // @ts-ignore
     const fuse = new Fuse(groups, {
         keys: [
@@ -1954,6 +1985,7 @@ export function fuzzySearchGroups(searchValue) {
 
     const results = fuse.search(searchValue);
     console.debug('Groups fuzzy search results for ' + searchValue, results);
+    fuzzySearchGroupsCache.set(searchValue, results);
     return results;
 }
 

From 2661881bc4c95f752786b35daa06af3cffe05e15 Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Sat, 23 Nov 2024 22:13:20 -0800
Subject: [PATCH 02/31] Handle stale cache

---
 public/scripts/power-user.js | 228 +++++++++++++++++++++++++----------
 1 file changed, 165 insertions(+), 63 deletions(-)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 088a56a10..fef259016 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -330,12 +330,6 @@ const debug_functions = [];
 
 const setHotswapsDebounced = debounce(favsToHotswap);
 
-const fuzzySearchCharactersCache = new Map();
-const fuzzySearchWorldInfoCache = new Map();
-const fuzzySearchPersonasCache = new Map();
-const fuzzySearchTagsCache = new Map();
-const fuzzySearchGroupsCache = new Map();
-
 function playMessageSound() {
     if (!power_user.play_message_sound) {
         return;
@@ -1830,32 +1824,70 @@ async function loadContextSettings() {
     });
 }
 
+// Create separate caches for each type of fuzzy search
+const fuzzySearchCaches = {
+    characters: { keyHash: null, resultMap: new Map() },
+    worldInfo: { keyHash: null, resultMap: new Map() },
+    personas: { keyHash: null, resultMap: new Map() },
+    tags: { keyHash: null, resultMap: new Map() },
+    groups: { keyHash: null, resultMap: new Map() },
+};
+
 /**
- * Fuzzy search characters by a search term
+ * Generates a hash of the Fuse configuration keys
+ * @param {Array<{name: string, weight: number, getFn?: Function}>} keys
+ * @returns {number} Hash of the keys configuration
+ */
+function hashFuseKeys(keys) {
+    // Convert keys to a stable string representation
+    const keyString = keys.map(k => {
+        const getFnString = k.getFn ? k.getFn.toString() : '';
+        return `${k.name}:${k.weight}:${getFnString}`;
+    }).join('|');
+
+    return getStringHash(keyString);
+}
+
+/**
+ * Fuzzy search characters by a search term with caching
  * @param {string} searchValue - The search term
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchCharacters(searchValue) {
+    const fuseKeys = [
+        { name: 'data.name', weight: 20 },
+        { name: '#tags', weight: 10, getFn: (character) => getTagsList(character.avatar).map(x => x.name).join('||') },
+        { name: 'data.description', weight: 3 },
+        { name: 'data.mes_example', weight: 3 },
+        { name: 'data.scenario', weight: 2 },
+        { name: 'data.personality', weight: 2 },
+        { name: 'data.first_mes', weight: 2 },
+        { name: 'data.creator_notes', weight: 2 },
+        { name: 'data.creator', weight: 1 },
+        { name: 'data.tags', weight: 1 },
+        { name: 'data.alternate_greetings', weight: 1 },
+    ];
 
-    if (fuzzySearchCharactersCache.has(searchValue)) {
-        return fuzzySearchCharactersCache.get(searchValue);
+    // Generate hash of current keys configuration
+    const currentKeyHash = hashFuseKeys(fuseKeys);
+    const cache = fuzzySearchCaches.characters;
+
+    // Check if we have a cached result for this search value
+    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
+        console.debug('Using cached fuzzy search results for ' + searchValue);
+        return cache.resultMap.get(searchValue);
     }
 
-    // @ts-ignore
+    // If key configuration changed, clear the cache
+    if (cache.keyHash !== currentKeyHash) {
+        console.debug('Fuse keys changed, clearing cache');
+        cache.keyHash = currentKeyHash;
+        cache.resultMap.clear();
+    }
+
+    // Create new Fuse instance and perform search
     const fuse = new Fuse(characters, {
-        keys: [
-            { name: 'data.name', weight: 20 },
-            { name: '#tags', weight: 10, getFn: (character) => getTagsList(character.avatar).map(x => x.name).join('||') },
-            { name: 'data.description', weight: 3 },
-            { name: 'data.mes_example', weight: 3 },
-            { name: 'data.scenario', weight: 2 },
-            { name: 'data.personality', weight: 2 },
-            { name: 'data.first_mes', weight: 2 },
-            { name: 'data.creator_notes', weight: 2 },
-            { name: 'data.creator', weight: 1 },
-            { name: 'data.tags', weight: 1 },
-            { name: 'data.alternate_greetings', weight: 1 },
-        ],
+        keys: fuseKeys,
         includeScore: true,
         ignoreLocation: true,
         useExtendedSearch: true,
@@ -1863,8 +1895,11 @@ export function fuzzySearchCharacters(searchValue) {
     });
 
     const results = fuse.search(searchValue);
+
+    // Cache the results
+    cache.resultMap.set(searchValue, results);
+
     console.debug('Characters fuzzy search results for ' + searchValue, results);
-    fuzzySearchCharactersCache.set(searchValue, results);
     return results;
 }
 
@@ -1875,21 +1910,34 @@ export function fuzzySearchCharacters(searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchWorldInfo(data, searchValue) {
-    if (fuzzySearchWorldInfoCache.has(searchValue)) {
-        return fuzzySearchWorldInfoCache.get(searchValue);
+    const fuseKeys = [
+        { name: 'key', weight: 20 },
+        { name: 'group', weight: 15 },
+        { name: 'comment', weight: 10 },
+        { name: 'keysecondary', weight: 10 },
+        { name: 'content', weight: 3 },
+        { name: 'uid', weight: 1 },
+        { name: 'automationId', weight: 1 },
+    ];
+
+    const currentKeyHash = hashFuseKeys(fuseKeys);
+    const cache = fuzzySearchCaches.worldInfo;
+
+    // Check cache for existing results
+    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
+        console.debug('Using cached WI fuzzy search results for ' + searchValue);
+        return cache.resultMap.get(searchValue);
+    }
+
+    // Clear cache if keys changed
+    if (cache.keyHash !== currentKeyHash) {
+        console.debug('WI Fuse keys changed, clearing cache');
+        cache.keyHash = currentKeyHash;
+        cache.resultMap.clear();
     }
 
-    // @ts-ignore
     const fuse = new Fuse(data, {
-        keys: [
-            { name: 'key', weight: 20 },
-            { name: 'group', weight: 15 },
-            { name: 'comment', weight: 10 },
-            { name: 'keysecondary', weight: 10 },
-            { name: 'content', weight: 3 },
-            { name: 'uid', weight: 1 },
-            { name: 'automationId', weight: 1 },
-        ],
+        keys: fuseKeys,
         includeScore: true,
         ignoreLocation: true,
         useExtendedSearch: true,
@@ -1897,8 +1945,9 @@ export function fuzzySearchWorldInfo(data, searchValue) {
     });
 
     const results = fuse.search(searchValue);
+    cache.resultMap.set(searchValue, results);
+
     console.debug('World Info fuzzy search results for ' + searchValue, results);
-    fuzzySearchWorldInfoCache.set(searchValue, results);
     return results;
 }
 
@@ -1909,17 +1958,31 @@ export function fuzzySearchWorldInfo(data, searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchPersonas(data, searchValue) {
-    if (fuzzySearchPersonasCache.has(searchValue)) {
-        return fuzzySearchPersonasCache.get(searchValue);
+    data = data.map(x => ({ key: x, name: power_user.personas[x] ?? '', description: power_user.persona_descriptions[x]?.description ?? '' }));
+
+    const fuseKeys = [
+        { name: 'name', weight: 20 },
+        { name: 'description', weight: 3 },
+    ];
+
+    const currentKeyHash = hashFuseKeys(fuseKeys);
+    const cache = fuzzySearchCaches.personas;
+
+    // Check cache for existing results
+    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
+        console.debug('Using cached personas fuzzy search results for ' + searchValue);
+        return cache.resultMap.get(searchValue);
+    }
+
+    // Clear cache if keys changed
+    if (cache.keyHash !== currentKeyHash) {
+        console.debug('Personas Fuse keys changed, clearing cache');
+        cache.keyHash = currentKeyHash;
+        cache.resultMap.clear();
     }
 
-    data = data.map(x => ({ key: x, name: power_user.personas[x] ?? '', description: power_user.persona_descriptions[x]?.description ?? '' }));
-    // @ts-ignore
     const fuse = new Fuse(data, {
-        keys: [
-            { name: 'name', weight: 20 },
-            { name: 'description', weight: 3 },
-        ],
+        keys: fuseKeys,
         includeScore: true,
         ignoreLocation: true,
         useExtendedSearch: true,
@@ -1927,8 +1990,9 @@ export function fuzzySearchPersonas(data, searchValue) {
     });
 
     const results = fuse.search(searchValue);
+    cache.resultMap.set(searchValue, results);
+
     console.debug('Personas fuzzy search results for ' + searchValue, results);
-    fuzzySearchPersonasCache.set(searchValue, results);
     return results;
 }
 
@@ -1938,15 +2002,28 @@ export function fuzzySearchPersonas(data, searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchTags(searchValue) {
-    if (fuzzySearchTagsCache.has(searchValue)) {
-        return fuzzySearchTagsCache.get(searchValue);
+    const fuseKeys = [
+        { name: 'name', weight: 1 },
+    ];
+
+    const currentKeyHash = hashFuseKeys(fuseKeys);
+    const cache = fuzzySearchCaches.tags;
+
+    // Check cache for existing results
+    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
+        console.debug('Using cached tags fuzzy search results for ' + searchValue);
+        return cache.resultMap.get(searchValue);
+    }
+
+    // Clear cache if keys changed
+    if (cache.keyHash !== currentKeyHash) {
+        console.debug('Tags Fuse keys changed, clearing cache');
+        cache.keyHash = currentKeyHash;
+        cache.resultMap.clear();
     }
 
-    // @ts-ignore
     const fuse = new Fuse(tags, {
-        keys: [
-            { name: 'name', weight: 1 },
-        ],
+        keys: fuseKeys,
         includeScore: true,
         ignoreLocation: true,
         useExtendedSearch: true,
@@ -1954,8 +2031,9 @@ export function fuzzySearchTags(searchValue) {
     });
 
     const results = fuse.search(searchValue);
+    cache.resultMap.set(searchValue, results);
+
     console.debug('Tags fuzzy search results for ' + searchValue, results);
-    fuzzySearchTagsCache.set(searchValue, results);
     return results;
 }
 
@@ -1965,18 +2043,31 @@ export function fuzzySearchTags(searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchGroups(searchValue) {
-    if (fuzzySearchGroupsCache.has(searchValue)) {
-        return fuzzySearchGroupsCache.get(searchValue);
+    const fuseKeys = [
+        { name: 'name', weight: 20 },
+        { name: 'members', weight: 15 },
+        { name: '#tags', weight: 10, getFn: (group) => getTagsList(group.id).map(x => x.name).join('||') },
+        { name: 'id', weight: 1 },
+    ];
+
+    const currentKeyHash = hashFuseKeys(fuseKeys);
+    const cache = fuzzySearchCaches.groups;
+
+    // Check cache for existing results
+    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
+        console.debug('Using cached groups fuzzy search results for ' + searchValue);
+        return cache.resultMap.get(searchValue);
+    }
+
+    // Clear cache if keys changed
+    if (cache.keyHash !== currentKeyHash) {
+        console.debug('Groups Fuse keys changed, clearing cache');
+        cache.keyHash = currentKeyHash;
+        cache.resultMap.clear();
     }
 
-    // @ts-ignore
     const fuse = new Fuse(groups, {
-        keys: [
-            { name: 'name', weight: 20 },
-            { name: 'members', weight: 15 },
-            { name: '#tags', weight: 10, getFn: (group) => getTagsList(group.id).map(x => x.name).join('||') },
-            { name: 'id', weight: 1 },
-        ],
+        keys: fuseKeys,
         includeScore: true,
         ignoreLocation: true,
         useExtendedSearch: true,
@@ -1984,11 +2075,22 @@ export function fuzzySearchGroups(searchValue) {
     });
 
     const results = fuse.search(searchValue);
+    cache.resultMap.set(searchValue, results);
+
     console.debug('Groups fuzzy search results for ' + searchValue, results);
-    fuzzySearchGroupsCache.set(searchValue, results);
     return results;
 }
 
+/**
+ * Clears all fuzzy search caches
+ */
+export function clearFuzzySearchCaches() {
+    for (const cache of Object.values(fuzzySearchCaches)) {
+        cache.keyHash = null;
+        cache.resultMap.clear();
+    }
+}
+
 /**
  * Renders a story string template with the given parameters.
  * @param {object} params Template parameters.

From e2c083ba31d0c9e3ab1e168995f03c0e9d37daac Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Sat, 23 Nov 2024 22:34:56 -0800
Subject: [PATCH 03/31] Remove duplicated code

---
 public/scripts/power-user.js | 257 +++++++++++------------------------
 1 file changed, 82 insertions(+), 175 deletions(-)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index fef259016..9d6910a3f 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -328,6 +328,22 @@ const contextControls = [
 let browser_has_focus = true;
 const debug_functions = [];
 
+const fuzzySearchCaches = {
+    characters: { keyHash: null, resultMap: new Map() },
+    worldInfo: { keyHash: null, resultMap: new Map() },
+    personas: { keyHash: null, resultMap: new Map() },
+    tags: { keyHash: null, resultMap: new Map() },
+    groups: { keyHash: null, resultMap: new Map() },
+};
+
+const fuzzySearchCategories = {
+    characters: 'characters',
+    worldInfo: 'worldInfo',
+    personas: 'personas',
+    tags: 'tags',
+    groups: 'groups',
+};
+
 const setHotswapsDebounced = debounce(favsToHotswap);
 
 function playMessageSound() {
@@ -1824,15 +1840,6 @@ async function loadContextSettings() {
     });
 }
 
-// Create separate caches for each type of fuzzy search
-const fuzzySearchCaches = {
-    characters: { keyHash: null, resultMap: new Map() },
-    worldInfo: { keyHash: null, resultMap: new Map() },
-    personas: { keyHash: null, resultMap: new Map() },
-    tags: { keyHash: null, resultMap: new Map() },
-    groups: { keyHash: null, resultMap: new Map() },
-};
-
 /**
  * Generates a hash of the Fuse configuration keys
  * @param {Array<{name: string, weight: number, getFn?: Function}>} keys
@@ -1849,12 +1856,62 @@ function hashFuseKeys(keys) {
 }
 
 /**
- * Fuzzy search characters by a search term with caching
+ * Common function to perform fuzzy search with caching
+ * @param {string} type - Type of search from fuzzySearchCategories
+ * @param {any[]} data - Data array to search in
+ * @param {Array<{name: string, weight: number, getFn?: Function}>} keys - Fuse.js keys configuration
+ * @param {string} searchValue - The search term
+ * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
+ */
+function performFuzzySearch(type, data, keys, searchValue) {
+    const currentKeyHash = hashFuseKeys(keys);
+    const cache = fuzzySearchCaches[type];
+
+    // Check cache for existing results
+    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
+        console.log(`Using cached ${type} fuzzy search results for ${searchValue}`);
+        return cache.resultMap.get(searchValue);
+    }
+
+    // Clear cache if keys changed
+    if (cache.keyHash !== currentKeyHash) {
+        console.log(`${type} Fuse keys changed, clearing cache`);
+        cache.keyHash = currentKeyHash;
+        cache.resultMap.clear();
+    }
+
+    const fuse = new Fuse(data, {
+        keys: keys,
+        includeScore: true,
+        ignoreLocation: true,
+        useExtendedSearch: true,
+        threshold: 0.2,
+    });
+
+    const results = fuse.search(searchValue);
+    cache.resultMap.set(searchValue, results);
+
+    console.log(`${type} fuzzy search results for ${searchValue}`, results);
+    return results;
+}
+
+/**
+ * Clears all fuzzy search caches
+ */
+export function clearFuzzySearchCaches() {
+    for (const cache of Object.values(fuzzySearchCaches)) {
+        cache.keyHash = null;
+        cache.resultMap.clear();
+    }
+}
+
+/**
+ * Fuzzy search characters by a search term
  * @param {string} searchValue - The search term
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchCharacters(searchValue) {
-    const fuseKeys = [
+    const keys = [
         { name: 'data.name', weight: 20 },
         { name: '#tags', weight: 10, getFn: (character) => getTagsList(character.avatar).map(x => x.name).join('||') },
         { name: 'data.description', weight: 3 },
@@ -1868,39 +1925,7 @@ export function fuzzySearchCharacters(searchValue) {
         { name: 'data.alternate_greetings', weight: 1 },
     ];
 
-    // Generate hash of current keys configuration
-    const currentKeyHash = hashFuseKeys(fuseKeys);
-    const cache = fuzzySearchCaches.characters;
-
-    // Check if we have a cached result for this search value
-    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
-        console.debug('Using cached fuzzy search results for ' + searchValue);
-        return cache.resultMap.get(searchValue);
-    }
-
-    // If key configuration changed, clear the cache
-    if (cache.keyHash !== currentKeyHash) {
-        console.debug('Fuse keys changed, clearing cache');
-        cache.keyHash = currentKeyHash;
-        cache.resultMap.clear();
-    }
-
-    // Create new Fuse instance and perform search
-    const fuse = new Fuse(characters, {
-        keys: fuseKeys,
-        includeScore: true,
-        ignoreLocation: true,
-        useExtendedSearch: true,
-        threshold: 0.2,
-    });
-
-    const results = fuse.search(searchValue);
-
-    // Cache the results
-    cache.resultMap.set(searchValue, results);
-
-    console.debug('Characters fuzzy search results for ' + searchValue, results);
-    return results;
+    return performFuzzySearch(fuzzySearchCategories.characters, characters, keys, searchValue);
 }
 
 /**
@@ -1910,7 +1935,7 @@ export function fuzzySearchCharacters(searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchWorldInfo(data, searchValue) {
-    const fuseKeys = [
+    const keys = [
         { name: 'key', weight: 20 },
         { name: 'group', weight: 15 },
         { name: 'comment', weight: 10 },
@@ -1920,35 +1945,7 @@ export function fuzzySearchWorldInfo(data, searchValue) {
         { name: 'automationId', weight: 1 },
     ];
 
-    const currentKeyHash = hashFuseKeys(fuseKeys);
-    const cache = fuzzySearchCaches.worldInfo;
-
-    // Check cache for existing results
-    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
-        console.debug('Using cached WI fuzzy search results for ' + searchValue);
-        return cache.resultMap.get(searchValue);
-    }
-
-    // Clear cache if keys changed
-    if (cache.keyHash !== currentKeyHash) {
-        console.debug('WI Fuse keys changed, clearing cache');
-        cache.keyHash = currentKeyHash;
-        cache.resultMap.clear();
-    }
-
-    const fuse = new Fuse(data, {
-        keys: fuseKeys,
-        includeScore: true,
-        ignoreLocation: true,
-        useExtendedSearch: true,
-        threshold: 0.2,
-    });
-
-    const results = fuse.search(searchValue);
-    cache.resultMap.set(searchValue, results);
-
-    console.debug('World Info fuzzy search results for ' + searchValue, results);
-    return results;
+    return performFuzzySearch(fuzzySearchCategories.worldInfo, data, keys, searchValue);
 }
 
 /**
@@ -1958,42 +1955,18 @@ export function fuzzySearchWorldInfo(data, searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchPersonas(data, searchValue) {
-    data = data.map(x => ({ key: x, name: power_user.personas[x] ?? '', description: power_user.persona_descriptions[x]?.description ?? '' }));
+    const mappedData = data.map(x => ({
+        key: x,
+        name: power_user.personas[x] ?? '',
+        description: power_user.persona_descriptions[x]?.description ?? ''
+    }));
 
-    const fuseKeys = [
+    const keys = [
         { name: 'name', weight: 20 },
         { name: 'description', weight: 3 },
     ];
 
-    const currentKeyHash = hashFuseKeys(fuseKeys);
-    const cache = fuzzySearchCaches.personas;
-
-    // Check cache for existing results
-    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
-        console.debug('Using cached personas fuzzy search results for ' + searchValue);
-        return cache.resultMap.get(searchValue);
-    }
-
-    // Clear cache if keys changed
-    if (cache.keyHash !== currentKeyHash) {
-        console.debug('Personas Fuse keys changed, clearing cache');
-        cache.keyHash = currentKeyHash;
-        cache.resultMap.clear();
-    }
-
-    const fuse = new Fuse(data, {
-        keys: fuseKeys,
-        includeScore: true,
-        ignoreLocation: true,
-        useExtendedSearch: true,
-        threshold: 0.2,
-    });
-
-    const results = fuse.search(searchValue);
-    cache.resultMap.set(searchValue, results);
-
-    console.debug('Personas fuzzy search results for ' + searchValue, results);
-    return results;
+    return performFuzzySearch(fuzzySearchCategories.personas, mappedData, keys, searchValue);
 }
 
 /**
@@ -2002,39 +1975,11 @@ export function fuzzySearchPersonas(data, searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchTags(searchValue) {
-    const fuseKeys = [
+    const keys = [
         { name: 'name', weight: 1 },
     ];
 
-    const currentKeyHash = hashFuseKeys(fuseKeys);
-    const cache = fuzzySearchCaches.tags;
-
-    // Check cache for existing results
-    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
-        console.debug('Using cached tags fuzzy search results for ' + searchValue);
-        return cache.resultMap.get(searchValue);
-    }
-
-    // Clear cache if keys changed
-    if (cache.keyHash !== currentKeyHash) {
-        console.debug('Tags Fuse keys changed, clearing cache');
-        cache.keyHash = currentKeyHash;
-        cache.resultMap.clear();
-    }
-
-    const fuse = new Fuse(tags, {
-        keys: fuseKeys,
-        includeScore: true,
-        ignoreLocation: true,
-        useExtendedSearch: true,
-        threshold: 0.2,
-    });
-
-    const results = fuse.search(searchValue);
-    cache.resultMap.set(searchValue, results);
-
-    console.debug('Tags fuzzy search results for ' + searchValue, results);
-    return results;
+    return performFuzzySearch(fuzzySearchCategories.tags, tags, keys, searchValue);
 }
 
 /**
@@ -2043,52 +1988,14 @@ export function fuzzySearchTags(searchValue) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchGroups(searchValue) {
-    const fuseKeys = [
+    const keys = [
         { name: 'name', weight: 20 },
         { name: 'members', weight: 15 },
         { name: '#tags', weight: 10, getFn: (group) => getTagsList(group.id).map(x => x.name).join('||') },
         { name: 'id', weight: 1 },
     ];
 
-    const currentKeyHash = hashFuseKeys(fuseKeys);
-    const cache = fuzzySearchCaches.groups;
-
-    // Check cache for existing results
-    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
-        console.debug('Using cached groups fuzzy search results for ' + searchValue);
-        return cache.resultMap.get(searchValue);
-    }
-
-    // Clear cache if keys changed
-    if (cache.keyHash !== currentKeyHash) {
-        console.debug('Groups Fuse keys changed, clearing cache');
-        cache.keyHash = currentKeyHash;
-        cache.resultMap.clear();
-    }
-
-    const fuse = new Fuse(groups, {
-        keys: fuseKeys,
-        includeScore: true,
-        ignoreLocation: true,
-        useExtendedSearch: true,
-        threshold: 0.2,
-    });
-
-    const results = fuse.search(searchValue);
-    cache.resultMap.set(searchValue, results);
-
-    console.debug('Groups fuzzy search results for ' + searchValue, results);
-    return results;
-}
-
-/**
- * Clears all fuzzy search caches
- */
-export function clearFuzzySearchCaches() {
-    for (const cache of Object.values(fuzzySearchCaches)) {
-        cache.keyHash = null;
-        cache.resultMap.clear();
-    }
+    return performFuzzySearch(fuzzySearchCategories.groups, groups, keys, searchValue);
 }
 
 /**

From d1cac298c61601449a42b0021b5b860b83c9d8e2 Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Sat, 23 Nov 2024 22:51:48 -0800
Subject: [PATCH 04/31] Coment out log statements

---
 public/scripts/power-user.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 9d6910a3f..8b9e837c2 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -1869,13 +1869,13 @@ function performFuzzySearch(type, data, keys, searchValue) {
 
     // Check cache for existing results
     if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
-        console.log(`Using cached ${type} fuzzy search results for ${searchValue}`);
+        // console.debug(`Using cached ${type} fuzzy search results for ${searchValue}`);
         return cache.resultMap.get(searchValue);
     }
 
     // Clear cache if keys changed
     if (cache.keyHash !== currentKeyHash) {
-        console.log(`${type} Fuse keys changed, clearing cache`);
+        // console.debug(`${type} Fuse keys changed, clearing cache`);
         cache.keyHash = currentKeyHash;
         cache.resultMap.clear();
     }
@@ -1891,7 +1891,7 @@ function performFuzzySearch(type, data, keys, searchValue) {
     const results = fuse.search(searchValue);
     cache.resultMap.set(searchValue, results);
 
-    console.log(`${type} fuzzy search results for ${searchValue}`, results);
+    // console.debug(`${type} fuzzy search results for ${searchValue}`, results);
     return results;
 }
 

From 9382845dee9ff283cdc774ef38b4213634343b33 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 24 Nov 2024 19:05:41 +0200
Subject: [PATCH 05/31] Claude: remove user filler from prompt converter

---
 default/content/presets/openai/Default.json |  1 -
 public/index.html                           |  9 --------
 public/scripts/openai.js                    | 24 ---------------------
 src/endpoints/backends/chat-completions.js  |  2 +-
 src/prompt-converters.js                    |  7 +++---
 5 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/default/content/presets/openai/Default.json b/default/content/presets/openai/Default.json
index b8a38560c..345199cc1 100644
--- a/default/content/presets/openai/Default.json
+++ b/default/content/presets/openai/Default.json
@@ -230,7 +230,6 @@
     "show_external_models": false,
     "assistant_prefill": "",
     "assistant_impersonation": "",
-    "human_sysprompt_message": "Let's get started. Please generate your response based on the information and instructions provided above.",
     "claude_use_sysprompt": false,
     "use_alt_scale": false,
     "squash_system_messages": false,
diff --git a/public/index.html b/public/index.html
index ebb09daa4..d8dd438dd 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1951,15 +1951,6 @@
                                                 Send the system prompt for supported models. If disabled, the user message is added to the beginning of the prompt.
                                             </span>
                                         </div>
-                                        <div id="claude_human_sysprompt_message_block" class="wide100p">
-                                            <div class="range-block-title openai_restorable">
-                                                <span data-i18n="User first message">User first message</span>
-                                                <div id="claude_human_sysprompt_message_restore" title="Restore User first message" data-i18n="[title]Restore User first message" class="right_menu_button">
-                                                    <div class="fa-solid fa-clock-rotate-left"></div>
-                                                </div>
-                                            </div>
-                                            <textarea id="claude_human_sysprompt_textarea" class="text_pole textarea_compact autoSetHeight" rows="2" data-i18n="[placeholder]Human message" placeholder="Human message, instruction, etc.&#10;Adds nothing when empty, i.e. requires a new prompt with the role 'user'."></textarea>
-                                        </div>
                                     </div>
                                 </div>
                                 <div class="range-block m-t-1" data-source="openai,openrouter,scale,custom">
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index da1d950cd..8e2dae2e2 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -99,7 +99,6 @@ const default_wi_format = '{0}';
 const default_new_chat_prompt = '[Start a new Chat]';
 const default_new_group_chat_prompt = '[Start a new group chat. Group members: {{group}}]';
 const default_new_example_chat_prompt = '[Example Chat]';
-const default_claude_human_sysprompt_message = 'Let\'s get started. Please generate your response based on the information and instructions provided above.';
 const default_continue_nudge_prompt = '[Continue the following message. Do not include ANY parts of the original message. Use capitalization and punctuation as if your reply is a part of the original message: {{lastChatMessage}}]';
 const default_bias = 'Default (none)';
 const default_personality_format = '[{{char}}\'s personality: {{personality}}]';
@@ -276,7 +275,6 @@ const default_settings = {
     proxy_password: '',
     assistant_prefill: '',
     assistant_impersonation: '',
-    human_sysprompt_message: default_claude_human_sysprompt_message,
     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     use_alt_scale: false,
@@ -353,7 +351,6 @@ const oai_settings = {
     proxy_password: '',
     assistant_prefill: '',
     assistant_impersonation: '',
-    human_sysprompt_message: default_claude_human_sysprompt_message,
     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     use_alt_scale: false,
@@ -1892,7 +1889,6 @@ async function sendOpenAIRequest(type, messages, signal) {
         generate_data['top_k'] = Number(oai_settings.top_k_openai);
         generate_data['claude_use_sysprompt'] = oai_settings.claude_use_sysprompt;
         generate_data['stop'] = getCustomStoppingStrings(); // Claude shouldn't have limits on stop strings.
-        generate_data['human_sysprompt_message'] = substituteParams(oai_settings.human_sysprompt_message);
         // Don't add a prefill on quiet gens (summarization) and when using continue prefill.
         if (!isQuiet && !(isContinue && oai_settings.continue_prefill)) {
             generate_data['assistant_prefill'] = isImpersonate ? substituteParams(oai_settings.assistant_impersonation) : substituteParams(oai_settings.assistant_prefill);
@@ -3030,7 +3026,6 @@ function loadOpenAISettings(data, settings) {
     oai_settings.proxy_password = settings.proxy_password ?? default_settings.proxy_password;
     oai_settings.assistant_prefill = settings.assistant_prefill ?? default_settings.assistant_prefill;
     oai_settings.assistant_impersonation = settings.assistant_impersonation ?? default_settings.assistant_impersonation;
-    oai_settings.human_sysprompt_message = settings.human_sysprompt_message ?? default_settings.human_sysprompt_message;
     oai_settings.image_inlining = settings.image_inlining ?? default_settings.image_inlining;
     oai_settings.inline_image_quality = settings.inline_image_quality ?? default_settings.inline_image_quality;
     oai_settings.bypass_status_check = settings.bypass_status_check ?? default_settings.bypass_status_check;
@@ -3070,7 +3065,6 @@ function loadOpenAISettings(data, settings) {
     $('#openai_proxy_password').val(oai_settings.proxy_password);
     $('#claude_assistant_prefill').val(oai_settings.assistant_prefill);
     $('#claude_assistant_impersonation').val(oai_settings.assistant_impersonation);
-    $('#claude_human_sysprompt_textarea').val(oai_settings.human_sysprompt_message);
     $('#openai_image_inlining').prop('checked', oai_settings.image_inlining);
     $('#openai_bypass_status_check').prop('checked', oai_settings.bypass_status_check);
 
@@ -3400,7 +3394,6 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
         show_external_models: settings.show_external_models,
         assistant_prefill: settings.assistant_prefill,
         assistant_impersonation: settings.assistant_impersonation,
-        human_sysprompt_message: settings.human_sysprompt_message,
         claude_use_sysprompt: settings.claude_use_sysprompt,
         use_makersuite_sysprompt: settings.use_makersuite_sysprompt,
         use_alt_scale: settings.use_alt_scale,
@@ -3825,7 +3818,6 @@ function onSettingsPresetChange() {
         proxy_password: ['#openai_proxy_password', 'proxy_password', false],
         assistant_prefill: ['#claude_assistant_prefill', 'assistant_prefill', false],
         assistant_impersonation: ['#claude_assistant_impersonation', 'assistant_impersonation', false],
-        human_sysprompt_message: ['#claude_human_sysprompt_textarea', 'human_sysprompt_message', false],
         claude_use_sysprompt: ['#claude_use_sysprompt', 'claude_use_sysprompt', true],
         use_makersuite_sysprompt: ['#use_makersuite_sysprompt', 'use_makersuite_sysprompt', true],
         use_alt_scale: ['#use_alt_scale', 'use_alt_scale', true],
@@ -4677,10 +4669,6 @@ function toggleChatCompletionForms() {
         const validSources = $(this).data('source').split(',');
         $(this).toggle(validSources.includes(oai_settings.chat_completion_source));
     });
-
-    if (chat_completion_sources.CLAUDE == oai_settings.chat_completion_source) {
-        $('#claude_human_sysprompt_message_block').toggle(oai_settings.claude_use_sysprompt);
-    }
 }
 
 async function testApiConnection() {
@@ -5036,7 +5024,6 @@ export function initOpenAI() {
 
     $('#claude_use_sysprompt').on('change', function () {
         oai_settings.claude_use_sysprompt = !!$('#claude_use_sysprompt').prop('checked');
-        $('#claude_human_sysprompt_message_block').toggle(oai_settings.claude_use_sysprompt);
         saveSettingsDebounced();
     });
 
@@ -5113,12 +5100,6 @@ export function initOpenAI() {
         saveSettingsDebounced();
     });
 
-    $('#claude_human_sysprompt_message_restore').on('click', function () {
-        oai_settings.human_sysprompt_message = default_claude_human_sysprompt_message;
-        $('#claude_human_sysprompt_textarea').val(oai_settings.human_sysprompt_message);
-        saveSettingsDebounced();
-    });
-
     $('#newgroupchat_prompt_restore').on('click', function () {
         oai_settings.new_group_chat_prompt = default_new_group_chat_prompt;
         $('#newgroupchat_prompt_textarea').val(oai_settings.new_group_chat_prompt);
@@ -5210,11 +5191,6 @@ export function initOpenAI() {
         saveSettingsDebounced();
     });
 
-    $('#claude_human_sysprompt_textarea').on('input', function () {
-        oai_settings.human_sysprompt_message = String($('#claude_human_sysprompt_textarea').val());
-        saveSettingsDebounced();
-    });
-
     $('#openrouter_use_fallback').on('input', function () {
         oai_settings.openrouter_use_fallback = !!$(this).prop('checked');
         saveSettingsDebounced();
diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index b78ba45b5..aa15c7278 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -102,7 +102,7 @@ async function sendClaudeRequest(request, response) {
         const additionalHeaders = {};
         const useTools = request.body.model.startsWith('claude-3') && Array.isArray(request.body.tools) && request.body.tools.length > 0;
         const useSystemPrompt = (request.body.model.startsWith('claude-2') || request.body.model.startsWith('claude-3')) && request.body.claude_use_sysprompt;
-        const convertedPrompt = convertClaudeMessages(request.body.messages, request.body.assistant_prefill, useSystemPrompt, useTools, request.body.human_sysprompt_message, request.body.char_name, request.body.user_name);
+        const convertedPrompt = convertClaudeMessages(request.body.messages, request.body.assistant_prefill, useSystemPrompt, useTools, request.body.char_name, request.body.user_name);
         // Add custom stop sequences
         const stopSequences = [];
         if (Array.isArray(request.body.stop)) {
diff --git a/src/prompt-converters.js b/src/prompt-converters.js
index b5d624a1c..79db3965c 100644
--- a/src/prompt-converters.js
+++ b/src/prompt-converters.js
@@ -91,11 +91,10 @@ export function convertClaudePrompt(messages, addAssistantPostfix, addAssistantP
  * @param {string}   prefillString User determined prefill string
  * @param {boolean}  useSysPrompt See if we want to use a system prompt
  * @param {boolean}  useTools See if we want to use tools
- * @param {string}   humanMsgFix Add Human message between system prompt and assistant.
  * @param {string}   charName Character name
  * @param {string}   userName User name
  */
-export function convertClaudeMessages(messages, prefillString, useSysPrompt, useTools, humanMsgFix, charName = '', userName = '') {
+export function convertClaudeMessages(messages, prefillString, useSysPrompt, useTools, charName, userName) {
     let systemPrompt = [];
     if (useSysPrompt) {
         // Collect all the system messages up until the first instance of a non-system message, and then remove them from the messages array.
@@ -122,10 +121,10 @@ export function convertClaudeMessages(messages, prefillString, useSysPrompt, use
 
         // Check if the first message in the array is of type user, if not, interject with humanMsgFix or a blank message.
         // Also prevents erroring out if the messages array is empty.
-        if (messages.length === 0 || (messages.length > 0 && messages[0].role !== 'user')) {
+        if (messages.length === 0) {
             messages.unshift({
                 role: 'user',
-                content: humanMsgFix || PROMPT_PLACEHOLDER,
+                content: PROMPT_PLACEHOLDER,
             });
         }
     }

From e1d6a47048e0d53921214607387f2687d2fb805f Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Sun, 24 Nov 2024 14:54:12 -0800
Subject: [PATCH 06/31] Remove key hashing and explicitly clear the cache after
 printing characters

---
 public/script.js             |  2 ++
 public/scripts/power-user.js | 27 +++++++++------------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/public/script.js b/public/script.js
index 57acf537e..4d6e41648 100644
--- a/public/script.js
+++ b/public/script.js
@@ -268,6 +268,7 @@ import { initServerHistory } from './scripts/server-history.js';
 import { initSettingsSearch } from './scripts/setting-search.js';
 import { initBulkEdit } from './scripts/bulk-edit.js';
 import { deriveTemplatesFromChatTemplate } from './scripts/chat-templates.js';
+import { clearFuzzySearchCaches } from './scripts/power-user.js';
 
 //exporting functions and vars for mods
 export {
@@ -1515,6 +1516,7 @@ export async function printCharacters(fullRefresh = false) {
     });
 
     favsToHotswap();
+    clearFuzzySearchCaches();
 }
 
 /** Checks the state of the current search, and adds/removes the search sorting option accordingly */
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 8b9e837c2..91ba33844 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -329,11 +329,11 @@ let browser_has_focus = true;
 const debug_functions = [];
 
 const fuzzySearchCaches = {
-    characters: { keyHash: null, resultMap: new Map() },
-    worldInfo: { keyHash: null, resultMap: new Map() },
-    personas: { keyHash: null, resultMap: new Map() },
-    tags: { keyHash: null, resultMap: new Map() },
-    groups: { keyHash: null, resultMap: new Map() },
+    characters: { resultMap: new Map() },
+    worldInfo: { resultMap: new Map() },
+    personas: { resultMap: new Map() },
+    tags: { resultMap: new Map() },
+    groups: { resultMap: new Map() },
 };
 
 const fuzzySearchCategories = {
@@ -1864,22 +1864,14 @@ function hashFuseKeys(keys) {
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 function performFuzzySearch(type, data, keys, searchValue) {
-    const currentKeyHash = hashFuseKeys(keys);
     const cache = fuzzySearchCaches[type];
 
     // Check cache for existing results
-    if (cache.keyHash === currentKeyHash && cache.resultMap.has(searchValue)) {
-        // console.debug(`Using cached ${type} fuzzy search results for ${searchValue}`);
+    if (cache.resultMap.has(searchValue)) {
         return cache.resultMap.get(searchValue);
     }
 
-    // Clear cache if keys changed
-    if (cache.keyHash !== currentKeyHash) {
-        // console.debug(`${type} Fuse keys changed, clearing cache`);
-        cache.keyHash = currentKeyHash;
-        cache.resultMap.clear();
-    }
-
+    // @ts-ignore
     const fuse = new Fuse(data, {
         keys: keys,
         includeScore: true,
@@ -1890,19 +1882,18 @@ function performFuzzySearch(type, data, keys, searchValue) {
 
     const results = fuse.search(searchValue);
     cache.resultMap.set(searchValue, results);
-
-    // console.debug(`${type} fuzzy search results for ${searchValue}`, results);
     return results;
 }
 
+
 /**
  * Clears all fuzzy search caches
  */
 export function clearFuzzySearchCaches() {
     for (const cache of Object.values(fuzzySearchCaches)) {
-        cache.keyHash = null;
         cache.resultMap.clear();
     }
+    console.log('Fuzzy search caches cleared');
 }
 
 /**

From e56faaaed581626866c76b2bb154f76234ef797b Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Sun, 24 Nov 2024 14:55:22 -0800
Subject: [PATCH 07/31] Remove hash function

---
 public/scripts/power-user.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 91ba33844..5b780b700 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -1840,21 +1840,6 @@ async function loadContextSettings() {
     });
 }
 
-/**
- * Generates a hash of the Fuse configuration keys
- * @param {Array<{name: string, weight: number, getFn?: Function}>} keys
- * @returns {number} Hash of the keys configuration
- */
-function hashFuseKeys(keys) {
-    // Convert keys to a stable string representation
-    const keyString = keys.map(k => {
-        const getFnString = k.getFn ? k.getFn.toString() : '';
-        return `${k.name}:${k.weight}:${getFnString}`;
-    }).join('|');
-
-    return getStringHash(keyString);
-}
-
 /**
  * Common function to perform fuzzy search with caching
  * @param {string} type - Type of search from fuzzySearchCategories

From e664806990f2eb49df4fadeabf66e238985506a6 Mon Sep 17 00:00:00 2001
From: AlpinDale <alpindale@gmail.com>
Date: Mon, 25 Nov 2024 22:28:58 +0000
Subject: [PATCH 08/31] add DRY, skew, and no repeat ngram penalty

---
 public/index.html                  | 6 +++---
 public/scripts/textgen-settings.js | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 2791dbd70..0b2d166cc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1342,12 +1342,12 @@
                                         <input class="neo-range-slider" type="range" id="presence_pen_textgenerationwebui" name="volume" min="-2" max="2" step="0.01" />
                                         <input class="neo-range-input" type="number" min="-2" max="2" step="0.01" data-for="presence_pen_textgenerationwebui" id="presence_pen_counter_textgenerationwebui">
                                     </div>
-                                    <div data-tg-type="ooba" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
+                                    <div data-tg-type="aphrodite, ooba" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
                                         <small data-i18n="No Repeat Ngram Size">No Repeat Ngram Size</small>
                                         <input class="neo-range-slider" type="range" id="no_repeat_ngram_size_textgenerationwebui" name="volume" min="0" max="20" step="1">
                                         <input class="neo-range-input" type="number" min="0" max="20" step="1" data-for="no_repeat_ngram_size_textgenerationwebui" id="no_repeat_ngram_size_counter_textgenerationwebui">
                                     </div>
-                                    <div data-tg-type="tabby" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
+                                    <div data-tg-type="tabby, aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
                                         <small data-i18n="Skew">Skew</small>
                                         <input class="neo-range-slider" type="range" id="skew_textgenerationwebui" name="volume" min="-5" max="5" step="0.01" />
                                         <input class="neo-range-input" type="number" min="-5" max="5" step="0.01" data-for="skew_textgenerationwebui" id="skew_counter_textgenerationwebui">
@@ -1402,7 +1402,7 @@
                                         </div>
                                     </div>
 
-                                    <div data-tg-type="ooba, koboldcpp, tabby, llamacpp" id="dryBlock" class="wide100p">
+                                    <div data-tg-type="aphrodite, ooba, koboldcpp, tabby, llamacpp" id="dryBlock" class="wide100p">
                                         <h4 class="wide100p textAlignCenter" title="DRY penalizes tokens that would extend the end of the input into a sequence that has previously occurred in the input. Set multiplier to 0 to disable." data-i18n="[title]DRY_Repetition_Penalty_desc">
                                             <label data-i18n="DRY Repetition Penalty">DRY Repetition Penalty</label>
                                             <a href="https://github.com/oobabooga/text-generation-webui/pull/5677" target="_blank">
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index c81c056f0..0dfae364f 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -1258,6 +1258,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
         'xtc_probability': settings.xtc_probability,
         'nsigma': settings.nsigma,
         'custom_token_bans': toIntArray(banned_tokens),
+        'no_repeat_ngram_size': settings.no_repeat_ngram_size,
     };
 
     if (settings.type === OPENROUTER) {

From 16ba8331b5bd0bec42bf005551c51799a1e58c1e Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Tue, 26 Nov 2024 13:27:27 -0800
Subject: [PATCH 09/31] Document Fuzzy Search process

---
 docs/fuzzy_search_flow.md | 113 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 docs/fuzzy_search_flow.md

diff --git a/docs/fuzzy_search_flow.md b/docs/fuzzy_search_flow.md
new file mode 100644
index 000000000..b6d686c71
--- /dev/null
+++ b/docs/fuzzy_search_flow.md
@@ -0,0 +1,113 @@
+## Input Sources to printCharacters
+
+
+`printCharacters` is the main function that triggers the fuzzy search process if fuzzy search is enabled.
+
+```mermaid
+flowchart TD
+    subgraph User Actions
+        UA1[Character Search Input]
+        UA2[Tag Filter Click]
+        UA3[Folder Navigation]
+        UA4[Character Delete]
+        UA5[Character Create]
+        UA6[Character Import]
+        UA7[Clear All Filters]
+        UA8[Bulk Edit Operations]
+        UA9[Persona Changes]
+    end
+
+    subgraph API Events
+        API1[Character List Update]
+        API2[Group Update]
+        API3[Tag Update]
+    end
+
+    subgraph System Events
+        SE1[Page Load]
+        SE2[Content Manager Update]
+        SE3[Extension Events]
+    end
+
+    UA1 -->|triggers| PCD[printCharactersDebounced]
+    UA2 -->|triggers| PCD
+    UA7 -->|triggers| PCD
+    UA8 -->|triggers| PCD
+    UA9 -->|triggers| PCD
+    
+    UA3 -->|triggers| PC[printCharacters]
+    UA4 -->|triggers| PC
+    UA5 -->|triggers| PC
+    UA6 -->|triggers| PC
+
+    API1 -->|triggers| PC
+    API2 -->|triggers| PC
+    API3 -->|triggers| PC
+
+    SE1 -->|triggers| PC
+    SE2 -->|triggers| PC
+    SE3 -->|triggers| PC
+
+    PCD -->|debounced call| PC
+
+    style PC fill:#f96,stroke:#333
+    style PCD fill:#f96,stroke:#333
+```
+
+This diagram shows how `printCharacters` is called throughout the application:
+
+1. User Actions that trigger character list updates:
+   - Search input (debounced)
+   - Tag filter clicks (debounced)
+   - Folder navigation (direct)
+   - Character management operations (direct)
+
+2. API Events that require list refresh:
+   - Character list updates
+   - Group updates
+   - Tag system updates
+
+3. System Events:
+   - Initial page load
+   - Content manager updates
+   - Extension-triggered refreshes
+
+
+
+## Fuzzy Search Flow
+
+
+This diagram shows the flow of fuzzy search operations:
+```mermaid
+sequenceDiagram
+    participant Data as Data Sources
+    participant PC as printCharacters
+    participant GEL as getEntitiesList
+    participant FH as FilterHelper
+    participant AF as applyFilters
+    participant FS as FuzzySearch Functions
+    participant Cache as FuzzySearchCaches
+
+    Note over Data: Changes from:<br/>- Tags<br/>- Personas<br/>- World Info<br/>- Groups
+    
+    Data->>PC: All changes trigger printCharacters<br/>(direct or debounced)
+    
+    PC->>GEL: Call with {doFilter: true}
+    GEL->>FH: filterByTagState(entities)
+    GEL->>AF: entitiesFilter.applyFilters(entities)
+    
+    AF->>FH: Check scoreCache for existing results
+    FH-->>AF: Return cached scores if exist
+    
+    Note over FS: Filter functions include:<br/>SEARCH, <br/>FAV, <br/>GROUP, <br/>FOLDER, <br/>TAG, <br/>WORLD_INFO_SEARCH, <br/>PERSONA_SEARCH
+    AF->>FS: fuzzySearchCharacters/Groups/Tags
+    FS->>Cache: Check/Store results
+    
+    FS-->>AF: Return search results
+    AF->>FH: Cache new scores
+    AF-->>GEL: Return filtered entities
+    GEL-->>PC: Return final entities list
+    
+    PC->>Cache: clearFuzzySearchCaches()
+    Note over Cache: Cache is cleared at the end of<br/>each printCharacters call,<br/>ensuring fresh results for next search
+```

From dd4a1bf07227c8552a57c48fe0a762e51f0bfa63 Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Tue, 26 Nov 2024 13:32:40 -0800
Subject: [PATCH 10/31] Attempt to allow preview for github

---
 docs/fuzzy_search_flow.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/fuzzy_search_flow.md b/docs/fuzzy_search_flow.md
index b6d686c71..af6af0e62 100644
--- a/docs/fuzzy_search_flow.md
+++ b/docs/fuzzy_search_flow.md
@@ -1,9 +1,9 @@
 ## Input Sources to printCharacters
 
-
 `printCharacters` is the main function that triggers the fuzzy search process if fuzzy search is enabled.
 
 ```mermaid
+%%{init: {'flowchart': {'nodeSpacing': 50, 'rankSpacing': 50}}}%%
 flowchart TD
     subgraph User Actions
         UA1[Character Search Input]

From 8d67bdee841a29364e1c94e311b5e628d5f6feca Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Wed, 27 Nov 2024 11:58:12 +0900
Subject: [PATCH 11/31] Add Tulu templates

---
 default/content/index.json                 |  8 ++++++++
 default/content/presets/context/Tulu.json  | 11 +++++++++++
 default/content/presets/instruct/Tulu.json | 22 ++++++++++++++++++++++
 public/scripts/chat-templates.js           |  6 ++++++
 4 files changed, 47 insertions(+)
 create mode 100644 default/content/presets/context/Tulu.json
 create mode 100644 default/content/presets/instruct/Tulu.json

diff --git a/default/content/index.json b/default/content/index.json
index f08573e56..6df03b78d 100644
--- a/default/content/index.json
+++ b/default/content/index.json
@@ -627,6 +627,14 @@
         "filename": "presets/instruct/Synthia.json",
         "type": "instruct"
     },
+    {
+        "filename": "presets/instruct/Tulu.json",
+        "type": "instruct"
+    },
+    {
+        "filename": "presets/context/Tulu.json",
+        "type": "context"
+    },
     {
         "filename": "presets/instruct/Vicuna 1.0.json",
         "type": "instruct"
diff --git a/default/content/presets/context/Tulu.json b/default/content/presets/context/Tulu.json
new file mode 100644
index 000000000..af3c1f9cf
--- /dev/null
+++ b/default/content/presets/context/Tulu.json
@@ -0,0 +1,11 @@
+{
+    "story_string": "<|system|>\n{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}{{trim}}\n",
+    "example_separator": "",
+    "chat_start": "",
+    "use_stop_strings": false,
+    "allow_jailbreak": false,
+    "always_force_name2": true,
+    "trim_sentences": false,
+    "single_line": false,
+    "name": "Tulu"
+}
diff --git a/default/content/presets/instruct/Tulu.json b/default/content/presets/instruct/Tulu.json
new file mode 100644
index 000000000..7ac968507
--- /dev/null
+++ b/default/content/presets/instruct/Tulu.json
@@ -0,0 +1,22 @@
+{
+    "input_sequence": "<|user|>\n",
+    "output_sequence": "<|assistant|>\n",
+    "first_output_sequence": "",
+    "last_output_sequence": "",
+    "system_sequence_prefix": "",
+    "system_sequence_suffix": "",
+    "stop_sequence": "<|end_of_text|>",
+    "wrap": false,
+    "macro": true,
+    "names_behavior": "always",
+    "activation_regex": "",
+    "skip_examples": false,
+    "output_suffix": "<|end_of_text|>\n",
+    "input_suffix": "",
+    "system_sequence": "<|system|>\n",
+    "system_suffix": "",
+    "user_alignment_message": "",
+    "last_system_sequence": "",
+    "system_same_as_user": false,
+    "name": "Tulu"
+}
diff --git a/public/scripts/chat-templates.js b/public/scripts/chat-templates.js
index ee73bc3e9..ea732b90c 100644
--- a/public/scripts/chat-templates.js
+++ b/public/scripts/chat-templates.js
@@ -53,6 +53,12 @@ const hash_derivations = {
         // command-r-08-2024
         'Command R'
     ,
+
+    // Tulu
+    'ac7498a36a719da630e99d48e6ebc4409de85a77556c2b6159eeb735bcbd11df':
+        // Tulu-3-8B
+        // Tulu-3-70B
+        'Tulu'
 };
 
 const substr_derivations = {

From 1395c0b8c6e4c1a59192051ecd72cd509dcdf709 Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Tue, 26 Nov 2024 19:47:09 -0800
Subject: [PATCH 12/31] Encapsulate logic into filters instead of spreading
 around

---
 docs/fuzzy_search_flow.md    | 113 -----------------------------------
 public/script.js             |  10 ++--
 public/scripts/filters.js    |  57 ++++++++++++++++--
 public/scripts/power-user.js |  66 +++++++++-----------
 4 files changed, 84 insertions(+), 162 deletions(-)
 delete mode 100644 docs/fuzzy_search_flow.md

diff --git a/docs/fuzzy_search_flow.md b/docs/fuzzy_search_flow.md
deleted file mode 100644
index af6af0e62..000000000
--- a/docs/fuzzy_search_flow.md
+++ /dev/null
@@ -1,113 +0,0 @@
-## Input Sources to printCharacters
-
-`printCharacters` is the main function that triggers the fuzzy search process if fuzzy search is enabled.
-
-```mermaid
-%%{init: {'flowchart': {'nodeSpacing': 50, 'rankSpacing': 50}}}%%
-flowchart TD
-    subgraph User Actions
-        UA1[Character Search Input]
-        UA2[Tag Filter Click]
-        UA3[Folder Navigation]
-        UA4[Character Delete]
-        UA5[Character Create]
-        UA6[Character Import]
-        UA7[Clear All Filters]
-        UA8[Bulk Edit Operations]
-        UA9[Persona Changes]
-    end
-
-    subgraph API Events
-        API1[Character List Update]
-        API2[Group Update]
-        API3[Tag Update]
-    end
-
-    subgraph System Events
-        SE1[Page Load]
-        SE2[Content Manager Update]
-        SE3[Extension Events]
-    end
-
-    UA1 -->|triggers| PCD[printCharactersDebounced]
-    UA2 -->|triggers| PCD
-    UA7 -->|triggers| PCD
-    UA8 -->|triggers| PCD
-    UA9 -->|triggers| PCD
-    
-    UA3 -->|triggers| PC[printCharacters]
-    UA4 -->|triggers| PC
-    UA5 -->|triggers| PC
-    UA6 -->|triggers| PC
-
-    API1 -->|triggers| PC
-    API2 -->|triggers| PC
-    API3 -->|triggers| PC
-
-    SE1 -->|triggers| PC
-    SE2 -->|triggers| PC
-    SE3 -->|triggers| PC
-
-    PCD -->|debounced call| PC
-
-    style PC fill:#f96,stroke:#333
-    style PCD fill:#f96,stroke:#333
-```
-
-This diagram shows how `printCharacters` is called throughout the application:
-
-1. User Actions that trigger character list updates:
-   - Search input (debounced)
-   - Tag filter clicks (debounced)
-   - Folder navigation (direct)
-   - Character management operations (direct)
-
-2. API Events that require list refresh:
-   - Character list updates
-   - Group updates
-   - Tag system updates
-
-3. System Events:
-   - Initial page load
-   - Content manager updates
-   - Extension-triggered refreshes
-
-
-
-## Fuzzy Search Flow
-
-
-This diagram shows the flow of fuzzy search operations:
-```mermaid
-sequenceDiagram
-    participant Data as Data Sources
-    participant PC as printCharacters
-    participant GEL as getEntitiesList
-    participant FH as FilterHelper
-    participant AF as applyFilters
-    participant FS as FuzzySearch Functions
-    participant Cache as FuzzySearchCaches
-
-    Note over Data: Changes from:<br/>- Tags<br/>- Personas<br/>- World Info<br/>- Groups
-    
-    Data->>PC: All changes trigger printCharacters<br/>(direct or debounced)
-    
-    PC->>GEL: Call with {doFilter: true}
-    GEL->>FH: filterByTagState(entities)
-    GEL->>AF: entitiesFilter.applyFilters(entities)
-    
-    AF->>FH: Check scoreCache for existing results
-    FH-->>AF: Return cached scores if exist
-    
-    Note over FS: Filter functions include:<br/>SEARCH, <br/>FAV, <br/>GROUP, <br/>FOLDER, <br/>TAG, <br/>WORLD_INFO_SEARCH, <br/>PERSONA_SEARCH
-    AF->>FS: fuzzySearchCharacters/Groups/Tags
-    FS->>Cache: Check/Store results
-    
-    FS-->>AF: Return search results
-    AF->>FH: Cache new scores
-    AF-->>GEL: Return filtered entities
-    GEL-->>PC: Return final entities list
-    
-    PC->>Cache: clearFuzzySearchCaches()
-    Note over Cache: Cache is cleared at the end of<br/>each printCharacters call,<br/>ensuring fresh results for next search
-```
diff --git a/public/script.js b/public/script.js
index 3db294dd5..22b5f9eac 100644
--- a/public/script.js
+++ b/public/script.js
@@ -268,7 +268,6 @@ import { initServerHistory } from './scripts/server-history.js';
 import { initSettingsSearch } from './scripts/setting-search.js';
 import { initBulkEdit } from './scripts/bulk-edit.js';
 import { deriveTemplatesFromChatTemplate } from './scripts/chat-templates.js';
-import { clearFuzzySearchCaches } from './scripts/power-user.js';
 
 //exporting functions and vars for mods
 export {
@@ -1516,7 +1515,6 @@ export async function printCharacters(fullRefresh = false) {
     });
 
     favsToHotswap();
-    clearFuzzySearchCaches();
 }
 
 /** Checks the state of the current search, and adds/removes the search sorting option accordingly */
@@ -1623,7 +1621,7 @@ export function getEntitiesList({ doFilter = false, doSort = true } = {}) {
             subEntities = filterByTagState(entities, { subForEntity: entity });
             if (doFilter) {
                 // sub entities filter "hacked" because folder filter should not be applied there, so even in "only folders" mode characters show up
-                subEntities = entitiesFilter.applyFilters(subEntities, { clearScoreCache: false, tempOverrides: { [FILTER_TYPES.FOLDER]: FILTER_STATES.UNDEFINED } });
+                subEntities = entitiesFilter.applyFilters(subEntities, { clearScoreCache: false, tempOverrides: { [FILTER_TYPES.FOLDER]: FILTER_STATES.UNDEFINED }, clearFuzzySearchCaches: false });
             }
             if (doSort) {
                 sortEntitiesList(subEntities);
@@ -1636,11 +1634,11 @@ export function getEntitiesList({ doFilter = false, doSort = true } = {}) {
     // Second run filters, hiding whatever should be filtered later
     if (doFilter) {
         const beforeFinalEntities = filterByTagState(entities, { globalDisplayFilters: true });
-        entities = entitiesFilter.applyFilters(beforeFinalEntities);
+        entities = entitiesFilter.applyFilters(beforeFinalEntities, { clearFuzzySearchCaches: false });
 
         // Magic for folder filter. If that one is enabled, and no folders are display anymore, we remove that filter to actually show the characters.
         if (isFilterState(entitiesFilter.getFilterData(FILTER_TYPES.FOLDER), FILTER_STATES.SELECTED) && entities.filter(x => x.type == 'tag').length == 0) {
-            entities = entitiesFilter.applyFilters(beforeFinalEntities, { tempOverrides: { [FILTER_TYPES.FOLDER]: FILTER_STATES.UNDEFINED } });
+            entities = entitiesFilter.applyFilters(beforeFinalEntities, { tempOverrides: { [FILTER_TYPES.FOLDER]: FILTER_STATES.UNDEFINED }, clearFuzzySearchCaches: false });
         }
     }
 
@@ -1656,6 +1654,7 @@ export function getEntitiesList({ doFilter = false, doSort = true } = {}) {
     if (doSort) {
         sortEntitiesList(entities);
     }
+    entitiesFilter.clearFuzzySearchCaches();
     return entities;
 }
 
@@ -1751,6 +1750,7 @@ export async function getCharacters() {
         }
 
         await getGroups();
+        // clearFuzzySearchCaches();
         await printCharacters(true);
     }
 }
diff --git a/public/scripts/filters.js b/public/scripts/filters.js
index adc27b349..2d01e45e3 100644
--- a/public/scripts/filters.js
+++ b/public/scripts/filters.js
@@ -55,6 +55,19 @@ export function isFilterState(a, b) {
     return aKey === bKey;
 }
 
+/**
+ * The fuzzy search categories
+ * @type {{ characters: string, worldInfo: string, personas: string, tags: string, groups: string }}
+ */
+export const fuzzySearchCategories = Object.freeze({
+    characters: 'characters',
+    worldInfo: 'worldInfo',
+    personas: 'personas',
+    tags: 'tags',
+    groups: 'groups',
+});
+
+
 /**
  * Helper class for filtering data.
  * @example
@@ -72,6 +85,12 @@ export class FilterHelper {
      */
     scoreCache;
 
+    /**
+     * Cache for fuzzy search results per category.
+     * @type {Object.<string, { resultMap: Map<string, any> }>}
+     */
+    fuzzySearchCaches;
+
     /**
      * Creates a new FilterHelper
      * @param {Function} onDataChanged Callback to trigger when the filter data changes
@@ -79,6 +98,13 @@ export class FilterHelper {
     constructor(onDataChanged) {
         this.onDataChanged = onDataChanged;
         this.scoreCache = new Map();
+        this.fuzzySearchCaches = {
+            [fuzzySearchCategories.characters]: { resultMap: new Map() },
+            [fuzzySearchCategories.worldInfo]: { resultMap: new Map() },
+            [fuzzySearchCategories.personas]: { resultMap: new Map() },
+            [fuzzySearchCategories.tags]: { resultMap: new Map() },
+            [fuzzySearchCategories.groups]: { resultMap: new Map() },
+        };
     }
 
     /**
@@ -151,7 +177,7 @@ export class FilterHelper {
             return data;
         }
 
-        const fuzzySearchResults = fuzzySearchWorldInfo(data, term);
+        const fuzzySearchResults = fuzzySearchWorldInfo(data, term, this.fuzzySearchCaches);
         this.cacheScores(FILTER_TYPES.WORLD_INFO_SEARCH, new Map(fuzzySearchResults.map(i => [i.item?.uid, i.score])));
 
         const filteredData = data.filter(entity => fuzzySearchResults.find(x => x.item === entity));
@@ -170,7 +196,7 @@ export class FilterHelper {
             return data;
         }
 
-        const fuzzySearchResults = fuzzySearchPersonas(data, term);
+        const fuzzySearchResults = fuzzySearchPersonas(data, term, this.fuzzySearchCaches);
         this.cacheScores(FILTER_TYPES.PERSONA_SEARCH, new Map(fuzzySearchResults.map(i => [i.item.key, i.score])));
 
         const filteredData = data.filter(name => fuzzySearchResults.find(x => x.item.key === name));
@@ -289,9 +315,9 @@ export class FilterHelper {
 
         // Save fuzzy search results and scores if enabled
         if (power_user.fuzzy_search) {
-            const fuzzySearchCharactersResults = fuzzySearchCharacters(searchValue);
-            const fuzzySearchGroupsResults = fuzzySearchGroups(searchValue);
-            const fuzzySearchTagsResult = fuzzySearchTags(searchValue);
+            const fuzzySearchCharactersResults = fuzzySearchCharacters(searchValue, this.fuzzySearchCaches);
+            const fuzzySearchGroupsResults = fuzzySearchGroups(searchValue, this.fuzzySearchCaches);
+            const fuzzySearchTagsResult = fuzzySearchTags(searchValue, this.fuzzySearchCaches);
             this.cacheScores(FILTER_TYPES.SEARCH, new Map(fuzzySearchCharactersResults.map(i => [`character.${i.refIndex}`, i.score])));
             this.cacheScores(FILTER_TYPES.SEARCH, new Map(fuzzySearchGroupsResults.map(i => [`group.${i.item.id}`, i.score])));
             this.cacheScores(FILTER_TYPES.SEARCH, new Map(fuzzySearchTagsResult.map(i => [`tag.${i.item.id}`, i.score])));
@@ -343,11 +369,14 @@ export class FilterHelper {
      * @param {object} options - Optional call parameters
      * @param {boolean} [options.clearScoreCache=true] - Whether the score cache should be cleared.
      * @param {Object.<FilterType, any>} [options.tempOverrides={}] - Temporarily override specific filters for this filter application
+     * @param {boolean} [options.clearFuzzySearchCaches=true] - Whether the fuzzy search caches should be cleared.
      * @returns {any[]} The filtered data.
      */
-    applyFilters(data, { clearScoreCache = true, tempOverrides = {} } = {}) {
+    applyFilters(data, { clearScoreCache = true, tempOverrides = {}, clearFuzzySearchCaches = true } = {}) {
         if (clearScoreCache) this.clearScoreCache();
 
+        if (clearFuzzySearchCaches) this.clearFuzzySearchCaches();
+
         // Save original filter states
         const originalStates = {};
         for (const key in tempOverrides) {
@@ -411,4 +440,20 @@ export class FilterHelper {
             this.scoreCache = new Map();
         }
     }
+
+    /**
+     * Clears fuzzy search caches
+     * @param {keyof typeof fuzzySearchCategories} [type] Optional cache type to clear. If not provided, clears all caches
+     */
+    clearFuzzySearchCaches(type = null) {
+        if (type && this.fuzzySearchCaches[type]) {
+            this.fuzzySearchCaches[type].resultMap.clear();
+            console.log(`Fuzzy search cache cleared for: ${type}`);
+        } else {
+            for (const cache of Object.values(this.fuzzySearchCaches)) {
+                cache.resultMap.clear();
+            }
+            console.log('All fuzzy search caches cleared');
+        }
+    }
 }
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 5b64fcee8..0a36952f2 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -53,6 +53,7 @@ import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandE
 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { POPUP_TYPE, callGenericPopup } from './popup.js';
 import { loadSystemPrompts } from './sysprompt.js';
+import { fuzzySearchCategories } from './filters.js';
 
 export {
     loadPowerUserSettings,
@@ -328,22 +329,6 @@ const contextControls = [
 let browser_has_focus = true;
 const debug_functions = [];
 
-const fuzzySearchCaches = {
-    characters: { resultMap: new Map() },
-    worldInfo: { resultMap: new Map() },
-    personas: { resultMap: new Map() },
-    tags: { resultMap: new Map() },
-    groups: { resultMap: new Map() },
-};
-
-const fuzzySearchCategories = {
-    characters: 'characters',
-    worldInfo: 'worldInfo',
-    personas: 'personas',
-    tags: 'tags',
-    groups: 'groups',
-};
-
 const setHotswapsDebounced = debounce(favsToHotswap);
 
 function playMessageSound() {
@@ -1845,19 +1830,26 @@ async function loadContextSettings() {
     });
 }
 
+
 /**
  * Common function to perform fuzzy search with caching
  * @param {string} type - Type of search from fuzzySearchCategories
  * @param {any[]} data - Data array to search in
  * @param {Array<{name: string, weight: number, getFn?: Function}>} keys - Fuse.js keys configuration
  * @param {string} searchValue - The search term
+ * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-function performFuzzySearch(type, data, keys, searchValue) {
+function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches) {
+    let startTime = performance.now();
     const cache = fuzzySearchCaches[type];
 
     // Check cache for existing results
     if (cache.resultMap.has(searchValue)) {
+        let endTime = performance.now();
+        if (endTime - startTime > 1.0) {
+            console.log(`Fuzzy search for ${type} took ${endTime - startTime}ms (cached)`);
+        }
         return cache.resultMap.get(searchValue);
     }
 
@@ -1872,26 +1864,20 @@ function performFuzzySearch(type, data, keys, searchValue) {
 
     const results = fuse.search(searchValue);
     cache.resultMap.set(searchValue, results);
-    return results;
-}
-
-
-/**
- * Clears all fuzzy search caches
- */
-export function clearFuzzySearchCaches() {
-    for (const cache of Object.values(fuzzySearchCaches)) {
-        cache.resultMap.clear();
+    let endTime = performance.now();
+    if (endTime - startTime > 1.0) {
+        console.log(`Fuzzy search for ${type} took ${endTime - startTime}ms`);
     }
-    console.log('Fuzzy search caches cleared');
+    return results;
 }
 
 /**
  * Fuzzy search characters by a search term
  * @param {string} searchValue - The search term
+ * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchCharacters(searchValue) {
+export function fuzzySearchCharacters(searchValue, fuzzySearchCaches) {
     const keys = [
         { name: 'data.name', weight: 20 },
         { name: '#tags', weight: 10, getFn: (character) => getTagsList(character.avatar).map(x => x.name).join('||') },
@@ -1906,16 +1892,17 @@ export function fuzzySearchCharacters(searchValue) {
         { name: 'data.alternate_greetings', weight: 1 },
     ];
 
-    return performFuzzySearch(fuzzySearchCategories.characters, characters, keys, searchValue);
+    return performFuzzySearch(fuzzySearchCategories.characters, characters, keys, searchValue, fuzzySearchCaches);
 }
 
 /**
  * Fuzzy search world info entries by a search term
  * @param {*[]} data - WI items data array
  * @param {string} searchValue - The search term
+ * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchWorldInfo(data, searchValue) {
+export function fuzzySearchWorldInfo(data, searchValue, fuzzySearchCaches) {
     const keys = [
         { name: 'key', weight: 20 },
         { name: 'group', weight: 15 },
@@ -1926,16 +1913,17 @@ export function fuzzySearchWorldInfo(data, searchValue) {
         { name: 'automationId', weight: 1 },
     ];
 
-    return performFuzzySearch(fuzzySearchCategories.worldInfo, data, keys, searchValue);
+    return performFuzzySearch(fuzzySearchCategories.worldInfo, data, keys, searchValue, fuzzySearchCaches);
 }
 
 /**
  * Fuzzy search persona entries by a search term
  * @param {*[]} data - persona data array
  * @param {string} searchValue - The search term
+ * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchPersonas(data, searchValue) {
+export function fuzzySearchPersonas(data, searchValue, fuzzySearchCaches) {
     const mappedData = data.map(x => ({
         key: x,
         name: power_user.personas[x] ?? '',
@@ -1947,28 +1935,30 @@ export function fuzzySearchPersonas(data, searchValue) {
         { name: 'description', weight: 3 },
     ];
 
-    return performFuzzySearch(fuzzySearchCategories.personas, mappedData, keys, searchValue);
+    return performFuzzySearch(fuzzySearchCategories.personas, mappedData, keys, searchValue, fuzzySearchCaches);
 }
 
 /**
  * Fuzzy search tags by a search term
  * @param {string} searchValue - The search term
+ * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchTags(searchValue) {
+export function fuzzySearchTags(searchValue, fuzzySearchCaches) {
     const keys = [
         { name: 'name', weight: 1 },
     ];
 
-    return performFuzzySearch(fuzzySearchCategories.tags, tags, keys, searchValue);
+    return performFuzzySearch(fuzzySearchCategories.tags, tags, keys, searchValue, fuzzySearchCaches);
 }
 
 /**
  * Fuzzy search groups by a search term
  * @param {string} searchValue - The search term
+ * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchGroups(searchValue) {
+export function fuzzySearchGroups(searchValue, fuzzySearchCaches) {
     const keys = [
         { name: 'name', weight: 20 },
         { name: 'members', weight: 15 },
@@ -1976,7 +1966,7 @@ export function fuzzySearchGroups(searchValue) {
         { name: 'id', weight: 1 },
     ];
 
-    return performFuzzySearch(fuzzySearchCategories.groups, groups, keys, searchValue);
+    return performFuzzySearch(fuzzySearchCategories.groups, groups, keys, searchValue, fuzzySearchCaches);
 }
 
 /**

From 309157dd8932518d5f1cc4349e022bdbf832ec66 Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Tue, 26 Nov 2024 19:52:21 -0800
Subject: [PATCH 13/31] Remove unnecesary key only clearing for cache clearing

---
 public/scripts/filters.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/public/scripts/filters.js b/public/scripts/filters.js
index 2d01e45e3..f07b4e33f 100644
--- a/public/scripts/filters.js
+++ b/public/scripts/filters.js
@@ -443,17 +443,11 @@ export class FilterHelper {
 
     /**
      * Clears fuzzy search caches
-     * @param {keyof typeof fuzzySearchCategories} [type] Optional cache type to clear. If not provided, clears all caches
      */
-    clearFuzzySearchCaches(type = null) {
-        if (type && this.fuzzySearchCaches[type]) {
-            this.fuzzySearchCaches[type].resultMap.clear();
-            console.log(`Fuzzy search cache cleared for: ${type}`);
-        } else {
-            for (const cache of Object.values(this.fuzzySearchCaches)) {
-                cache.resultMap.clear();
-            }
-            console.log('All fuzzy search caches cleared');
+    clearFuzzySearchCaches() {
+        for (const cache of Object.values(this.fuzzySearchCaches)) {
+            cache.resultMap.clear();
         }
+        console.log('All fuzzy search caches cleared');
     }
 }

From f4ef9697e983a0bb0b3b0ab6388f5ecbfe37898e Mon Sep 17 00:00:00 2001
From: Joe <joenunezb@gmail.com>
Date: Tue, 26 Nov 2024 20:07:30 -0800
Subject: [PATCH 14/31] Account for optional cache and remove timing code

---
 public/script.js             |  1 -
 public/scripts/power-user.js | 48 +++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/public/script.js b/public/script.js
index 22b5f9eac..4d97e91b9 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1750,7 +1750,6 @@ export async function getCharacters() {
         }
 
         await getGroups();
-        // clearFuzzySearchCaches();
         await printCharacters(true);
     }
 }
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 0a36952f2..931067333 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -1832,25 +1832,21 @@ async function loadContextSettings() {
 
 
 /**
- * Common function to perform fuzzy search with caching
+ * Common function to perform fuzzy search with optional caching
  * @param {string} type - Type of search from fuzzySearchCategories
  * @param {any[]} data - Data array to search in
  * @param {Array<{name: string, weight: number, getFn?: Function}>} keys - Fuse.js keys configuration
  * @param {string} searchValue - The search term
- * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
+ * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches) {
-    let startTime = performance.now();
-    const cache = fuzzySearchCaches[type];
-
-    // Check cache for existing results
-    if (cache.resultMap.has(searchValue)) {
-        let endTime = performance.now();
-        if (endTime - startTime > 1.0) {
-            console.log(`Fuzzy search for ${type} took ${endTime - startTime}ms (cached)`);
+function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches = null) {
+    // Check cache if provided
+    if (fuzzySearchCaches) {
+        const cache = fuzzySearchCaches[type];
+        if (cache?.resultMap.has(searchValue)) {
+            return cache.resultMap.get(searchValue);
         }
-        return cache.resultMap.get(searchValue);
     }
 
     // @ts-ignore
@@ -1863,10 +1859,10 @@ function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches) {
     });
 
     const results = fuse.search(searchValue);
-    cache.resultMap.set(searchValue, results);
-    let endTime = performance.now();
-    if (endTime - startTime > 1.0) {
-        console.log(`Fuzzy search for ${type} took ${endTime - startTime}ms`);
+
+    // Store in cache if provided
+    if (fuzzySearchCaches) {
+        fuzzySearchCaches[type].resultMap.set(searchValue, results);
     }
     return results;
 }
@@ -1874,10 +1870,10 @@ function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches) {
 /**
  * Fuzzy search characters by a search term
  * @param {string} searchValue - The search term
- * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
+ * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchCharacters(searchValue, fuzzySearchCaches) {
+export function fuzzySearchCharacters(searchValue, fuzzySearchCaches = null) {
     const keys = [
         { name: 'data.name', weight: 20 },
         { name: '#tags', weight: 10, getFn: (character) => getTagsList(character.avatar).map(x => x.name).join('||') },
@@ -1899,10 +1895,10 @@ export function fuzzySearchCharacters(searchValue, fuzzySearchCaches) {
  * Fuzzy search world info entries by a search term
  * @param {*[]} data - WI items data array
  * @param {string} searchValue - The search term
- * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
+ * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchWorldInfo(data, searchValue, fuzzySearchCaches) {
+export function fuzzySearchWorldInfo(data, searchValue, fuzzySearchCaches = null) {
     const keys = [
         { name: 'key', weight: 20 },
         { name: 'group', weight: 15 },
@@ -1920,10 +1916,10 @@ export function fuzzySearchWorldInfo(data, searchValue, fuzzySearchCaches) {
  * Fuzzy search persona entries by a search term
  * @param {*[]} data - persona data array
  * @param {string} searchValue - The search term
- * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
+ * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchPersonas(data, searchValue, fuzzySearchCaches) {
+export function fuzzySearchPersonas(data, searchValue, fuzzySearchCaches = null) {
     const mappedData = data.map(x => ({
         key: x,
         name: power_user.personas[x] ?? '',
@@ -1941,10 +1937,10 @@ export function fuzzySearchPersonas(data, searchValue, fuzzySearchCaches) {
 /**
  * Fuzzy search tags by a search term
  * @param {string} searchValue - The search term
- * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
+ * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchTags(searchValue, fuzzySearchCaches) {
+export function fuzzySearchTags(searchValue, fuzzySearchCaches = null) {
     const keys = [
         { name: 'name', weight: 1 },
     ];
@@ -1955,10 +1951,10 @@ export function fuzzySearchTags(searchValue, fuzzySearchCaches) {
 /**
  * Fuzzy search groups by a search term
  * @param {string} searchValue - The search term
- * @param {Object.<string, { resultMap: Map<string, any> }>} fuzzySearchCaches - Fuzzy search caches
+ * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
-export function fuzzySearchGroups(searchValue, fuzzySearchCaches) {
+export function fuzzySearchGroups(searchValue, fuzzySearchCaches = null) {
     const keys = [
         { name: 'name', weight: 20 },
         { name: 'members', weight: 15 },

From ef35adb9e401a82426f75bcec5c219e439357f20 Mon Sep 17 00:00:00 2001
From: Karl-Johan Alm <karljohan-alm@garage.co.jp>
Date: Thu, 28 Nov 2024 12:45:05 +0900
Subject: [PATCH 15/31] tulu template: added \n to input_suffix and
 system_suffix to match model card

---
 default/content/presets/instruct/Tulu.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default/content/presets/instruct/Tulu.json b/default/content/presets/instruct/Tulu.json
index 7ac968507..14072f563 100644
--- a/default/content/presets/instruct/Tulu.json
+++ b/default/content/presets/instruct/Tulu.json
@@ -12,9 +12,9 @@
     "activation_regex": "",
     "skip_examples": false,
     "output_suffix": "<|end_of_text|>\n",
-    "input_suffix": "",
+    "input_suffix": "\n",
     "system_sequence": "<|system|>\n",
-    "system_suffix": "",
+    "system_suffix": "\n",
     "user_alignment_message": "",
     "last_system_sequence": "",
     "system_same_as_user": false,

From 8bfb6955363402a3191f686aa8d6ee67a033513c Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 28 Nov 2024 11:38:10 +0000
Subject: [PATCH 16/31] Adjust documentation links

---
 public/index.html | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7c2371604..c00ab84f7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3272,7 +3272,7 @@
                             Advanced Formatting
                         </span>
 
-                        <a href="https://docs.sillytavern.app/usage/prompts/" class="notes-link" target="_blank">
+                        <a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/" class="notes-link" target="_blank">
                             <span class="fa-solid fa-circle-question note-link-span"></span>
                         </a>
                     </h3>
@@ -3734,7 +3734,7 @@
                     </div>
                     <h3 class="margin0">
                         <span data-i18n="Worlds/Lorebooks">Worlds/Lorebooks</span>
-                        <a href="https://docs.sillytavern.app/usage/worldinfo/" class="notes-link" target="_blank">
+                        <a href="https://docs.sillytavern.app/usage/core-concepts/worldinfo/" class="notes-link" target="_blank">
                             <span class="fa-solid fa-circle-question note-link-span"></span>
                         </a>
                     </h3>
@@ -3928,7 +3928,13 @@
                     <div name="userSettingsRowOne" class="flex-container flexFlowRow alignitemscenter spaceBetween">
                         <div class="flex-container">
                             <div class="flex-container flexnowrap alignItemsBaseline">
-                                <h3 class="margin0"><span data-i18n="User Settings">User Settings</span></h3>
+                                <h3 class="margin0">
+                                    <span data-i18n="User Settings">User Settings</span>
+
+                                    <a href="https://docs.sillytavern.app/usage/user_settings/" class="notes-link" target="_blank">
+                                        <span class="fa-solid fa-circle-question note-link-span"></span>
+                                    </a>
+                                </h3>
                             </div>
                         </div>
                         <div id="UI-language-block" class="flex-container alignItemsBaseline">
@@ -4261,9 +4267,6 @@
                                 <audio id="audio_message_sound" src="sounds/message.mp3" hidden></audio>
                                 <span>
                                     <small data-i18n="Message Sound">Message Sound</small>
-                                    <a href="https://docs.sillytavern.app/usage/user_settings/uicustomization/#message-sound" class="notes-link" target="_blank">
-                                        <span class="fa-solid fa-circle-question note-link-span"></span>
-                                    </a>
                                 </span>
                             </label>
                             <label for="play_sound_unfocused" class="checkbox_label" title="Only play a sound when ST's browser tab is unfocused." data-i18n="[title]Only play a sound when ST's browser tab is unfocused">

From f630c8892a48b3970fd8b38a8edb64333d399d88 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 28 Nov 2024 22:39:20 +0200
Subject: [PATCH 17/31] Webpack: cache lib.js to disk to prevent occasional OOM

---
 src/middleware/webpack-serve.js | 6 +++++-
 webpack.config.js               | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/middleware/webpack-serve.js b/src/middleware/webpack-serve.js
index 3901ae643..4958acbe9 100644
--- a/src/middleware/webpack-serve.js
+++ b/src/middleware/webpack-serve.js
@@ -1,4 +1,5 @@
 import process from 'node:process';
+import fs from 'node:fs';
 import webpack from 'webpack';
 import middleware from 'webpack-dev-middleware';
 import { publicLibConfig } from '../../webpack.config.js';
@@ -16,5 +17,8 @@ export default function getWebpackServeMiddleware() {
         });
     }
 
-    return middleware(compiler, {});
+    return middleware(compiler, {
+        // @ts-ignore Use actual file system to ease on heap memory usage
+        outputFileSystem: fs,
+    });
 }
diff --git a/webpack.config.js b/webpack.config.js
index 1e5138555..e4a819dd9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,6 +24,7 @@ export const publicLibConfig = {
         hints: false,
     },
     output: {
+        path: path.resolve(process.cwd(), 'dist'),
         filename: 'lib.js',
         libraryTarget: 'module',
     },

From afb4acc19b604fd736597d6ce3c090e4b29cd429 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 28 Nov 2024 22:45:45 +0200
Subject: [PATCH 18/31] Revert "Webpack: cache lib.js to disk to prevent
 occasional OOM"

This reverts commit f630c8892a48b3970fd8b38a8edb64333d399d88.
---
 src/middleware/webpack-serve.js | 6 +-----
 webpack.config.js               | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/middleware/webpack-serve.js b/src/middleware/webpack-serve.js
index 4958acbe9..3901ae643 100644
--- a/src/middleware/webpack-serve.js
+++ b/src/middleware/webpack-serve.js
@@ -1,5 +1,4 @@
 import process from 'node:process';
-import fs from 'node:fs';
 import webpack from 'webpack';
 import middleware from 'webpack-dev-middleware';
 import { publicLibConfig } from '../../webpack.config.js';
@@ -17,8 +16,5 @@ export default function getWebpackServeMiddleware() {
         });
     }
 
-    return middleware(compiler, {
-        // @ts-ignore Use actual file system to ease on heap memory usage
-        outputFileSystem: fs,
-    });
+    return middleware(compiler, {});
 }
diff --git a/webpack.config.js b/webpack.config.js
index e4a819dd9..1e5138555 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,7 +24,6 @@ export const publicLibConfig = {
         hints: false,
     },
     output: {
-        path: path.resolve(process.cwd(), 'dist'),
         filename: 'lib.js',
         libraryTarget: 'module',
     },

From b5c2ecdfccc704a7bf2f47815c2f258ab23f9780 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 28 Nov 2024 22:39:20 +0200
Subject: [PATCH 19/31] Webpack: cache lib.js to disk to prevent occasional OOM

---
 src/middleware/webpack-serve.js | 6 +++++-
 webpack.config.js               | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/middleware/webpack-serve.js b/src/middleware/webpack-serve.js
index 3901ae643..4958acbe9 100644
--- a/src/middleware/webpack-serve.js
+++ b/src/middleware/webpack-serve.js
@@ -1,4 +1,5 @@
 import process from 'node:process';
+import fs from 'node:fs';
 import webpack from 'webpack';
 import middleware from 'webpack-dev-middleware';
 import { publicLibConfig } from '../../webpack.config.js';
@@ -16,5 +17,8 @@ export default function getWebpackServeMiddleware() {
         });
     }
 
-    return middleware(compiler, {});
+    return middleware(compiler, {
+        // @ts-ignore Use actual file system to ease on heap memory usage
+        outputFileSystem: fs,
+    });
 }
diff --git a/webpack.config.js b/webpack.config.js
index 1e5138555..e4a819dd9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,6 +24,7 @@ export const publicLibConfig = {
         hints: false,
     },
     output: {
+        path: path.resolve(process.cwd(), 'dist'),
         filename: 'lib.js',
         libraryTarget: 'module',
     },

From afccb8517a09c71edc87138b0610a1d2292add02 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 00:13:43 +0200
Subject: [PATCH 20/31] Ditch webpack-dev-middleware

---
 package-lock.json               | 253 --------------------------------
 package.json                    |   1 -
 server.js                       |   6 +-
 src/middleware/webpack-serve.js |  41 +++++-
 webpack.config.js               |   4 +
 5 files changed, 40 insertions(+), 265 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e3d0eade1..bbac61b87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,6 @@
                 "vectra": "^0.2.2",
                 "wavefile": "^11.0.0",
                 "webpack": "^5.95.0",
-                "webpack-dev-middleware": "^7.4.2",
                 "write-file-atomic": "^5.0.1",
                 "ws": "^8.17.1",
                 "yaml": "^2.3.4",
@@ -866,60 +865,6 @@
                 "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
-        "node_modules/@jsonjoy.com/base64": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
-            "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=10.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/streamich"
-            },
-            "peerDependencies": {
-                "tslib": "2"
-            }
-        },
-        "node_modules/@jsonjoy.com/json-pack": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz",
-            "integrity": "sha512-zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@jsonjoy.com/base64": "^1.1.1",
-                "@jsonjoy.com/util": "^1.1.2",
-                "hyperdyperid": "^1.2.0",
-                "thingies": "^1.20.0"
-            },
-            "engines": {
-                "node": ">=10.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/streamich"
-            },
-            "peerDependencies": {
-                "tslib": "2"
-            }
-        },
-        "node_modules/@jsonjoy.com/util": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.5.0.tgz",
-            "integrity": "sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==",
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=10.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/streamich"
-            },
-            "peerDependencies": {
-                "tslib": "2"
-            }
-        },
         "node_modules/@kwsites/file-exists": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -1803,45 +1748,6 @@
                 "url": "https://github.com/sponsors/epoberezkin"
             }
         },
-        "node_modules/ajv-formats": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-            "license": "MIT",
-            "dependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "ajv": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/ajv-formats/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "fast-uri": "^3.0.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "license": "MIT"
-        },
         "node_modules/ajv-keywords": {
             "version": "3.5.2",
             "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
@@ -2602,12 +2508,6 @@
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
             "license": "MIT"
         },
-        "node_modules/colorette": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-            "license": "MIT"
-        },
         "node_modules/combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3785,12 +3685,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/fast-uri": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
-            "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
-            "license": "BSD-3-Clause"
-        },
         "node_modules/fastq": {
             "version": "1.15.0",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
@@ -4541,15 +4435,6 @@
                 "ms": "^2.0.0"
             }
         },
-        "node_modules/hyperdyperid": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
-            "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=10.18"
-            }
-        },
         "node_modules/iconv-lite": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -5176,25 +5061,6 @@
                 "node": ">= 0.6"
             }
         },
-        "node_modules/memfs": {
-            "version": "4.14.0",
-            "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.14.0.tgz",
-            "integrity": "sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@jsonjoy.com/json-pack": "^1.0.3",
-                "@jsonjoy.com/util": "^1.3.0",
-                "tree-dump": "^1.0.1",
-                "tslib": "^2.0.0"
-            },
-            "engines": {
-                "node": ">= 4.0.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/streamich"
-            }
-        },
         "node_modules/merge-descriptors": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
@@ -6310,15 +6176,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/resolve-alpn": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
@@ -6447,59 +6304,6 @@
             "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
             "license": "ISC"
         },
-        "node_modules/schema-utils": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-            "license": "MIT",
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
-        "node_modules/schema-utils/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "fast-uri": "^3.0.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/schema-utils/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
-        "node_modules/schema-utils/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "license": "MIT"
-        },
         "node_modules/seedrandom": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
@@ -7038,18 +6842,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/thingies": {
-            "version": "1.21.0",
-            "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
-            "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
-            "license": "Unlicense",
-            "engines": {
-                "node": ">=10.18"
-            },
-            "peerDependencies": {
-                "tslib": "^2"
-            }
-        },
         "node_modules/tiktoken": {
             "version": "1.0.16",
             "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.16.tgz",
@@ -7106,22 +6898,6 @@
                 "node": ">=18"
             }
         },
-        "node_modules/tree-dump": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz",
-            "integrity": "sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==",
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=10.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/streamich"
-            },
-            "peerDependencies": {
-                "tslib": "2"
-            }
-        },
         "node_modules/truncate-utf8-bytes": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
@@ -7425,35 +7201,6 @@
                 }
             }
         },
-        "node_modules/webpack-dev-middleware": {
-            "version": "7.4.2",
-            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
-            "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
-            "license": "MIT",
-            "dependencies": {
-                "colorette": "^2.0.10",
-                "memfs": "^4.6.0",
-                "mime-types": "^2.1.31",
-                "on-finished": "^2.4.1",
-                "range-parser": "^1.2.1",
-                "schema-utils": "^4.0.0"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^5.0.0"
-            },
-            "peerDependenciesMeta": {
-                "webpack": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/webpack-sources": {
             "version": "3.2.3",
             "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
diff --git a/package.json b/package.json
index 3608d9775..e2e15d376 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
         "vectra": "^0.2.2",
         "wavefile": "^11.0.0",
         "webpack": "^5.95.0",
-        "webpack-dev-middleware": "^7.4.2",
         "write-file-atomic": "^5.0.1",
         "ws": "^8.17.1",
         "yaml": "^2.3.4",
diff --git a/server.js b/server.js
index 1b70e2f8c..db7ba9306 100644
--- a/server.js
+++ b/server.js
@@ -627,10 +627,6 @@ const tavernUrl = new URL(
     (':' + server_port),
 );
 
-function prepareFrontendBundle() {
-    return new Promise((resolve) => webpackMiddleware.waitUntilValid(resolve));
-}
-
 /**
  * Tasks that need to be run before the server starts listening.
  */
@@ -682,7 +678,7 @@ const preSetupTasks = async function () {
     initRequestProxy({ enabled: proxyEnabled, url: proxyUrl, bypass: proxyBypass });
 
     // Wait for frontend libs to compile
-    await prepareFrontendBundle();
+    await webpackMiddleware.runWebpackCompiler();
 };
 
 /**
diff --git a/src/middleware/webpack-serve.js b/src/middleware/webpack-serve.js
index 4958acbe9..a10b3fa7b 100644
--- a/src/middleware/webpack-serve.js
+++ b/src/middleware/webpack-serve.js
@@ -1,10 +1,11 @@
 import process from 'node:process';
-import fs from 'node:fs';
+import path from 'node:path';
 import webpack from 'webpack';
-import middleware from 'webpack-dev-middleware';
 import { publicLibConfig } from '../../webpack.config.js';
 
 export default function getWebpackServeMiddleware() {
+    const outputPath = publicLibConfig.output?.path;
+    const outputFile = publicLibConfig.output?.filename;
     const compiler = webpack(publicLibConfig);
 
     if (process.env.NODE_ENV === 'production' || process.platform === 'android') {
@@ -17,8 +18,36 @@ export default function getWebpackServeMiddleware() {
         });
     }
 
-    return middleware(compiler, {
-        // @ts-ignore Use actual file system to ease on heap memory usage
-        outputFileSystem: fs,
-    });
+    /**
+     * A very spartan recreation of webpack-dev-middleware.
+     * @param {import('express').Request} req Request object.
+     * @param {import('express').Response} res Response object.
+     * @param {import('express').NextFunction} next Next function.
+     * @type {import('express').RequestHandler}
+     */
+    async function devMiddleware(req, res, next) {
+        if (req.method === 'GET' && path.parse(req.path).base === outputFile) {
+            return res.sendFile(outputFile, { root: outputPath });
+        }
+
+        next();
+    }
+
+    /**
+     * Wait until Webpack is done compiling.
+     * @returns {Promise<void>}
+     */
+    devMiddleware.runWebpackCompiler = () => {
+        return new Promise((resolve) => {
+            compiler.run((_error, stats) => {
+                const output = stats?.toString(publicLibConfig.stats);
+                if (output) {
+                    console.log(output);
+                }
+                resolve();
+            });
+        });
+    };
+
+    return devMiddleware;
 }
diff --git a/webpack.config.js b/webpack.config.js
index e4a819dd9..187c7ded9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,6 +8,8 @@ export const publicLibConfig = {
     cache: {
         type: 'filesystem',
         cacheDirectory: path.resolve(process.cwd(), 'dist/webpack'),
+        store: 'pack',
+        compression: 'gzip',
     },
     devtool: false,
     watch: false,
@@ -16,6 +18,8 @@ export const publicLibConfig = {
         preset: 'minimal',
         assets: false,
         modules: false,
+        colors: true,
+        timings: true,
     },
     experiments: {
         outputModule: true,

From 768b3e48f70b3526aa32669bc3970ffe874373d8 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 00:25:31 +0200
Subject: [PATCH 21/31] Remove webpack watch unhook

---
 src/middleware/webpack-serve.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/middleware/webpack-serve.js b/src/middleware/webpack-serve.js
index a10b3fa7b..a0f7e22f8 100644
--- a/src/middleware/webpack-serve.js
+++ b/src/middleware/webpack-serve.js
@@ -1,4 +1,3 @@
-import process from 'node:process';
 import path from 'node:path';
 import webpack from 'webpack';
 import { publicLibConfig } from '../../webpack.config.js';
@@ -8,16 +7,6 @@ export default function getWebpackServeMiddleware() {
     const outputFile = publicLibConfig.output?.filename;
     const compiler = webpack(publicLibConfig);
 
-    if (process.env.NODE_ENV === 'production' || process.platform === 'android') {
-        compiler.hooks.done.tap('serve', () => {
-            if (compiler.watching) {
-                compiler.watching.close(() => { });
-            }
-            compiler.watchFileSystem = null;
-            compiler.watchMode = false;
-        });
-    }
-
     /**
      * A very spartan recreation of webpack-dev-middleware.
      * @param {import('express').Request} req Request object.

From 52606616c4b7dac5f57d9e863543274c014bfdec Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:06:10 +0200
Subject: [PATCH 22/31] Add 100MB limit to parsed characters cache

---
 src/endpoints/characters.js |   8 +-
 src/util.js                 | 179 ++++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+), 2 deletions(-)

diff --git a/src/endpoints/characters.js b/src/endpoints/characters.js
index f2bd478e8..1a209e710 100644
--- a/src/endpoints/characters.js
+++ b/src/endpoints/characters.js
@@ -14,7 +14,7 @@ import jimp from 'jimp';
 
 import { AVATAR_WIDTH, AVATAR_HEIGHT } from '../constants.js';
 import { jsonParser, urlencodedParser } from '../express-common.js';
-import { deepMerge, humanizedISO8601DateTime, tryParse, extractFileFromZipBuffer } from '../util.js';
+import { deepMerge, humanizedISO8601DateTime, tryParse, extractFileFromZipBuffer, LimitedMap } from '../util.js';
 import { TavernCardValidator } from '../validator/TavernCardValidator.js';
 import { parse, write } from '../character-card-parser.js';
 import { readWorldInfoFile } from './worldinfo.js';
@@ -23,7 +23,8 @@ import { importRisuSprites } from './sprites.js';
 const defaultAvatarPath = './public/img/ai4.png';
 
 // KV-store for parsed character data
-const characterDataCache = new Map();
+// 100 MB limit. Would take roughly 3000 characters to reach this limit
+const characterDataCache = new LimitedMap(1024 * 1024 * 100);
 // Some Android devices require tighter memory management
 const isAndroid = process.platform === 'android';
 
@@ -58,6 +59,9 @@ async function writeCharacterData(inputFile, data, outputFile, request, crop = u
     try {
         // Reset the cache
         for (const key of characterDataCache.keys()) {
+            if (Buffer.isBuffer(inputFile)) {
+                break;
+            }
             if (key.startsWith(inputFile)) {
                 characterDataCache.delete(key);
                 break;
diff --git a/src/util.js b/src/util.js
index 7cebdc031..d03fb6a9c 100644
--- a/src/util.js
+++ b/src/util.js
@@ -670,3 +670,182 @@ export function isValidUrl(url) {
         return false;
     }
 }
+
+/**
+ * LimitedMap class that limits the memory usage of string values.
+ */
+export class LimitedMap {
+    /**
+     * Creates an instance of LimitedMap.
+     * @param {number} maxMemoryInBytes - The maximum allowed memory in bytes for string values.
+     */
+    constructor(maxMemoryInBytes) {
+        if (typeof maxMemoryInBytes !== 'number' || maxMemoryInBytes <= 0) {
+            throw new Error('maxMemoryInBytes must be a positive number');
+        }
+        this.maxMemory = maxMemoryInBytes;
+        this.currentMemory = 0;
+        this.map = new Map();
+        this.queue = [];
+    }
+
+    /**
+     * Estimates the memory usage of a string in bytes.
+     * Assumes each character occupies 2 bytes (UTF-16).
+     * @param {string} str
+     * @returns {number}
+     */
+    static estimateStringSize(str) {
+        return str.length * 2;
+    }
+
+    /**
+     * Adds or updates a key-value pair in the map.
+     * If adding the new value exceeds the memory limit, evicts oldest entries.
+     * @param {string} key
+     * @param {string} value
+     */
+    set(key, value) {
+        if (typeof key !== 'string' || typeof value !== 'string') {
+            return;
+        }
+
+        const newValueSize = LimitedMap.estimateStringSize(value);
+
+        // If the new value itself exceeds the max memory, reject it
+        if (newValueSize > this.maxMemory) {
+            return;
+        }
+
+        // Check if the key already exists to adjust memory accordingly
+        if (this.map.has(key)) {
+            const oldValue = this.map.get(key);
+            const oldValueSize = LimitedMap.estimateStringSize(oldValue);
+            this.currentMemory -= oldValueSize;
+            // Remove the key from its current position in the queue
+            const index = this.queue.indexOf(key);
+            if (index > -1) {
+                this.queue.splice(index, 1);
+            }
+        }
+
+        // Evict oldest entries until there's enough space
+        while (this.currentMemory + newValueSize > this.maxMemory && this.queue.length > 0) {
+            const oldestKey = this.queue.shift();
+            const oldestValue = this.map.get(oldestKey);
+            const oldestValueSize = LimitedMap.estimateStringSize(oldestValue);
+            this.map.delete(oldestKey);
+            this.currentMemory -= oldestValueSize;
+        }
+
+        // After eviction, check again if there's enough space
+        if (this.currentMemory + newValueSize > this.maxMemory) {
+            return;
+        }
+
+        // Add the new key-value pair
+        this.map.set(key, value);
+        this.queue.push(key);
+        this.currentMemory += newValueSize;
+    }
+
+    /**
+     * Retrieves the value associated with the given key.
+     * @param {string} key
+     * @returns {string | undefined}
+     */
+    get(key) {
+        return this.map.get(key);
+    }
+
+    /**
+     * Checks if the map contains the given key.
+     * @param {string} key
+     * @returns {boolean}
+     */
+    has(key) {
+        return this.map.has(key);
+    }
+
+    /**
+     * Deletes the key-value pair associated with the given key.
+     * @param {string} key
+     * @returns {boolean} - Returns true if the key was found and deleted, else false.
+     */
+    delete(key) {
+        if (!this.map.has(key)) {
+            return false;
+        }
+        const value = this.map.get(key);
+        const valueSize = LimitedMap.estimateStringSize(value);
+        this.map.delete(key);
+        this.currentMemory -= valueSize;
+
+        // Remove the key from the queue
+        const index = this.queue.indexOf(key);
+        if (index > -1) {
+            this.queue.splice(index, 1);
+        }
+
+        return true;
+    }
+
+    /**
+     * Clears all entries from the map.
+     */
+    clear() {
+        this.map.clear();
+        this.queue = [];
+        this.currentMemory = 0;
+    }
+
+    /**
+     * Returns the number of key-value pairs in the map.
+     * @returns {number}
+     */
+    size() {
+        return this.map.size;
+    }
+
+    /**
+     * Returns the current memory usage in bytes.
+     * @returns {number}
+     */
+    totalMemory() {
+        return this.currentMemory;
+    }
+
+    /**
+     * Returns an iterator over the keys in the map.
+     * @returns {IterableIterator<string>}
+     */
+    keys() {
+        return this.map.keys();
+    }
+
+    /**
+     * Returns an iterator over the values in the map.
+     * @returns {IterableIterator<string>}
+     */
+    values() {
+        return this.map.values();
+    }
+
+    /**
+     * Iterates over the map in insertion order.
+     * @param {Function} callback - Function to execute for each element.
+     */
+    forEach(callback) {
+        this.map.forEach((value, key) => {
+            callback(value, key, this);
+        });
+    }
+
+    /**
+     * Makes the LimitedMap iterable.
+     * @returns {Iterator} - Iterator over [key, value] pairs.
+     */
+    [Symbol.iterator]() {
+        return this.map[Symbol.iterator]();
+    }
+}

From c873362d0140208857d1857e637916d00d1c4d9a Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 01:28:10 +0200
Subject: [PATCH 23/31] Safer estimation of possibly undefined values

---
 src/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util.js b/src/util.js
index d03fb6a9c..8a1334259 100644
--- a/src/util.js
+++ b/src/util.js
@@ -696,7 +696,7 @@ export class LimitedMap {
      * @returns {number}
      */
     static estimateStringSize(str) {
-        return str.length * 2;
+        return str ? str.length * 2 : 0;
     }
 
     /**

From e8004b5b56c20b4395c478e58aaf34ce91d266c3 Mon Sep 17 00:00:00 2001
From: ceruleandeep <deep@cerulean.navy>
Date: Fri, 29 Nov 2024 11:52:57 +1100
Subject: [PATCH 24/31] Wire up id= parameter for /qr-context*

Parameter is in the named arguments but was not handled in the handler. Added `args.id !== undefined ? Number(args.id) : args.label` etc, as used elsewhere.
---
 .../quick-reply/src/SlashCommandHandler.js    | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/public/scripts/extensions/quick-reply/src/SlashCommandHandler.js b/public/scripts/extensions/quick-reply/src/SlashCommandHandler.js
index f6b339cdf..15f7524a4 100644
--- a/public/scripts/extensions/quick-reply/src/SlashCommandHandler.js
+++ b/public/scripts/extensions/quick-reply/src/SlashCommandHandler.js
@@ -419,30 +419,35 @@ export class SlashCommandHandler {
             namedArgumentList: [
                 SlashCommandNamedArgument.fromProps({
                     name: 'set',
-                    description: 'QR set name',
+                    description: 'Name of QR set to add the context menu to',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'label',
-                    description: 'Quick Reply label',
+                    description: 'Label of Quick Reply to add the context menu to',
                     typeList: [ARGUMENT_TYPE.STRING],
                     enumProvider: localEnumProviders.qrEntries,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'id',
-                    description: 'numeric ID of the QR, e.g., id=42',
+                    description: 'Numeric ID of Quick Reply to add the context menu to, e.g. id=42',
                     typeList: [ARGUMENT_TYPE.NUMBER],
                     enumProvider: localEnumProviders.qrIds,
                 }),
                 new SlashCommandNamedArgument(
-                    'chain', 'boolean', [ARGUMENT_TYPE.BOOLEAN], false, false, 'false',
+                    'chain',
+                    'If true, button QR is sent together with (before) the clicked QR from the context menu',
+                    [ARGUMENT_TYPE.BOOLEAN],
+                    false,
+                    false,
+                    'false',
                 ),
             ],
             unnamedArgumentList: [
                 SlashCommandArgument.fromProps({
-                    description: 'QR set name',
+                    description: 'Name of QR set to add as a context menu',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,
@@ -450,13 +455,16 @@ export class SlashCommandHandler {
             ],
             helpString: `
                 <div>
-                    Add context menu preset to a QR.
+                    Add a context menu preset to a QR.
+                </div>
+                <div>
+                    If <code>id</code> and <code>label</code> are both provided, <code>id</code> will be used.
                 </div>
                 <div>
                     <strong>Example:</strong>
                     <ul>
                         <li>
-                            <pre><code>/qr-contextadd set=MyPreset label=MyButton chain=true MyOtherPreset</code></pre>
+                            <pre><code>/qr-contextadd set=MyQRSetWithTheButton label=MyButton chain=true MyQRSetWithContextItems</code></pre>
                         </li>
                     </ul>
                 </div>
@@ -470,27 +478,27 @@ export class SlashCommandHandler {
             namedArgumentList: [
                 SlashCommandNamedArgument.fromProps({
                     name: 'set',
-                    description: 'QR set name',
+                    description: 'Name of QR set to remove the context menu from',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'label',
-                    description: 'Quick Reply label',
+                    description: 'Label of Quick Reply to remove the context menu from',
                     typeList: [ARGUMENT_TYPE.STRING],
                     enumProvider: localEnumProviders.qrEntries,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'id',
-                    description: 'numeric ID of the QR, e.g., id=42',
+                    description: 'Numeric ID of Quick Reply to remove the context menu from, e.g. id=42',
                     typeList: [ARGUMENT_TYPE.NUMBER],
                     enumProvider: localEnumProviders.qrIds,
                 }),
             ],
             unnamedArgumentList: [
                 SlashCommandArgument.fromProps({
-                    description: 'QR set name',
+                    description: 'Name of QR set to remove',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,
@@ -500,6 +508,9 @@ export class SlashCommandHandler {
                 <div>
                     Remove context menu preset from a QR.
                 </div>
+                <div>
+                    If <code>id</code> and <code>label</code> are both provided, <code>id</code> will be used.
+                </div>
                 <div>
                     <strong>Example:</strong>
                     <ul>
@@ -541,6 +552,9 @@ export class SlashCommandHandler {
                 <div>
                     Remove all context menu presets from a QR.
                 </div>
+                <div>
+                    If <code>id</code> and a label are both provided, <code>id</code> will be used.
+                </div>
                 <div>
                     <strong>Example:</strong>
                     <ul>
@@ -908,12 +922,11 @@ export class SlashCommandHandler {
         }
     }
 
-
     createContextItem(args, name) {
         try {
             this.api.createContextItem(
                 args.set,
-                args.label,
+                args.id !== undefined ? Number(args.id) : args.label,
                 name,
                 isTrueBoolean(args.chain),
             );
@@ -923,14 +936,14 @@ export class SlashCommandHandler {
     }
     deleteContextItem(args, name) {
         try {
-            this.api.deleteContextItem(args.set, args.label, name);
+            this.api.deleteContextItem(args.set, args.id !== undefined ? Number(args.id) : args.label, name);
         }  catch (ex) {
             toastr.error(ex.message);
         }
     }
     clearContextMenu(args, label) {
         try {
-            this.api.clearContextMenu(args.set, args.label ?? label);
+            this.api.clearContextMenu(args.set, args.id !== undefined ? Number(args.id) : args.label ?? label);
         } catch (ex) {
             toastr.error(ex.message);
         }

From 3a1a955164427cfbae63c4ad97845e500dba676b Mon Sep 17 00:00:00 2001
From: ceruleandeep <deep@cerulean.navy>
Date: Fri, 29 Nov 2024 17:20:11 +1100
Subject: [PATCH 25/31] Make QR context menu display options more consistent
 with QR bar

Use QR title as tooltip if set on the QR

Add qr--hidden class to "invisible" context items to allow hiding with CSS

Add title and isHidden props to MenuItem

Remove domIcon and domLabel props: not needed for ctx menu rendering; isForceExpanded: unimplemented
---
 .../quick-reply/src/ui/ctx/ContextMenu.js     |  6 ++-
 .../quick-reply/src/ui/ctx/MenuHeader.js      |  2 +-
 .../quick-reply/src/ui/ctx/MenuItem.js        | 46 ++++++++++++++++---
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js b/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js
index 48ac3fbae..3741d2869 100644
--- a/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js
+++ b/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js
@@ -19,7 +19,7 @@ export class ContextMenu {
         this.itemList = this.build(qr).children;
         this.itemList.forEach(item => {
             item.onExpand = () => {
-                this.itemList.filter(it => it != item)
+                this.itemList.filter(it => it !== item)
                     .forEach(it => it.collapse());
             };
         });
@@ -36,7 +36,9 @@ export class ContextMenu {
             icon: qr.icon,
             showLabel: qr.showLabel,
             label: qr.label,
+            title: qr.title,
             message: (chainedMessage && qr.message ? `${chainedMessage} | ` : '') + qr.message,
+            isHidden: qr.isHidden,
             children: [],
         };
         qr.contextList.forEach((cl) => {
@@ -51,7 +53,9 @@ export class ContextMenu {
                         subTree.icon,
                         subTree.showLabel,
                         subTree.label,
+                        subTree.title,
                         subTree.message,
+                        subTree.isHidden,
                         (evt) => {
                             evt.stopPropagation();
                             const finalQr = Object.assign(new QuickReply(), subQr);
diff --git a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js
index 2fe6f7a68..c4c10148c 100644
--- a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js
+++ b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js
@@ -2,7 +2,7 @@ import { MenuItem } from './MenuItem.js';
 
 export class MenuHeader extends MenuItem {
     constructor(/**@type {String}*/label) {
-        super(null, null, label, null, null);
+        super(null, null, label, null, null, false, null, []);
     }
 
 
diff --git a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js
index 2b4daba99..f6a5db069 100644
--- a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js
+++ b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js
@@ -4,11 +4,12 @@ export class MenuItem {
     /**@type {string}*/ icon;
     /**@type {boolean}*/ showLabel;
     /**@type {string}*/ label;
+    /**@type {string}*/ title;
     /**@type {object}*/ value;
+    /**@type {boolean}*/ isHidden = false;
     /**@type {function}*/ callback;
     /**@type {MenuItem[]}*/ childList = [];
     /**@type {SubMenu}*/ subMenu;
-    /**@type {boolean}*/ isForceExpanded = false;
 
     /**@type {HTMLElement}*/ root;
 
@@ -19,35 +20,67 @@ export class MenuItem {
 
     /**
      *
-     * @param {string} icon
-     * @param {boolean} showLabel
+     * @param {?string} icon
+     * @param {?boolean} showLabel
      * @param {string} label
+     * @param {?string} title Tooltip
      * @param {object} value
+     * @param {boolean} isHidden QR is Invisible (auto-execute only)
      * @param {function} callback
      * @param {MenuItem[]} children
      */
-    constructor(icon, showLabel, label, value, callback, children = []) {
+    constructor(icon, showLabel, label, title, value, isHidden, callback, children = []) {
         this.icon = icon;
         this.showLabel = showLabel;
         this.label = label;
+        this.title = title;
         this.value = value;
+        this.isHidden = isHidden;
         this.callback = callback;
         this.childList = children;
     }
 
 
+    /**
+     * Renders the MenuItem
+     *
+     * A .qr--hidden class is added to:
+     * - the item if it is "Invisible (auto-execute only)"
+     * - the icon if no icon is set
+     * - the label if an icon is set and showLabel is false
+     *
+     * There is no .qr--hidden class defined in default CSS, since having items
+     * that are invisible on the QR bar but visible in the context menu,
+     * or icon-only on the QR bar but labelled in the context menu, is a valid use case.
+     *
+     * To hide optional labels when icons are present, add this user CSS:
+     * .ctx-menu .ctx-item .qr--button-label.qr--hidden {display: none;}
+     * To hide icons when no icon is present (removes unwanted padding):
+     * .ctx-menu .ctx-item .qr--button-icon.qr--hidden {display: none;}
+     * To hide items that are set "invisible":
+     * .ctx-menu .ctx-item.qr--hidden {display: none;}
+     * To target submenus only, use .ctx-menu .ctx-sub-menu .qr--hidden {display: none;}
+     *
+     * @returns {HTMLElement}
+     */
     render() {
         if (!this.root) {
             const item = document.createElement('li'); {
                 this.root = item;
                 item.classList.add('list-group-item');
                 item.classList.add('ctx-item');
-                item.title = this.value;
+
+                // if this item is Invisible, add the hidden class
+                if (this.isHidden) item.classList.add('qr--hidden');
+
+                // if a title/tooltip is set, add it, otherwise use the QR content
+                // same as for the main QR list
+                item.title = this.title || this.value;
+
                 if (this.callback) {
                     item.addEventListener('click', (evt) => this.callback(evt, this));
                 }
                 const icon = document.createElement('div'); {
-                    this.domIcon = icon;
                     icon.classList.add('qr--button-icon');
                     icon.classList.add('fa-solid');
                     if (!this.icon) icon.classList.add('qr--hidden');
@@ -55,7 +88,6 @@ export class MenuItem {
                     item.append(icon);
                 }
                 const lbl = document.createElement('div'); {
-                    this.domLabel = lbl;
                     lbl.classList.add('qr--button-label');
                     if (this.icon && !this.showLabel) lbl.classList.add('qr--hidden');
                     lbl.textContent = this.label;

From 095d19cda73742ee23daedb3af8c7b55615b4789 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 12:33:48 +0000
Subject: [PATCH 26/31] Rename LimitedMap => MemoryLimitedMap

---
 src/endpoints/characters.js |  4 ++--
 src/util.js                 | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/endpoints/characters.js b/src/endpoints/characters.js
index 1a209e710..b3be9d6f4 100644
--- a/src/endpoints/characters.js
+++ b/src/endpoints/characters.js
@@ -14,7 +14,7 @@ import jimp from 'jimp';
 
 import { AVATAR_WIDTH, AVATAR_HEIGHT } from '../constants.js';
 import { jsonParser, urlencodedParser } from '../express-common.js';
-import { deepMerge, humanizedISO8601DateTime, tryParse, extractFileFromZipBuffer, LimitedMap } from '../util.js';
+import { deepMerge, humanizedISO8601DateTime, tryParse, extractFileFromZipBuffer, MemoryLimitedMap } from '../util.js';
 import { TavernCardValidator } from '../validator/TavernCardValidator.js';
 import { parse, write } from '../character-card-parser.js';
 import { readWorldInfoFile } from './worldinfo.js';
@@ -24,7 +24,7 @@ const defaultAvatarPath = './public/img/ai4.png';
 
 // KV-store for parsed character data
 // 100 MB limit. Would take roughly 3000 characters to reach this limit
-const characterDataCache = new LimitedMap(1024 * 1024 * 100);
+const characterDataCache = new MemoryLimitedMap(1024 * 1024 * 100);
 // Some Android devices require tighter memory management
 const isAndroid = process.platform === 'android';
 
diff --git a/src/util.js b/src/util.js
index 8a1334259..623626d3d 100644
--- a/src/util.js
+++ b/src/util.js
@@ -672,11 +672,11 @@ export function isValidUrl(url) {
 }
 
 /**
- * LimitedMap class that limits the memory usage of string values.
+ * MemoryLimitedMap class that limits the memory usage of string values.
  */
-export class LimitedMap {
+export class MemoryLimitedMap {
     /**
-     * Creates an instance of LimitedMap.
+     * Creates an instance of MemoryLimitedMap.
      * @param {number} maxMemoryInBytes - The maximum allowed memory in bytes for string values.
      */
     constructor(maxMemoryInBytes) {
@@ -710,7 +710,7 @@ export class LimitedMap {
             return;
         }
 
-        const newValueSize = LimitedMap.estimateStringSize(value);
+        const newValueSize = MemoryLimitedMap.estimateStringSize(value);
 
         // If the new value itself exceeds the max memory, reject it
         if (newValueSize > this.maxMemory) {
@@ -720,7 +720,7 @@ export class LimitedMap {
         // Check if the key already exists to adjust memory accordingly
         if (this.map.has(key)) {
             const oldValue = this.map.get(key);
-            const oldValueSize = LimitedMap.estimateStringSize(oldValue);
+            const oldValueSize = MemoryLimitedMap.estimateStringSize(oldValue);
             this.currentMemory -= oldValueSize;
             // Remove the key from its current position in the queue
             const index = this.queue.indexOf(key);
@@ -733,7 +733,7 @@ export class LimitedMap {
         while (this.currentMemory + newValueSize > this.maxMemory && this.queue.length > 0) {
             const oldestKey = this.queue.shift();
             const oldestValue = this.map.get(oldestKey);
-            const oldestValueSize = LimitedMap.estimateStringSize(oldestValue);
+            const oldestValueSize = MemoryLimitedMap.estimateStringSize(oldestValue);
             this.map.delete(oldestKey);
             this.currentMemory -= oldestValueSize;
         }
@@ -777,7 +777,7 @@ export class LimitedMap {
             return false;
         }
         const value = this.map.get(key);
-        const valueSize = LimitedMap.estimateStringSize(value);
+        const valueSize = MemoryLimitedMap.estimateStringSize(value);
         this.map.delete(key);
         this.currentMemory -= valueSize;
 
@@ -842,7 +842,7 @@ export class LimitedMap {
     }
 
     /**
-     * Makes the LimitedMap iterable.
+     * Makes the MemoryLimitedMap iterable.
      * @returns {Iterator} - Iterator over [key, value] pairs.
      */
     [Symbol.iterator]() {

From 53514b5e1a44bf3bd18ff06aff2306b6f5a2ba7c Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:12:46 +0000
Subject: [PATCH 27/31] Prettify compilation console logs

---
 src/middleware/webpack-serve.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/middleware/webpack-serve.js b/src/middleware/webpack-serve.js
index a0f7e22f8..c0ccea4ec 100644
--- a/src/middleware/webpack-serve.js
+++ b/src/middleware/webpack-serve.js
@@ -28,10 +28,13 @@ export default function getWebpackServeMiddleware() {
      */
     devMiddleware.runWebpackCompiler = () => {
         return new Promise((resolve) => {
+            console.log();
+            console.log('Compiling frontend libraries...');
             compiler.run((_error, stats) => {
                 const output = stats?.toString(publicLibConfig.stats);
                 if (output) {
                     console.log(output);
+                    console.log();
                 }
                 resolve();
             });

From 7fbff41329dbf2022c64b60a713d2d2e1dd20576 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:14:40 +0000
Subject: [PATCH 28/31] Unasync route handler

---
 src/middleware/webpack-serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/middleware/webpack-serve.js b/src/middleware/webpack-serve.js
index c0ccea4ec..c1dc73fd4 100644
--- a/src/middleware/webpack-serve.js
+++ b/src/middleware/webpack-serve.js
@@ -14,7 +14,7 @@ export default function getWebpackServeMiddleware() {
      * @param {import('express').NextFunction} next Next function.
      * @type {import('express').RequestHandler}
      */
-    async function devMiddleware(req, res, next) {
+    function devMiddleware(req, res, next) {
         if (req.method === 'GET' && path.parse(req.path).base === outputFile) {
             return res.sendFile(outputFile, { root: outputPath });
         }

From a444a782e23e8ba9d1c2909f19abab66fd973bb5 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:32:53 +0000
Subject: [PATCH 29/31] Fix input outline on discreet login page

---
 public/css/login.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/css/login.css b/public/css/login.css
index 94f8e9953..689988682 100644
--- a/public/css/login.css
+++ b/public/css/login.css
@@ -42,3 +42,9 @@ body.login .userSelect .userHandle {
 body.login .userSelect:hover {
     background-color: var(--black30a);
 }
+
+body.login #handleEntryBlock,
+body.login #passwordEntryBlock,
+body.login #passwordRecoveryBlock {
+    margin: 2px;
+}

From 2f7bc7ca8ddd501964e6e0da9404f6ec9b658d00 Mon Sep 17 00:00:00 2001
From: ceruleandeep <deep@cerulean.navy>
Date: Fri, 29 Nov 2024 23:42:16 +1100
Subject: [PATCH 30/31] Filter out hidden items in context menus

Add CSS to apply label show/hide settings to QRs in context menus

Add provision for QR set applied to one of its own buttons as "burger" menu
---
 .../quick-reply/src/ui/ctx/ContextMenu.js     | 20 +++++++++++--
 .../quick-reply/src/ui/ctx/MenuHeader.js      |  2 +-
 .../quick-reply/src/ui/ctx/MenuItem.js        | 30 +------------------
 .../scripts/extensions/quick-reply/style.css  |  3 ++
 .../scripts/extensions/quick-reply/style.less |  4 +++
 5 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js b/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js
index 3741d2869..9f712379b 100644
--- a/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js
+++ b/public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js
@@ -38,7 +38,6 @@ export class ContextMenu {
             label: qr.label,
             title: qr.title,
             message: (chainedMessage && qr.message ? `${chainedMessage} | ` : '') + qr.message,
-            isHidden: qr.isHidden,
             children: [],
         };
         qr.contextList.forEach((cl) => {
@@ -47,7 +46,23 @@ export class ContextMenu {
                 const nextHierarchy = [...hierarchy, cl.set];
                 const nextLabelHierarchy = [...labelHierarchy, tree.label];
                 tree.children.push(new MenuHeader(cl.set.name));
-                cl.set.qrList.forEach(subQr => {
+
+                // If the Quick Reply's own set is added as a context menu,
+                // show only the sub-QRs that are Invisible but have an icon
+                // intent: allow a QR set to be assigned to one of its own QR buttons for a "burger" menu
+                // with "UI" QRs either in the bar or in the menu, and "library function" QRs still hidden.
+                // - QRs already visible on the bar are filtered out,
+                // - hidden QRs without an icon are filtered out,
+                // - hidden QRs **with an icon** are shown in the menu
+                // so everybody is happy
+                const qrsOwnSetAddedAsContextMenu = cl.set.qrList.includes(qr);
+                const visible = (subQr) => {
+                    return qrsOwnSetAddedAsContextMenu
+                        ? subQr.isHidden && !!subQr.icon  // yes .isHidden gets inverted here
+                        : !subQr.isHidden;
+                };
+
+                cl.set.qrList.filter(visible).forEach(subQr => {
                     const subTree = this.build(subQr, cl.isChained ? tree.message : null, nextHierarchy, nextLabelHierarchy);
                     tree.children.push(new MenuItem(
                         subTree.icon,
@@ -55,7 +70,6 @@ export class ContextMenu {
                         subTree.label,
                         subTree.title,
                         subTree.message,
-                        subTree.isHidden,
                         (evt) => {
                             evt.stopPropagation();
                             const finalQr = Object.assign(new QuickReply(), subQr);
diff --git a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js
index c4c10148c..94c16c3a2 100644
--- a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js
+++ b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js
@@ -2,7 +2,7 @@ import { MenuItem } from './MenuItem.js';
 
 export class MenuHeader extends MenuItem {
     constructor(/**@type {String}*/label) {
-        super(null, null, label, null, null, false, null, []);
+        super(null, null, label, null, null, null, []);
     }
 
 
diff --git a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js
index f6a5db069..2b33ec640 100644
--- a/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js
+++ b/public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js
@@ -6,7 +6,6 @@ export class MenuItem {
     /**@type {string}*/ label;
     /**@type {string}*/ title;
     /**@type {object}*/ value;
-    /**@type {boolean}*/ isHidden = false;
     /**@type {function}*/ callback;
     /**@type {MenuItem[]}*/ childList = [];
     /**@type {SubMenu}*/ subMenu;
@@ -25,44 +24,20 @@ export class MenuItem {
      * @param {string} label
      * @param {?string} title Tooltip
      * @param {object} value
-     * @param {boolean} isHidden QR is Invisible (auto-execute only)
      * @param {function} callback
      * @param {MenuItem[]} children
      */
-    constructor(icon, showLabel, label, title, value, isHidden, callback, children = []) {
+    constructor(icon, showLabel, label, title, value, callback, children = []) {
         this.icon = icon;
         this.showLabel = showLabel;
         this.label = label;
         this.title = title;
         this.value = value;
-        this.isHidden = isHidden;
         this.callback = callback;
         this.childList = children;
     }
 
 
-    /**
-     * Renders the MenuItem
-     *
-     * A .qr--hidden class is added to:
-     * - the item if it is "Invisible (auto-execute only)"
-     * - the icon if no icon is set
-     * - the label if an icon is set and showLabel is false
-     *
-     * There is no .qr--hidden class defined in default CSS, since having items
-     * that are invisible on the QR bar but visible in the context menu,
-     * or icon-only on the QR bar but labelled in the context menu, is a valid use case.
-     *
-     * To hide optional labels when icons are present, add this user CSS:
-     * .ctx-menu .ctx-item .qr--button-label.qr--hidden {display: none;}
-     * To hide icons when no icon is present (removes unwanted padding):
-     * .ctx-menu .ctx-item .qr--button-icon.qr--hidden {display: none;}
-     * To hide items that are set "invisible":
-     * .ctx-menu .ctx-item.qr--hidden {display: none;}
-     * To target submenus only, use .ctx-menu .ctx-sub-menu .qr--hidden {display: none;}
-     *
-     * @returns {HTMLElement}
-     */
     render() {
         if (!this.root) {
             const item = document.createElement('li'); {
@@ -70,9 +45,6 @@ export class MenuItem {
                 item.classList.add('list-group-item');
                 item.classList.add('ctx-item');
 
-                // if this item is Invisible, add the hidden class
-                if (this.isHidden) item.classList.add('qr--hidden');
-
                 // if a title/tooltip is set, add it, otherwise use the QR content
                 // same as for the main QR list
                 item.title = this.title || this.value;
diff --git a/public/scripts/extensions/quick-reply/style.css b/public/scripts/extensions/quick-reply/style.css
index bd61e4962..0bb2707f9 100644
--- a/public/scripts/extensions/quick-reply/style.css
+++ b/public/scripts/extensions/quick-reply/style.css
@@ -174,6 +174,9 @@
   position: absolute;
   overflow: visible;
 }
+.ctx-menu .ctx-item .qr--hidden {
+    display: none;
+}
 .list-group .list-group-item.ctx-header {
   font-weight: bold;
   cursor: default;
diff --git a/public/scripts/extensions/quick-reply/style.less b/public/scripts/extensions/quick-reply/style.less
index c5d2b2b70..a45616e2e 100644
--- a/public/scripts/extensions/quick-reply/style.less
+++ b/public/scripts/extensions/quick-reply/style.less
@@ -176,6 +176,10 @@
     overflow: visible;
 }
 
+.ctx-menu .ctx-item .qr--hidden {
+    display: none;
+}
+
 .list-group .list-group-item.ctx-header {
     font-weight: bold;
     cursor: default;

From 89ec8fd23a24f464b935692e5dc7bda6cc015e58 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 1 Dec 2024 14:38:17 +0200
Subject: [PATCH 31/31] Bump package version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbac61b87..93902fcff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "sillytavern",
-    "version": "1.12.7",
+    "version": "1.12.8",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
-            "version": "1.12.7",
+            "version": "1.12.8",
             "hasInstallScript": true,
             "license": "AGPL-3.0",
             "dependencies": {
diff --git a/package.json b/package.json
index e2e15d376..56ddd3796 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.12.7",
+    "version": "1.12.8",
     "scripts": {
         "start": "node server.js",
         "start:deno": "deno run --allow-run --allow-net --allow-read --allow-write --allow-sys --allow-env server.js",