10a72b8c · permissionBRICK/SillyTavern

Dockerfile+1 -1 Viewed

 ARG APP_HOME=/home/node/app
 # Install system dependencies
-RUN apk add gcompat tini git
+RUN apk add --no-cache gcompat tini git
 # Create app directory
 WORKDIR ${APP_HOME}

default/!DO-NOT-EDIT-THESE-FILES.txt+13 -0 Viewed

+These are master copies of the default content files and are managed by SillyTavern.
+Editing any of these files would not only have no effect, but will also cause merge conflicts during update pulls.
+You should edit their respective copies instead, for example:
+. /default/config.yaml => /config.yaml
+. /default/public/css/user.css => /public/css/user.css
+etc.
+Any questions? You're always welcome at our official documentation website:
+https://docs.sillytavern.app/

default/config.yaml+12 -2 Viewed

 # the username and passwords for basic auth are the same as those
 # for the individual accounts
 perUserBasicAuth: false
-# Minimum log level to display in the terminal (DEBUG = 0, INFO = 1, WARN = 2, ERROR = 3)
-minLogLevel: 0
 # User session timeout *in seconds* (defaults to 24 hours).
 ## Set to a positive number to expire session after a certain time of inactivity

 disableCsrfProtection: false
 # Disable startup security checks - NOT RECOMMENDED
 securityOverride: false
+# -- LOGGING CONFIGURATION --
+logging:
+  # Enable access logging to access.log file
+  # Records new connections with timestamp, IP address and user agent
+  enableAccessLog: true
+  # Minimum log level to display in the terminal (DEBUG = 0, INFO = 1, WARN = 2, ERROR = 3)
+  minLogLevel: 0
+# -- RATE LIMITING CONFIGURATION --
+rateLimiting:
+  # Use X-Real-IP header instead of socket IP for rate limiting
+  # Only enable this if you are using a properly configured reverse proxy (like Nginx/traefik/Caddy)
+  preferRealIpHeader: false
 # -- ADVANCED CONFIGURATION --
 # Open the browser automatically
 autorun: true

docker/build-lib.js+1 -1 Viewed

 import getWebpackServeMiddleware from '../src/middleware/webpack-serve.js';
 const middleware = getWebpackServeMiddleware();
-await middleware.runWebpackCompiler();
+await middleware.runWebpackCompiler({ forceDist: true });

package-lock.json+45 -22 Viewed

                 "cors": "^2.8.5",
                 "csrf-sync": "^4.0.3",
                 "diff-match-patch": "^1.0.5",
-                "dompurify": "^3.1.7",
+                "dompurify": "^3.2.4",
                 "droll": "^0.2.1",
                 "express": "^4.21.0",
                 "form-data": "^4.0.0",

                 "ip-matching": "^2.1.2",
                 "ip-regex": "^5.0.0",
                 "ipaddr.js": "^2.0.1",
+                "is-docker": "^3.0.0",
                 "jimp": "^0.22.10",
                 "localforage": "^1.10.0",
                 "lodash": "^4.17.21",

                 "@types/cookie-session": "^2.0.49",
                 "@types/cors": "^2.8.17",
                 "@types/deno": "^2.0.0",
-                "@types/dompurify": "^3.0.5",
                 "@types/express": "^4.17.21",
                 "@types/jquery": "^3.5.29",
                 "@types/jquery-cropper": "^1.0.4",

             "dev": true,
             "license": "MIT"
         },
-        "node_modules/@types/dompurify": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
-            "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/trusted-types": "*"
-            }
-        },
         "node_modules/@types/estree": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",

             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
             "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-            "dev": true,
+            "license": "MIT",
-            "license": "MIT"
+            "optional": true
         },
         "node_modules/@types/write-file-atomic": {
             "version": "4.0.3",

+            }
         },
         "node_modules/dompurify": {
-            "version": "3.1.7",
+            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
+            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz",
-            "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==",
+            "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
-            "license": "(MPL-2.0 OR Apache-2.0)"
+            "license": "(MPL-2.0 OR Apache-2.0)",
+            "optionalDependencies": {
+                "@types/trusted-types": "^2.0.7"
+            }
         },
         "node_modules/domutils": {
             "version": "3.1.0",

             "license": "MIT"
         },
         "node_modules/is-docker": {
-            "version": "2.2.1",
+            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
             "license": "MIT",
             "bin": {
                 "is-docker": "cli.js"
             },
             "engines": {
-                "node": ">=8"
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"

                 "node": ">=8"
+            }
         },
+        "node_modules/is-wsl/node_modules/is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "license": "MIT",
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/isarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",

                 "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
+        "node_modules/open/node_modules/is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "license": "MIT",
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/openai": {
             "version": "4.17.4",
             "resolved": "https://registry.npmjs.org/openai/-/openai-4.17.4.tgz",

package.json+2 -2 Viewed

         "cors": "^2.8.5",
         "csrf-sync": "^4.0.3",
         "diff-match-patch": "^1.0.5",
-        "dompurify": "^3.1.7",
+        "dompurify": "^3.2.4",
         "droll": "^0.2.1",
         "express": "^4.21.0",
         "form-data": "^4.0.0",

         "ip-matching": "^2.1.2",
         "ip-regex": "^5.0.0",
         "ipaddr.js": "^2.0.1",
+        "is-docker": "^3.0.0",
         "jimp": "^0.22.10",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",

         "@types/cookie-session": "^2.0.49",
         "@types/cors": "^2.8.17",
         "@types/deno": "^2.0.0",
-        "@types/dompurify": "^3.0.5",
         "@types/express": "^4.17.21",
         "@types/jquery": "^3.5.29",
         "@types/jquery-cropper": "^1.0.4",

plugins.js+2 -2 Viewed

 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import { default as git } from 'simple-git';
+import { default as git, CheckRepoActions } from 'simple-git';
 import { color } from './src/util.js';
 const __dirname = import.meta.dirname ?? path.dirname(fileURLToPath(import.meta.url));

             const pluginPath = path.join(pluginsPath, directory);
             const pluginRepo = git(pluginPath);
-            const isRepo = await pluginRepo.checkIsRepo();
+            const isRepo = await pluginRepo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
             if (!isRepo) {
                 console.log(`Directory ${color.yellow(directory)} is not a Git repository`);
                 continue;

post-install.js+5 -0 Viewed

         newKey: 'extensions.models.textToSpeech',
         migrate: (value) => value,
     },
+    {
+        oldKey: 'minLogLevel',
+        newKey: 'logging.minLogLevel',
+        migrate: (value) => value,
+    },
 ];
 /**

public/global.d.ts+8 -0 Viewed

@@ -40,4 +40,12 @@ declare global {
40	searchInputCssClass?: string;	40	searchInputCssClass?: string;
41	}	41	}
42	}	42	}
		43
		44	/**
		45	* Translates a text to a target language using a translation provider.
		46	* @param text Text to translate
		47	* @param lang Target language
		48	* @param provider Translation provider
		49	*/
		50	async function translate(text: string, lang: string, provider: string = null): Promise<string>;
43	}	51	}

public/index.html+33 -17 Viewed

                                             </span>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="deepseek,openrouter">
+                                    <div class="range-block" data-source="deepseek,openrouter,custom">
                                         <label for="openai_show_thoughts" class="checkbox_label widthFreeExpand">
                                             <input id="openai_show_thoughts" type="checkbox" />
                                             <span>

                                         </div>
                                     </div>
                                     <div class="flex-container flexFlowColumn wide100p textAlignCenter marginTop10" data-source="openai,custom">
-                                        <div class="flex-container oneline-dropdown" title="Constrains effort on reasoning for reasoning models.&#10;Currently supported values are low, medium, and high.&#10;Reducing reasoning effort can result in faster responses and fewer tokens used on reasoning in a response.">
+                                        <div class="flex-container oneline-dropdown" title="Constrains effort on reasoning for reasoning models.&#10;Currently supported values are low, medium, and high.&#10;Reducing reasoning effort can result in faster responses and fewer tokens used on reasoning in a response." data-i18n="[title]Constrains effort on reasoning for reasoning models.">
                                             <label for="openai_reasoning_effort" data-i18n="Reasoning Effort">
                                                 Reasoning Effort
                                             </label>

                             </div>
                             <h4 data-i18n="Groq Model">Groq Model</h4>
                             <select id="model_groq_select">
-                                <optgroup label="Production Models">
+                                <optgroup label="Alibaba Cloud">
-                                    <option value="gemma2-9b-it">gemma2-9b-it</option>
+                                    <option value="qwen-2.5-32b">qwen-2.5-32b</option>
-                                    <option value="llama-3.3-70b-versatile">llama-3.3-70b-versatile</option>
+                                    <option value="qwen-2.5-coder-32b">qwen-2.5-coder-32b</option>
-                                    <option value="llama-3.1-8b-instant">llama-3.1-8b-instant</option>
-                                    <option value="llama3-70b-8192">llama3-70b-8192</option>
-                                    <option value="llama3-8b-8192">llama3-8b-8192</option>
-                                    <option value="mixtral-8x7b-32768">mixtral-8x7b-32768</option>
                                 </optgroup>
-                                <optgroup label="Preview Models">
+                                <optgroup label="DeepSeek / Alibaba Cloud">
+                                    <option value="deepseek-r1-distill-qwen-32b">deepseek-r1-distill-qwen-32b</option>
+                                </optgroup>
+                                <optgroup label="DeepSeek / Meta">
                                     <option value="deepseek-r1-distill-llama-70b">deepseek-r1-distill-llama-70b</option>
-                                    <option value="llama-3.3-70b-specdec">llama-3.3-70b-specdec</option>
+                                </optgroup>
+                                <optgroup label="Google">
+                                    <option value="gemma2-9b-it">gemma2-9b-it</option>
+                                </optgroup>
+                                <optgroup label="Meta">
+                                    <option value="llama-3.1-8b-instant">llama-3.1-8b-instant </option>
+                                    <option value="llama-3.2-11b-vision-preview">llama-3.2-11b-vision-preview </option>
                                     <option value="llama-3.2-1b-preview">llama-3.2-1b-preview </option>
                                     <option value="llama-3.2-3b-preview">llama-3.2-3b-preview </option>
-                                    <option value="llama-3.2-11b-vision-preview">llama-3.2-11b-vision-preview</option>
                                     <option value="llama-3.2-90b-vision-preview">llama-3.2-90b-vision-preview </option>
+                                    <option value="llama-3.3-70b-specdec">llama-3.3-70b-specdec </option>
+                                    <option value="llama-3.3-70b-versatile">llama-3.3-70b-versatile </option>
+                                    <option value="llama-guard-3-8b">llama-guard-3-8b </option>
+                                    <option value="llama3-70b-8192">llama3-70b-8192 </option>
+                                    <option value="llama3-8b-8192">llama3-8b-8192 </option>
+                                </optgroup>
+                                <optgroup label="Mistral AI">
+                                    <option value="mixtral-8x7b-32768">mixtral-8x7b-32768</option>
                                 </optgroup>
                             </select>
                         </div>

                                     <option value="sonar">sonar</option>
                                     <option value="sonar-pro">sonar-pro</option>
                                     <option value="sonar-reasoning">sonar-reasoning</option>
+                                    <option value="sonar-reasoning-pro">sonar-reasoning-pro</option>
+                                </optgroup>
+                                <optgroup label="Offline Models">
+                                    <option value="r1-1776">r1-1776</option>
                                 </optgroup>
                                 <optgroup label="Deprecated Models">
                                     <!-- These are scheduled for deprecation after 2/22/2025 -->

                                             <div class="alignitemscenter flex-container flexFlowColumn flexGrow flexShrink gap0 flexBasis48p" title="Cap the number of entry activation recursions" data-i18n="[title]Cap the number of entry activation recursions">
                                                 <small>
                                                     <span data-i18n="Max Recursion Steps">Max Recursion Steps</span>
-                                                    <div class="fa-solid fa-triangle-exclamation opacity50p" data-i18n="[title]0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\n(disabled when min activations are used)" title="0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc&#10;(disabled when min activations are used)"></div>
+                                                    <div class="fa-solid fa-triangle-exclamation opacity50p" data-i18n="[title]0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc" title="0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc&#10;(disabled when min activations are used)"></div>
                                                 </small>
                                                 <input class="neo-range-slider" type="range" id="world_info_max_recursion_steps" name="world_info_max_recursion_steps" min="0" max="10" step="1">
                                                 <input class="neo-range-input" type="number" min="0" max="10" step="1" data-for="world_info_max_recursion_steps" id="world_info_max_recursion_steps_counter">

                                 <input id="prefer_character_jailbreak" type="checkbox" />
                                 <small data-i18n="Prefer Character Card Instructions">Prefer Char. Instructions</small>
                             </label>
-                            <label class="checkbox_label" for="never_resize_avatars" title="Avoid cropping and resizing imported character images. When off, crop/resize to 512x768." data-i18n="[title]Avoid cropping and resizing imported character images. When off, crop/resize to 512x768">
+                            <label class="checkbox_label" for="never_resize_avatars" title="Avoid cropping and resizing imported character images. When off, crop/resize to 512x768.&#10;This will disable the upload cropping popup for avatars." data-i18n="[title]never_resize_avatars_tooltip">
                                 <input id="never_resize_avatars" type="checkbox" />
                                 <small data-i18n="Never resize avatars">Never resize avatars</small>
                             </label>

                                             <small data-i18n="Enabled">Enabled</small>
                                         </label>
                                         <small data-i18n="Minimum generated message length">Minimum generated message length</small>
-                                        <input id="auto_swipe_minimum_length" name="auto_swipe_minimum_length" type="number" min="0" step="1" value="0" class="text_pole" title="If the generated message is shorter than this, trigger an auto-swipe." data-i18n="[title]If the generated message is shorter than this, trigger an auto-swipe">
+                                        <input id="auto_swipe_minimum_length" name="auto_swipe_minimum_length" type="number" min="0" step="1" value="0" class="text_pole" title="If the generated message is shorter than these many characters, trigger an auto-swipe." data-i18n="[title]If the generated message is shorter than these many characters, trigger an auto-swipe">
                                         <small data-i18n="Blacklisted words">Blacklisted words</small>
                                         <div class="auto_swipe">
                                             <textarea id="auto_swipe_blacklist" name="auto_swipe_blacklist" data-i18n="[placeholder]words you dont want generated separated by comma ','" placeholder="words you don't want generated separated by comma ','" class="text_pole textarea_compact" value="" autocomplete="off" rows="3"></textarea>

         </div>
         <div id="form_sheld">
             <div id="dialogue_del_mes">
-                <div id="dialogue_del_mes_ok" class="menu_button">Delete</div>
+                <div id="dialogue_del_mes_ok" data-i18n="Delete" class="menu_button">Delete</div>
-                <div id="dialogue_del_mes_cancel" class="menu_button">Cancel</div>
+                <div id="dialogue_del_mes_cancel" data-i18n="Cancel" class="menu_button">Cancel</div>
             </div>
             <div id="send_form" class="no-connection">
                 <form id="file_form" class="wide100p displayNone">

public/lib/eventemitter.js+42 -1 Viewed

 /* Polyfill EventEmitter. */
-var EventEmitter = function () {
+/**
+ * Creates an event emitter.
+ * @param {string[]} autoFireAfterEmit Auto-fire event names
+ */
+var EventEmitter = function (autoFireAfterEmit = []) {
     this.events = {};
+    this.autoFireLastArgs = new Map();
+    this.autoFireAfterEmit = new Set(autoFireAfterEmit);
 };
+/**
+ * Adds a listener to an event.
+ * @param {string} event Event name
+ * @param {function} listener Event listener
+ * @returns
+ */
 EventEmitter.prototype.on = function (event, listener) {
     // Unknown event used by external libraries?
     if (event === undefined) {

+    }
     this.events[event].push(listener);
+    if (this.autoFireAfterEmit.has(event) && this.autoFireLastArgs.has(event)) {
+        listener.apply(this, this.autoFireLastArgs.get(event));
+    }
 };
 /**

@@ -60,6 +76,10 @@ EventEmitter.prototype.makeLast = function (event, listener) {
60	}	76	}
61		77
62	events.push(listener);	78	events.push(listener);
		79
		80	if (this.autoFireAfterEmit.has(event) && this.autoFireLastArgs.has(event)) {
		81	listener.apply(this, this.autoFireLastArgs.get(event));
		82	}
63	}	83	}
64		84
65	/**	85	/**

+    }
     events.unshift(listener);
+    if (this.autoFireAfterEmit.has(event) && this.autoFireLastArgs.has(event)) {
+        listener.apply(this, this.autoFireLastArgs.get(event));
+    }
+}
+/**
+ * Removes a listener from an event.
+ * @param {string} event Event name
+ * @param {function} listener Event listener
+ */
 EventEmitter.prototype.removeListener = function (event, listener) {
     var idx;

+    }
 };
+/**
+ * Emits an event with optional arguments.
+ * @param {string} event Event name
+ */
 EventEmitter.prototype.emit = async function (event) {
     let args = [].slice.call(arguments, 1);
     if (localStorage.getItem('eventTracing') === 'true') {

@@ -118,6 +151,10 @@ EventEmitter.prototype.emit = async function (event) {
118	}	151	}
119	}	152	}
120	}	153	}
		154
		155	if (this.autoFireAfterEmit.has(event)) {
		156	this.autoFireLastArgs.set(event, args);
		157	}
121	};	158	};
122		159
123	EventEmitter.prototype.emitAndWait = function (event) {	160	EventEmitter.prototype.emitAndWait = function (event) {

@@ -144,6 +181,10 @@ EventEmitter.prototype.emitAndWait = function (event) {
144	}	181	}
145	}	182	}
146	}	183	}
		184
		185	if (this.autoFireAfterEmit.has(event)) {
		186	this.autoFireLastArgs.set(event, args);
		187	}
147	};	188	};
148		189
149	EventEmitter.prototype.once = function (event, listener) {	190	EventEmitter.prototype.once = function (event, listener) {

public/locales/ar-sa.json+2 -2 Viewed

     "Prefer Character Card Prompt": "تفضيل التعليمات من بطاقة الشخصية",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "إذا تم التحقق وكانت بطاقة الشخصية تحتوي على تجاوز للكسر (تعليمات تاريخ المشاركة)، استخدم ذلك بدلاً من ذلك",
     "Prefer Character Card Jailbreak": "تفضيل كسر الحصار من بطاقة الشخصية",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "تجنب اقتصاص صور الأحرف المستوردة وتغيير حجمها. عند إيقاف التشغيل، قم بالقص/تغيير الحجم إلى 512 × 768.",
+    "never_resize_avatars_tooltip": "تجنب اقتصاص صور الأحرف المستوردة وتغيير حجمها. عند إيقاف التشغيل، قم بالقص/تغيير الحجم إلى 512 × 768.",
     "Never resize avatars": "لا تغيير حجم الصور الرمزية أبدًا",
     "Show actual file names on the disk, in the characters list display only": "عرض الأسماء الفعلية للملفات على القرص، في عرض قائمة الشخصيات فقط",
     "Show avatar filenames": "عرض أسماء ملفات الصور الرمزية",

     "Auto-swipe": "السحب التلقائي",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "تمكين وظيفة السحب التلقائي. الإعدادات في هذا القسم تؤثر فقط عند تمكين السحب التلقائي",
     "Minimum generated message length": "الحد الأدنى لطول الرسالة المولدة",
-    "If the generated message is shorter than this, trigger an auto-swipe": "إذا كانت الرسالة المولدة أقصر من هذا، فتحريض السحب التلقائي",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "إذا كانت الرسالة المولدة أقصر من هذا، فتحريض السحب التلقائي",
     "Blacklisted words": "الكلمات الممنوعة",
     "words you dont want generated separated by comma ','": "الكلمات التي لا تريد توليدها مفصولة بفاصلة ','",
     "Blacklisted word count to swipe": "عدد الكلمات الممنوعة للسحب",

public/locales/de-de.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Bevorzuge Charakterkarten-Prompt",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Wenn aktiviert und die Charakterkarte eine Jailbreak-Überschreibung enthält (Post-History-Instruction), verwende stattdessen diese",
     "Prefer Character Card Jailbreak": "Bevorzuge Charakterkarten-Jailbreak",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Vermeiden Sie das Zuschneiden und Ändern der Größe importierter Zeichenbilder. Wenn deaktiviert, wird die Größe auf 512 x 768 zugeschnitten/angepasst.",
+    "never_resize_avatars_tooltip": "Vermeiden Sie das Zuschneiden und Ändern der Größe importierter Zeichenbilder. Wenn deaktiviert, wird die Größe auf 512 x 768 zugeschnitten/angepasst.",
     "Never resize avatars": "Avatare niemals verkleinern",
     "Show actual file names on the disk, in the characters list display only": "Zeige tatsächliche Dateinamen auf der Festplatte, nur in der Anzeige der Charakterliste",
     "Show avatar filenames": "Avatar-Dateinamen anzeigen",

     "Auto-swipe": "Automatisches Wischen",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Aktiviere die Auto-Wisch-Funktion. Einstellungen in diesem Abschnitt haben nur dann Auswirkungen, wenn das automatische Wischen aktiviert ist",
     "Minimum generated message length": "Minimale generierte Nachrichtenlänge",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Wenn die generierte Nachricht kürzer ist als diese, löse automatisches Wischen aus",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Wenn die generierte Nachricht kürzer ist als diese, löse automatisches Wischen aus",
     "Blacklisted words": "Verbotene Wörter",
     "words you dont want generated separated by comma ','": "Wörter, die du nicht generiert haben möchtest, durch Komma ',' getrennt",
     "Blacklisted word count to swipe": "Anzahl der verbotenen Wörter, um zu wischen",

public/locales/es-es.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Preferir Indicaciones en Tarjeta de Personaje",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Si está marcado y la tarjeta de personaje contiene una anulación de jailbreak (Instrucciones Post Historial), usar eso en su lugar",
     "Prefer Character Card Jailbreak": "Preferir Jailbreak en Tarjeta de Personaje",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Evite recortar y cambiar el tamaño de las imágenes de personajes importados. Cuando esté desactivado, recorte/cambie el tamaño a 512x768.",
+    "never_resize_avatars_tooltip": "Evite recortar y cambiar el tamaño de las imágenes de personajes importados. Cuando esté desactivado, recorte/cambie el tamaño a 512x768.",
     "Never resize avatars": "Nunca redimensionar avatares",
     "Show actual file names on the disk, in the characters list display only": "Mostrar nombres de archivo reales en el disco, solo en la visualización de la lista de personajes",
     "Show avatar filenames": "Mostrar nombres de archivo de avatares",

     "Auto-swipe": "Deslizamiento automático",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Habilitar la función de deslizamiento automático. La configuración en esta sección solo tiene efecto cuando el deslizamiento automático está habilitado",
     "Minimum generated message length": "Longitud mínima del mensaje generado",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Si el mensaje generado es más corto que esto, activar un deslizamiento automático",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Si el mensaje generado es más corto que esto, activar un deslizamiento automático",
     "Blacklisted words": "Palabras prohibidas",
     "words you dont want generated separated by comma ','": "palabras que no desea generar separadas por coma ','",
     "Blacklisted word count to swipe": "Número de palabras prohibidas para deslizar",

public/locales/fr-fr.json+3 -4 Viewed

     "Advanced Character Search": "Recherche de personnage avancée",
     "If checked and the character card contains a prompt override (System Prompt), use that instead": "Si cochée et si la carte de personnage contient un prompt de remplacement (prompt système), l'utiliser à la place",
     "Prefer Character Card Prompt": "Préférer le prompt du personnage",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Évitez de recadrer et de redimensionner les images de personnages importés. Lorsqu'il est désactivé, recadrez/redimensionnez à 512 x 768.",
+    "never_resize_avatars_tooltip": "Évitez de recadrer et de redimensionner les images de personnages importés. Lorsqu'il est désactivé, recadrez/redimensionnez à 512 x 768.",
     "Never resize avatars": "Ne jamais redimensionner les avatars",
     "Show actual file names on the disk, in the characters list display only": "Afficher les noms de fichier réels sur le disque, dans l'affichage de la liste de personnages uniquement",
     "Show avatar filenames": "Afficher les noms de fichier des avatars",

     "Auto-swipe": "Balayage automatique",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Activer la fonction de balayage automatique. Les paramètres de cette section n'ont d'effet que lorsque le balayage automatique est activé",
     "Minimum generated message length": "Longueur minimale du message généré",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Si le message généré est plus court que cela, déclenchez un balayage automatique",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Si le message généré est plus court que cela, déclenchez un balayage automatique",
     "Blacklisted words": "Mots en liste noire",
     "words you dont want generated separated by comma ','": "mots que vous ne voulez pas générer séparés par des virgules ','",
     "Blacklisted word count to swipe": "Nombre de mots en liste noire pour balayer",

     "(disabled when max recursion steps are used)": "(désactivé lorsque le nombre maximum de pas de récursivité est utilisé)",
     "Cap the number of entry activation recursions": "Plafonner le nombre de récursions d'activation d'entrée",
     "Max Recursion Steps": "Nombre maximal d'étapes de récursivité",
-    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\\n(disabled when min activations are used)": "0 = illimité, 1 = scanne une fois et ne récure pas, 2 = scanne une fois et récure une fois, etc.\n(désactivé lorsque des activations minimales sont utilisées)",
+    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc": "0 = illimité, 1 = scanne une fois et ne récure pas, 2 = scanne une fois et récure une fois, etc.\n(désactivé lorsque des activations minimales sont utilisées)",
     "Include names with each message into the context for scanning": "Inclure les noms dans chaque message dans le contexte pour l'analyse.",
     "Apply current sorting as Order": "Appliquer le tri actuel comme ordre",
     "Display swipe numbers for all messages, not just the last.": "Afficher le nombre de balayage sur tous les messages, et pas seulement le dernier.",

     "Character Expressions": "Expressions de personnages",
     "Translate text to English before classification": "Traduire le texte en anglais avant de le classer",
     "Show default images (emojis) if sprite missing": "Afficher les images par défaut (emojis) si le sprite est manquant",
-    "Image Type - talkinghead (extras)": "Type d'image - talkinghead (extras)",
     "Classifier API": "API de classification",
     "Select the API for classifying expressions.": "Sélectionnez l'API pour classer les expressions.",
     "Main API": "API principale",

public/locales/is-is.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Kosstu kvenkortu fyrirspurn",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Ef merkt er og kortið inniheldur fangabrotsskil, notaðu það í staðinn",
     "Prefer Character Card Jailbreak": "Kosstu kvenkortu fangabrot",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Forðastu að klippa og breyta stærð innfluttra stafamynda. Þegar slökkt er á því skaltu skera/breyta stærð í 512x768.",
+    "never_resize_avatars_tooltip": "Forðastu að klippa og breyta stærð innfluttra stafamynda. Þegar slökkt er á því skaltu skera/breyta stærð í 512x768.",
     "Never resize avatars": "Aldrei breyta stærðinni á merkjum",
     "Show actual file names on the disk, in the characters list display only": "Sýna raunveruleg nöfn skráa á diskinum, í lista yfir persónur sýna aðeins",
     "Show avatar filenames": "Sýna nöfn merkja",

     "Auto-swipe": "Sjálfvirkur sveip",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Virkjaðu sjálfvirka sveiflugerð. Stillingar í þessum hluta hafa aðeins áhrif þegar sjálfvirkur sveiflugerð er virk",
     "Minimum generated message length": "Lágmarks lengd á mynduðum skilaboðum",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Ef mynduðu skilaboðin eru styttri en þessi, kallaðu fram sjálfvirkar sveiflugerðar",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Ef mynduðu skilaboðin eru styttri en þessi, kallaðu fram sjálfvirkar sveiflugerðar",
     "Blacklisted words": "Svört orð",
     "words you dont want generated separated by comma ','": "orð sem þú vilt ekki að framleiða aðskilin með kommu ','",
     "Blacklisted word count to swipe": "Fjöldi svörtra orða til að sveipa",

public/locales/it-it.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Preferisci Prompt della Scheda Personaggio",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Se selezionato e la scheda del personaggio contiene una sovrascrittura jailbreak (Istruzione Storico Post), usalo invece",
     "Prefer Character Card Jailbreak": "Preferisci Jailbreak della Scheda Personaggio",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Evita di ritagliare e ridimensionare le immagini dei personaggi importati. Quando è disattivato, ritaglia/ridimensiona a 512x768.",
+    "never_resize_avatars_tooltip": "Evita di ritagliare e ridimensionare le immagini dei personaggi importati. Quando è disattivato, ritaglia/ridimensiona a 512x768.",
     "Never resize avatars": "Non ridimensionare mai gli avatar",
     "Show actual file names on the disk, in the characters list display only": "Mostra i nomi file effettivi sul disco, solo nella visualizzazione dell'elenco dei personaggi",
     "Show avatar filenames": "Mostra nomi file avatar",

     "Auto-swipe": "Auto-swipe",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Abilita la funzione di auto-swipe. Le impostazioni in questa sezione hanno effetto solo quando l'auto-swipe è abilitato",
     "Minimum generated message length": "Lunghezza minima del messaggio generato",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Se il messaggio generato è più breve di questo, attiva un'automatica rimozione",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Se il messaggio generato è più breve di questo, attiva un'automatica rimozione",
     "Blacklisted words": "Parole in blacklist",
     "words you dont want generated separated by comma ','": "parole che non vuoi generate separate da virgola ','",
     "Blacklisted word count to swipe": "Numero di parole in blacklist per attivare un'automatica rimozione",

public/locales/ja-jp.json+2 -2 Viewed

     "Prefer Character Card Prompt": "キャラクターカードのプロンプトを優先",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "チェックされていてキャラクターカードにジェイルブレイクオーバーライド（投稿履歴指示）が含まれている場合、それを代わりに使用します",
     "Prefer Character Card Jailbreak": "キャラクターカードのJailbreakを優先",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "インポートした文字画像の切り取りやサイズ変更を避けます。オフにすると、512x768 に切り取り/サイズ変更されます。",
+    "never_resize_avatars_tooltip": "インポートした文字画像の切り取りやサイズ変更を避けます。オフにすると、512x768 に切り取り/サイズ変更されます。",
     "Never resize avatars": "アバターを常にリサイズしない",
     "Show actual file names on the disk, in the characters list display only": "ディスク上の実際のファイル名を表示します。キャラクターリストの表示にのみ",
     "Show avatar filenames": "アバターのファイル名を表示",

     "Auto-swipe": "オートスワイプ",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "自動スワイプ機能を有効にします。このセクションの設定は、自動スワイプが有効になっている場合にのみ効果があります",
     "Minimum generated message length": "生成されたメッセージの最小長",
-    "If the generated message is shorter than this, trigger an auto-swipe": "生成されたメッセージがこれよりも短い場合、自動スワイプをトリガーします",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "生成されたメッセージがこれよりも短い場合、自動スワイプをトリガーします",
     "Blacklisted words": "ブラックリストされた単語",
     "words you dont want generated separated by comma ','": "コンマ ',' で区切られた生成したくない単語",
     "Blacklisted word count to swipe": "スワイプするブラックリストされた単語の数",

public/locales/ko-kr.json+2 -3 Viewed

     "Prefer Character Card Prompt": "캐릭터 카드 프롬프트 선호",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "선택되어 있고 캐릭터 카드에 (Post-History 지시)탈옥 재정의가 포함 된 경우, 그것을 대신 사용합니다.",
     "Prefer Character Card Jailbreak": "캐릭터 카드 탈옥 선호",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "가져온 캐릭터 이미지를 자르거나 크기를 조정하지 마세요. 꺼져 있으면 512x768로 자르거나 크기를 조정합니다.",
+    "never_resize_avatars_tooltip": "가져온 캐릭터 이미지를 자르거나 크기를 조정하지 마세요. 꺼져 있으면 512x768로 자르거나 크기를 조정합니다.",
     "Never resize avatars": "아바타 크기 변경하지 않음",
     "Show actual file names on the disk, in the characters list display only": "실제 파일 이름을 디스크에 표시하며 캐릭터 목록 디스플레이에만",
     "Show avatar filenames": "아바타 파일 이름 표시",

     "Auto-swipe": "자동 스와이프",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "자동 스와이프 기능을 활성화합니다. 이 섹션의 설정은 자동 스와이프가 활성화되었을 때만 영향을 미칩니다",
     "Minimum generated message length": "생성된 메시지 최소 길이",
-    "If the generated message is shorter than this, trigger an auto-swipe": "생성된 메시지가이보다 짧으면 자동 스와이프를 트리거합니다",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "생성된 메시지가이보다 짧으면 자동 스와이프를 트리거합니다",
     "Blacklisted words": "금지어",
     "words you dont want generated separated by comma ','": "쉼표로 구분된 생성하지 않으려는 단어",
     "Blacklisted word count to swipe": "스와이프할 금지어 개수",

     "menu within": "내의 메뉴",
     "Translate text to English before classification": "분류 전에 텍스트를 영어로 번역합니다.",
     "Show default images (emojis) if sprite missing": "해당하는 스프라이트가 없으면 기본 이미지 (이모지들)을 표시합니다.",
-    "Image Type - talkinghead (extras)": "이미지 유형 - 토킹 헤드 (부가 사항)",
     "Classifier API": "분류를 위한 API",
     "Select the API for classifying expressions.": "감정 이미지들을 분류할 API를 선택하세요.",
     "Local": "로컬",

public/locales/nl-nl.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Voorkeur karakterkaart prompt",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Als aangevinkt en de karakterkaart bevat een jailbreak-override (Post History Instruction), gebruik die in plaats daarvan",
     "Prefer Character Card Jailbreak": "Voorkeur karakterkaart jailbreak",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Vermijd het bijsnijden en vergroten/verkleinen van geïmporteerde karakterafbeeldingen. Indien uitgeschakeld, bijsnijden/formaat wijzigen naar 512 x 768.",
+    "never_resize_avatars_tooltip": "Vermijd het bijsnijden en vergroten/verkleinen van geïmporteerde karakterafbeeldingen. Indien uitgeschakeld, bijsnijden/formaat wijzigen naar 512 x 768.",
     "Never resize avatars": "Avatars nooit verkleinen",
     "Show actual file names on the disk, in the characters list display only": "Toon de werkelijke bestandsnamen op de schijf, alleen in de weergave van de lijst met personages",
     "Show avatar filenames": "Toon avatar bestandsnamen",

     "Auto-swipe": "Automatisch vegen",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Schakel de automatische-vegen functie in. Instellingen in dit gedeelte hebben alleen effect wanneer automatisch vegen is ingeschakeld",
     "Minimum generated message length": "Minimale gegenereerde berichtlengte",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Als het gegenereerde bericht korter is dan dit, activeer dan een automatische veeg",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Als het gegenereerde bericht korter is dan dit, activeer dan een automatische veeg",
     "Blacklisted words": "Verboden woorden",
     "words you dont want generated separated by comma ','": "woorden die je niet gegenereerd wilt hebben gescheiden door komma ','",
     "Blacklisted word count to swipe": "Aantal verboden woorden om te vegen",

public/locales/pt-pt.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Preferir Prompt do Cartão de Personagem",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Se marcado e o cartão de personagem contiver uma substituição de jailbreak (Instrução de Histórico de Postagens), use isso em vez disso",
     "Prefer Character Card Jailbreak": "Preferir Jailbreak do Cartão de Personagem",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Evite cortar e redimensionar imagens de personagens importados. Quando desativado, corte/redimensione para 512x768.",
+    "never_resize_avatars_tooltip": "Evite cortar e redimensionar imagens de personagens importados. Quando desativado, corte/redimensione para 512x768.",
     "Never resize avatars": "Nunca redimensionar avatares",
     "Show actual file names on the disk, in the characters list display only": "Mostrar nomes de arquivo reais no disco, apenas na exibição da lista de personagens",
     "Show avatar filenames": "Mostrar nomes de arquivo de avatar",

     "Auto-swipe": "Auto-swipe",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Ativar a função de auto-swipe. As configurações nesta seção só têm efeito quando o auto-swipe está ativado",
     "Minimum generated message length": "Comprimento mínimo da mensagem gerada",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Se a mensagem gerada for mais curta que isso, acione um auto-swipe",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Se a mensagem gerada for mais curta que isso, acione um auto-swipe",
     "Blacklisted words": "Palavras proibidas",
     "words you dont want generated separated by comma ','": "palavras que você não quer geradas separadas por vírgula ','",
     "Blacklisted word count to swipe": "Contagem de palavras proibidas para swipe",

public/locales/ru-ru.json+74 -14 Viewed

     "Yes": "Да",
     "No": "Нет",
     "Context %": "Процент контекста",
-    "Budget Cap": "Бюджетный лимит",
+    "Budget Cap": "Лимит бюджета",
     "(0 = disabled)": "(0 = отключено)",
     "None": "Отсутствует",
     "User Settings": "Настройки пользователя",

     "Requests logprobs from the API for the Token Probabilities feature": "Запросить логпробы из API для функции Token Probabilities.",
     "Automatically reject and re-generate AI message based on configurable criteria": "Автоматическое отклонение и повторная генерация сообщений AI на основе настраиваемых критериев.",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Включить авто-свайп. Настройки в этом разделе действуют только при включенном авто-свайпе.",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Если сгенерированное сообщение короче этого значения, срабатывает авто-свайп.",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Если сгенерированное сообщение короче этого значения, срабатывает авто-свайп.",
     "Reload and redraw the currently open chat": "Перезагрузить и перерисовать открытый в данный момент чат.",
     "Auto-Expand Message Actions": "Развернуть действия",
     "Persona Management": "Управление персоной",

     "Characters sorting order": "Порядок сортировки персонажей",
     "Remove": "Убрать",
     "Select a World Info file for": "Выбрать файл с миром для",
-    "Primary Lorebook": "Основного лорбука",
+    "Primary Lorebook": "Основной лорбук",
-    "A selected World Info will be bound to this character as its own Lorebook.": "Информация о мире будет привязана к персонажу как его собственный лорбук",
+    "A selected World Info will be bound to this character as its own Lorebook.": "Информация о мире будет привязана к персонажу как его собственный лорбук.",
-    "When generating an AI reply, it will be combined with the entries from a global World Info selector.": "Когда ИИ генерирует ответ, он будет совмещён с записями из глобально выбранного мира",
+    "When generating an AI reply, it will be combined with the entries from a global World Info selector.": "Когда ИИ генерирует ответ, он будет совмещён с записями из глобально выбранного мира.",
-    "Exporting a character would also export the selected Lorebook file embedded in the JSON data.": "При экспорте персонажа вместе с ним также выгрузится выбранный лорбук в виде JSON",
+    "Exporting a character would also export the selected Lorebook file embedded in the JSON data.": "При экспорте персонажа вместе с ним также выгрузится выбранный лорбук в виде JSON.",
     "Additional Lorebooks": "Вспомогательные лорбуки",
     "Associate one or more auxillary Lorebooks with this character.": "Привязать к этому персонажу один или больше вспомогательных лорбуков",
     "NOTE: These choices are optional and won't be preserved on character export!": "ВНИМАНИЕ: эти выборы необязательные и не будут сохранены при экспорте персонажа!",

     "Prompt": "Промпт",
     "Copy": "Скопировать",
     "Confirm": "Подтвердить",
-    "Copy this message": "Скопировать сообщение",
+    "Copy this message": "Продублировать сообщение",
     "Delete this message": "Удалить сообщение",
     "Move message up": "Переместить сообщение вверх",
     "Move message down": "Переместить сообщение вниз",

     "Ask AI to write your message for you": "Попросить ИИ написать сообщение за вас",
     "Continue the last message": "Продолжить текущее сообщение",
     "Bind user name to that avatar": "Закрепить имя за этим аватаром",
-    "Select this as default persona for the new chats.": "Выберать эту Персону в качестве персоны по умолчанию для новых чатов.",
+    "Select this as default persona for the new chats.": "Выбирать эту персону по умолчанию для всех новых чатов.",
     "Change persona image": "Сменить аватар персоны",
     "Delete persona": "Удалить персону",
     "Reduced Motion": "Сокращение анимаций",

     "Token Probabilities": "Вероятности токенов",
     "Close chat": "Закрыть чат",
     "Manage chat files": "Все чаты",
-    "Import Extension From Git Repo": "Импортировать расширение из Git Repository",
+    "Import Extension From Git Repo": "Импортировать расширение из Git-репозитория.",
     "Install extension": "Установить расширение",
     "Manage extensions": "Управление расширениями",
     "Tokens persona description": "Токенов",

     "Set your custom avatar.": "Установить аватарку",
     "Remove your custom avatar.": "Сбросить аватарку",
     "Make a Snapshot": "Сделать снимок",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Не менять размер картинок у импортируемых персонажей. При отключении все картинки будут приводиться к размеру 512х768",
+    "never_resize_avatars_tooltip": "Не менять размер картинок у импортируемых персонажей. При отключении все картинки будут приводиться к размеру 512х768",
     "Char List Subheader": "Доп. заголовок в списке персонажей",
     "# Messages to Load": "Сколько сообщений загружать",
     "(0 = All)": "(0 = все)",

     "help_hotkeys_0": "Горячие клавиши",
     "You can browse a list of bundled characters in the": "Комплектных персонажей можно найти в меню",
     "Download Extensions & Assets": "Загрузить расширения и ресурсы",
-    "menu within": "внутри этих кубиков",
+    "menu within": "в меню",
     "Assets URL": "URL с описанием ресурсов",
     "Custom (OpenAI-compatible)": "Кастомный (совместимый с OpenAI)",
     "Custom Endpoint (Base URL)": "Кастомный эндпоинт (базовый URL)",

     "and connect to an": "и подключитесь к",
     "You can add more": "Можете добавить больше",
     "from other websites": "с других сайтов.",
-    "Go to the": "Загляните в",
+    "Go to the": "Заходите в",
     "to install additional features.": ", чтобы установить разные дополнительные ресурсы.",
     "or_welcome": "; также доступен",
     "Claude API Key": "Ключ от API Claude",

     "Save": "Сохранить",
     "Chat Lorebook": "Лорбук для чата",
     "chat_world_template_txt": "Выбранный мир будет привязан к этому чату. Будет добавляться в промпт наряду с глобальным лорбуком и лором персонажа.",
-    "world_button_title": "Лор персонажа\n\nНажмите, чтобы загрузить\nShift + клик, чтобы открыть диалог привязки мира",
+    "world_button_title": "Лор персонажа\n\nНажмите, чтобы загрузить\nShift + ЛКМ, чтобы открыть диалог привязки мира",
     "No auxillary Lorebooks set. Click here to select.": "Вспомогательный лорбук не выбран. Нажмите, чтобы выбрать.",
     "ext_regex_user_input_desc": "Отправленные вами сообщения.",
     "ext_regex_ai_input_desc": "Полученные от API ответы.",

     "Not connected to the API!": "Нет соединения с API!",
     "ext_type_system": "Это комплектное расширение. Его нельзя удалить, а обновляется оно вместе со всей системой.",
     "Update all": "Обновить все",
-    "Close": "Закрыть"
+    "Close": "Закрыть",
+    "Optional modules:": "Необязательные модули:",
+    "Sort: Display Name": "Сортировать: по названию",
+    "Sort: Loading Order": "Сортировать: в порядке загрузки",
+    "Click to toggle": "Нажмите, чтобы включить или выключить",
+    "Loading Asset List": "Загрузить список ресурсов",
+    "Don't ask again for this URL": "Запомнить выбор для этого адреса",
+    "Are you sure you want to connect to the following url?": "Вы точно хотите подключиться к этому адресу?",
+    "All": "Всё",
+    "Characters": "Персонажи",
+    "Ambient sounds": "Звуковой эмбиент",
+    "Blip sounds": "Звуки уведомлений",
+    "Background music": "Фоновая музыка",
+    "Search": "Поиск",
+    "extension_install_1": "Чтобы загружать расширения из этого списка, у вас должен быть установлен ",
+    "extension_install_2": ".",
+    "extension_install_3": "Нажмите на иконку ",
+    "extension_install_4": ", чтобы перейти в репозиторий расширения и получить более подробную информацию о нём.",
+    "Extension repo/guide:": "Репозиторий расширения:",
+    "Preview in browser": "Предпросмотр",
+    "Adds a function tool": "Частично или полностью работает через вызов функций",
+    "Tool": "Функции",
+    "Move extension": "Переместить расширение",
+    "ext_type_local": "Это локальное расширение, доступно только вам",
+    "ext_type_global": "Это глобальное расширение, доступно всем пользователям",
+    "Move": "Переместить",
+    "Enter the Git URL of the extension to install": "Введите Git-адрес расширения",
+    "Please be aware that using external extensions can have unintended side effects and may pose security risks. Always make sure you trust the source before importing an extension. We are not responsible for any damage caused by third-party extensions.": "помните, что используя расширения от сторонних авторов, вы можете подвергать систему опасности. Устанавливайте расширения только от проверенных разработчиков. Мы не несём ответственности за любой ущерб, причинённый сторонними расширениями.",
+    "Disclaimer:": "Внимание:",
+    "Example:": "Пример:",
+    "context_derived": "Считывать из метаданных модели (по возможности)",
+    "instruct_derived": "Считывать из метаданных модели (по возможности)",
+    "Confirm token parsing with": "Чтобы убедиться в правильности выделения токенов, используйте",
+    "Reasoning Effort": "Рассуждения",
+    "Constrains effort on reasoning for reasoning models.": "Регулирует объём внутренних рассуждений модели (reasoning), для моделей которые поддерживают эту возможность.\nНа данный момент поддерживаются три значения: Подробные, Обычные, Поверхностные.\nПри менее подробном рассуждении ответ получается быстрее, а также экономятся токены, уходящие на рассуждения.",
+    "openai_reasoning_effort_low": "Поверхностные",
+    "openai_reasoning_effort_medium": "Обычные",
+    "openai_reasoning_effort_high": "Подробные",
+    "Persona Lore Alt+Click to open the lorebook": "Лорбук данной персоны\nAlt + ЛКМ чтобы открыть лорбук",
+    "Persona Lorebook for": "Лорбук для персоны",
+    "persona_world_template_txt": "Выбранная Информация о мире будет привязана к этой персоне. Информация будет добавляться в каждом промпте вместе с глобальным лорбуком и лорбуками персонажа и чата.",
+    "Global list": "Глобальный список",
+    "Preset-specific list": "Список для данного пресета",
+    "Banned tokens/strings are being sent in the request.": "Запрещённые токены и строки отсылаются в запросе.",
+    "Banned tokens/strings are NOT being sent in the request.": "Запрещённые токены и строки НЕ отсылаются в запросе.",
+    "Add a reasoning block": "Добавить блок рассуждений",
+    "Create a copy of this message?": "Продублировать это сообщение?",
+    "Max Recursion Steps": "Макс. глубина рекурсии",
+    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc": "0 = неограничено, 1 = сканировать единожды, 2 = сканировать единожды и сделать один повторный проход, и т.д.\n(неактивно при указанном мин. числе активаций)",
+    "(disabled when max recursion steps are used)": "(неактивно при указанной макс. глубине рекурсии)",
+    "Enter a valid API URL": "Введите корректный адрес API",
+    "No Ollama model selected.": "Не выбрана модель Ollama",
+    "Background Fitting": "Способ подгонки фона под разрешение",
+    "Chat Lore Alt+Click to open the lorebook": "Лорбук данного чата\nAlt + ЛКМ чтобы открыть лорбук",
+    "Token Counter": "Подсчитать токены",
+    "Type / paste in the box below to see the number of tokens in the text.": "Введите или вставьте текст в окошко ниже, чтобы подсчитать количество токенов в нём.",
+    "Selected tokenizer:": "Выбранный токенайзер:",
+    "Input:": "Входные данные:",
+    "Tokenized text:": "Токенизированный текст:",
+    "Token IDs:": "Идентификаторы токенов:",
+    "Tokens:": "Токенов:"
+}

public/locales/uk-ua.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Перевага запиту персонажа",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Якщо відмічено і картка персонажа містить заміну джейлбрейку (Інструкцію), використовуйте її замість цього",
     "Prefer Character Card Jailbreak": "Перевага джейлбрейку персонажа",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Уникайте обрізання та зміни розміру імпортованих зображень символів. Коли вимкнено, обрізати/змінити розмір до 512x768.",
+    "never_resize_avatars_tooltip": "Уникайте обрізання та зміни розміру імпортованих зображень символів. Коли вимкнено, обрізати/змінити розмір до 512x768.",
     "Never resize avatars": "Ніколи не змінювати розмір аватарів",
     "Show actual file names on the disk, in the characters list display only": "Показувати фактичні назви файлів на диску, тільки у відображенні списку персонажів",
     "Show avatar filenames": "Показувати імена файлів аватарів",

     "Auto-swipe": "Автоматичний змах",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Вмикає функцію автоматичного змаху. Налаштування в цьому розділі діють лише тоді, коли увімкнено автоматичний змах",
     "Minimum generated message length": "Мінімальна довжина згенерованого повідомлення",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Якщо згенероване повідомлення коротше за це, викликайте автоматичний змаху",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Якщо згенероване повідомлення коротше за це, викликайте автоматичний змаху",
     "Blacklisted words": "Список заборонених слів",
     "words you dont want generated separated by comma ','": "слова, які ви не хочете генерувати, розділені комою ','",
     "Blacklisted word count to swipe": "Кількість заборонених слів для змаху",

public/locales/vi-vn.json+2 -2 Viewed

     "Prefer Character Card Prompt": "Ưu tiên Gợi ý từ Card",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "Nếu được kiểm tra và thẻ nhân vật chứa một lệnh phá vỡ giam giữ (Hướng dẫn Lịch sử Bài viết), hãy sử dụng thay vào đó",
     "Prefer Character Card Jailbreak": "Ưu tiên Jailbreak từ Card",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "Tránh cắt xén và thay đổi kích thước hình ảnh ký tự đã nhập. Khi tắt, hãy cắt/thay đổi kích thước thành 512x768.",
+    "never_resize_avatars_tooltip": "Tránh cắt xén và thay đổi kích thước hình ảnh ký tự đã nhập. Khi tắt, hãy cắt/thay đổi kích thước thành 512x768.",
     "Never resize avatars": "Không bao giờ thay đổi kích thước hình đại diện",
     "Show actual file names on the disk, in the characters list display only": "Hiển thị tên tệp thực tế trên đĩa, chỉ trong danh sách nhân vật",
     "Show avatar filenames": "Hiển thị tên tệp hình đại diện",

     "Auto-swipe": "Tự động vuốt",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Bật chức năng tự động vuốt. Các cài đặt trong phần này chỉ có tác dụng khi tự động vuốt được bật",
     "Minimum generated message length": "Độ dài tối thiểu của tin nhắn được tạo",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Nếu tin nhắn được tạo ra ngắn hơn điều này, kích hoạt tự động vuốt",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Nếu tin nhắn được tạo ra ngắn hơn điều này, kích hoạt tự động vuốt",
     "Blacklisted words": "Từ trong danh sách đen",
     "words you dont want generated separated by comma ','": "các từ bạn không muốn được tạo ra được phân tách bằng dấu phẩy ','",
     "Blacklisted word count to swipe": "Số từ trong danh sách đen để vuốt",

public/locales/zh-cn.json+3 -4 Viewed

     "(0 = unlimited, use budget)": "（“0”为无限制，使用预算）",
     "Cap the number of entry activation recursions": "限制条目激活递归的次数",
     "Max Recursion Steps": "最大递归深度",
-    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\\n(disabled when min activations are used)": "“0”为无限制，“1”为扫描一次且不递归，“2”为扫描一次且递归一次，依此类推\n（当使用最小激活次数时，此功能被禁用）",
+    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc": "“0”为无限制，“1”为扫描一次且不递归，“2”为扫描一次且递归一次，依此类推\n（当使用最小激活次数时，此功能被禁用）",
     "Insertion Strategy": "插入策略",
     "Sorted Evenly": "均匀排序",
     "Character Lore First": "角色世界书优先",

     "Prefer Character Card Prompt": "角色卡提示词优先",
     "If checked and the character card contains a Post-History Instructions override, use that instead": "开启后，如果角色卡包含后历史指令覆盖，则使用它。",
     "Prefer Character Card Instructions": "首选角色卡说明",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "避免裁剪和调整导入的角色图像的大小。关闭时，裁剪/调整大小为 512x768。",
+    "never_resize_avatars_tooltip": "避免裁剪和调整导入的角色图像的大小。关闭时，裁剪/调整大小为 512x768。",
     "Never resize avatars": "永不调整头像大小",
     "Show actual file names on the disk, in the characters list display only": "在角色列表显示中，显示磁盘上实际的文件名。",
     "Show avatar filenames": "显示头像文件名",

     "Auto-swipe": "自动滑动",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "启用自动滑动功能。仅当启用自动滑动时，本节中的设置才会生效",
     "Minimum generated message length": "生成的消息的最小长度",
-    "If the generated message is shorter than this, trigger an auto-swipe": "如果生成的消息短于此长度，则触发自动滑动",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "如果生成的消息短于此长度，则触发自动滑动",
     "Blacklisted words": "屏蔽词",
     "words you dont want generated separated by comma ','": "不想生成的词语，用半角逗号“,”分隔",
     "Blacklisted word count to swipe": "触发滑动的黑名单词语数量",

     "Character Expressions": "角色表情",
     "Translate text to English before classification": "分类之前将文本翻译成英文",
     "Show default images (emojis) if sprite missing": "如果表情包缺失，则显示默认图像（表情符号）",
-    "Image Type - talkinghead (extras)": "图像类型 - 说话头像（附加内容）",
     "Classifier API": "分类器 API",
     "Select the API for classifying expressions.": "选择用于对表达式进行分类的API。",
     "Main API": "主要 API",

public/locales/zh-tw.json+198 -26 Viewed

     "Duplicate": "複製",
     "Persona": "使用者角色",
     "Delete": "刪除",
-    "AI Response Configuration": "設定 AI 回應",
+    "AI Response Configuration": "AI 回應設定",
     "AI Configuration panel will stay open": "上鎖 = AI 設定面板將保持開啟",
-    "clickslidertips": "點選滑桿數字可手動輸入。",
+    "clickslidertips": "點擊滑桿旁的數字以手動輸入。",
     "MAD LAB MODE ON": "瘋狂實驗室模式",
     "Documentation on sampling parameters": "取樣參數的說明文件。",
     "kobldpresets": "Kobold 預設設定檔",

     "Only enable this if your model supports context sizes greater than 8192 tokens": "僅在您的模型支援超過 8192 個符元的上下文長度時啟用此功能",
     "Max prompt cost:": "最大提示詞費用：",
     "Display the response bit by bit as it is generated.": "逐字顯示生成中的回應內容。",
-    "When this is off, responses will be displayed all at once when they are complete.": "關閉時，回應將在生成完成後一次性顯示。",
+    "When this is off, responses will be displayed all at once when they are complete.": "關閉時，回應將在生成完成後一次全部顯示。",
     "Temperature": "溫度",
     "rep.pen": "重複懲罰",
     "Rep. Pen. Range.": "重複懲罰範圍",

     "Aggressive": "積極",
     "Very aggressive": "非常積極",
     "Unlocked Context Size": "解鎖上下文長度",
-    "Unrestricted maximum value for the context slider": "不限制上下文滑桿最大值",
+    "Unrestricted maximum value for the context slider": "不限制上下文長度的最大值",
     "Context Size (tokens)": "上下文長度（符元數）",
     "Max Response Length (tokens)": "最大回應長度（符元數）",
     "Multiple swipes per generation": "每次生成多次滑動",

     "Utility Prompts": "實用提示詞",
     "Impersonation prompt": "AI 扮演提示詞",
     "Restore default prompt": "還原預設提示詞",
-    "Prompt that is used for Impersonation function": "用於 AI 模仿功能的提示詞",
+    "Prompt that is used for Impersonation function": "用於「AI 扮演使用者」功能的提示詞",
     "World Info Format Template": "世界資訊格式",
     "Restore default format": "還原預設格式",
     "Wraps activated World Info entries before inserting into the prompt.": "在插入提示詞前包裝已啟用的世界資訊條目。",

     "scenario_format_template_part_2": "來標示要插入內容的位置。",
     "Scenario Format Template": "場景格式",
     "Personality Format Template": "個性格式",
-    "Group Nudge Prompt Template": "群組推動提示詞範本",
+    "Group Nudge Prompt Template": "群組聊天格式微調",
     "Sent at the end of the group chat history to force reply from a specific character.": "在群組聊天歷史結束時發送以強制特定角色回覆",
     "New Chat": "新聊天",
     "Restore new chat prompt": "還原新聊天的提示詞",

     "Set at the beginning of the chat history to indicate that a new group chat is about to start.": "設定在聊天歷史的開頭以表明即將開始新的群組聊天",
     "New Example Chat": "新範例聊天",
     "Set at the beginning of Dialogue examples to indicate that a new example chat is about to start.": "設定在對話範例的開頭以表明即將開始新的範例聊天",
-    "Continue nudge": "繼續輔助提示詞",
+    "Continue nudge": "繼續輔助微調",
-    "Set at the end of the chat history when the continue button is pressed.": "按下繼續按鈕時設定在聊天歷史的末尾",
+    "Set at the end of the chat history when the continue button is pressed.": "按下「繼續」按鈕時，插入於聊天歷史的末尾",
     "Replace empty message": "取代空白訊息",
-    "Send this text instead of nothing when the text box is empty.": "當文字方塊為空時，發送此字串而不是空白。",
+    "Send this text instead of nothing when the text box is empty.": "當文本框為空時，發送此文本以取代空白。",
     "Seed": "種子",
-    "Set to get deterministic results. Use -1 for random seed.": "設定以獲取確定性結果。使用 -1 作為隨機種子",
+    "Set to get deterministic results. Use -1 for random seed.": "設定數值以取得可重現的結果。使用 -1 作為隨機種子",
-    "Temperature controls the randomness in token selection": "溫度控制符元選擇中的隨機性",
+    "Temperature controls the randomness in token selection": "溫度（Temperature）控制符元選擇的隨機性。\n- 低溫（<1.0）：產生更可預測且具邏輯性的文本，優先選擇機率較高的符元。\n- 高溫（>1.0）：提升創造性與輸出的多樣性，更常選擇機率較低的符元。\n將值設為 1.0 可使用原始機率。",
     "Top_K_desc": "Top K 設定可以選擇的最高符元數量。\n例如，Top K 為 20，這意味著只保留排名前 20 的符元（無論它們的機率是多樣還是有限的）。\n設定為 0 以停用。",
     "Top_P_desc": "Top P(又名核心取樣)會將所有頂級符元加總，直到達到目標百分比。\n例如，如果前兩個符元都是 25%，而 Top P 設為 0.5，那麼只有前兩個符元會被考慮。\n設定為 1.0 以停用。",
     "Typical P": "Typical P",
-    "Typical_P_desc": "Typical P 取樣根據符元偏離集合平均熵的程度進行優先排序。\n它會保留累積機率接近預設閾值(例如0.5)的符元,強調那些具有平均信息量的符元。\n設定為 1.0 以停用。",
+    "Typical_P_desc": "Typical P 取樣根據符元偏離集合平均熵的程度進行優先排序。\n它會保留累積機率接近預設閾值(例如0.5)的符元，強調那些具有平均信息量的符元。\n設定為 1.0 以停用。",
     "Min_P_desc": "Min P 設定基本最小機率。\n這個值會根據最高符元的機率進行調整。例如，如果最高符元機率為 80%,而 Min P 設為 0.1 ，那麼只有機率高於 8% 的符元會被考慮。\n設定為 0 以停用。",
     "Top_A_desc": "Top A 根據最高符元機率的平方設定符元選擇的門檻。\n例如，如果 Top A 值為 0.2，而最高符元機率為 50%，那麼低於 5%(0.2 * 0.5^2) 的符元機率就會被排除。\n設定為 0 以停用。",
     "Tail_Free_Sampling_desc": "無尾取樣(Tail-Free Sampling, TFS)會透過分析符元機率的變化率(使用導數)來尋找分佈中的低機率符元尾部。\n它會根據標準化的二階導數，保留直到某個閾值(例如0.3)的符元。\n數值越接近 0 ，表示會棄去越多符元。設定為 1.0 以停用。",

     "Logit Bias": "Logit 偏差",
     "Add": "新增",
     "Helps to ban or reenforce the usage of certain words": "有助於禁止或強化某些符元的使用",
-    "CFG Scale": "CFG 比例",
+    "CFG Scale": "CFG 縮放比例",
     "Negative Prompt": "負面提示詞",
-    "Add text here that would make the AI generate things you don't want in your outputs.": "在這裡新增文字，使 AI 生成您不希望在輸出中出現的內容。",
+    "Add text here that would make the AI generate things you don't want in your outputs.": "在此新增文字，以防止 AI 在輸出中生成您不希望出現的內容。",
-    "Used if CFG Scale is unset globally, per chat or character": "如果CFG Scale未在全域、每個聊天或角色中設定，則使用",
+    "Used if CFG Scale is unset globally, per chat or character": "若 CFG 縮放比例未被全域設定，它將作用於所有聊天或角色",
     "Mirostat Tau": "Tau",
     "Mirostat LR": "Mirostat 學習率",
     "Min Length": "最小長度",

     "Applies additional processing to the prompt before sending it to the API.": "這個選項會在將提示詞送往 API 之前，對它進行額外的處理。",
     "Verifies your API connection by sending a short test message. Be aware that you'll be credited for it!": "透過發送簡短的測試訊息來驗證您的 API 連線。請注意，您將因此獲得榮譽！",
     "Test Message": "測試訊息",
-    "Auto-connect to Last Server": "自動連線到上次伺服器",
+    "Auto-connect to Last Server": "自動連接至上次使用的伺服器",
     "Missing key": "❌ 鑰匙遺失",
     "Key saved": "✔️ 金鑰已儲存",
     "View hidden API keys": "查看隱藏的 API 金鑰",

     "Prefer Character Card Prompt": "角色卡主要提示詞優先",
     "If checked and the character card contains a jailbreak override (Post History Instruction), use that instead": "如果選中並且角色卡包含越獄覆寫（聊天歷史後指示），則使用該提示詞。",
     "Prefer Character Card Jailbreak": "角色卡越獄優先",
-    "Avoid cropping and resizing imported character images. When off, crop/resize to 512x768": "避免裁剪和調整匯入的角色圖像大小。未勾選時將會裁剪／調整大小到 512x768。",
+    "never_resize_avatars_tooltip": "避免裁剪與調整導入的角色頭像大小。未啟用此選項時，圖片將被裁剪／調整為 512x768。此設定會關閉上傳頭像時的裁剪彈出視窗。",
     "Never resize avatars": "永不調整頭像大小",
     "Show actual file names on the disk, in the characters list display only": "僅在角色列表顯示實際檔案名稱。",
     "Show avatar filenames": "顯示頭像檔案名",

     "Auto-swipe": "自動滑動",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "啟用自動滑動功能。此部分的設定僅在啟用自動滑動時有效。",
     "Minimum generated message length": "生成訊息的最小長度",
-    "If the generated message is shorter than this, trigger an auto-swipe": "如果生成的訊息比這個短，將觸發自動滑動。",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "如果生成的訊息比這個短，將觸發自動滑動。",
     "Blacklisted words": "黑名單詞語",
     "words you dont want generated separated by comma ','": "您不想生成的文字，使用逗號分隔",
     "Blacklisted word count to swipe": "滑動的黑名單詞語數量",

     "prompt_manager_edit": "編輯",
     "prompt_manager_name": "名稱",
     "A name for this prompt.": "這個提示詞的名稱。",
-    "To whom this message will be attributed.": "此訊息將隸屬於誰。",
+    "To whom this message will be attributed.": "此訊息所屬的角色。",
     "AI Assistant": "人工智慧助手",
     "prompt_manager_position": "位置",
     "Injection position. Next to other prompts (relative) or in-chat (absolute).": "注入位置。與其他提示詞相鄰（相對位置）或在聊天中（絕對位置）。",

     "Example: http://localhost:1234/v1": "例如：http://localhost:1234/v1",
     "popup-button-crop": "裁剪",
     "(disabled when max recursion steps are used)": "（當最大遞歸步驟數使用時將停用）",
-    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\n(disabled when min activations are used)": "0 = 無限制，1 = 掃描一次且不遞歸，2 = 掃描一次並遞歸一次，以此類推\n（使用最小啟動設定時將停用）",
     "A greedy, brute-force algorithm used in LLM sampling to find the most likely sequence of words or tokens. It expands multiple candidate sequences at once, maintaining a fixed number (beam width) of top sequences at each step.": "一種用於 LLM 抽樣的貪婪演算法，用於尋找最可能的單詞或標記序列。該方法會同時展開多個候選序列，並在每一步中保持固定數量的頂級序列（beam width）。",
     "A multiplicative factor to expand the overall area that the nodes take up.": "節點佔用該擴充功能區域的倍數。",
     "Abort current image generation task": "終止目前的圖片生成任務",

     "HuggingFace Token": "HuggingFace 符元",
     "Image Captioning": "圖片註解",
     "Generate Caption": "產生圖片註解",
-    "Image Type - talkinghead (extras)": "圖片類型 - talkinghead（額外選項）",
     "Injection Position": "插入位置",
     "Injection position. Relative (to other prompts in prompt manager) or In-chat @ Depth.": "插入位置（與提示詞管理器中的其他提示相比）或聊天中的深度位置。",
     "Injection Template": "插入範本",

     "Quick Impersonate button": "快速模擬按鈕",
     "Recursion Level": "遞迴層級",
     "Remove all image overrides": "移除所有圖片覆蓋",
-    "Restore default": "",
+    "Restore default": "恢復預設",
     "Retain#": "保留#",
     "Retrieve chunks": "檢索 Chunks",
     "Sampler Order": "取樣順序",

     "Threshold": "閾值",
     "to install 3rd party extensions.": "用於安裝第三方擴充功能。",
     "Top": "頂部",
-    "Translate text to English before classification": "在分類前將文本翻譯為英文。",
+    "Translate text to English before classification": "分類前，將訊息翻譯為英文",
     "Uncheck to hide the extensions messages in chat prompts.": "不勾選即可隱藏聊天提示詞中的擴充功能訊息。",
     "Unchecked: only entries with ❌ status can be activated.": "未勾選時：僅允許啟用狀態為 ❌ 的條目。",
     "Unified Sampling": "統一取樣（Unified Sampling）",

     "context_derived": "若可能，根據模型元數據推導。",
     "instruct_derived": "若可能，根據模型元數據推導。",
     "Inserted before the first User's message.": "插入於第一則使用者訊息之前。",
-    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\\n(disabled when min activations are used)": "0 = 無限制，1 = 掃描一次不遞歸，2 = 掃描一次後遞歸一次 ⋯以此類推\n（啟用最小啟動次數時無效）",
+    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc": "0 = 無限制，1 = 掃描一次不遞歸，2 = 掃描一次後遞歸一次 ⋯以此類推\n（啟用最小啟動次數時無效）",
     "Quick 'Impersonate' button": "快速「AI 扮演使用者」按鈕",
     "Manual": "手動",
     "Any contents here will replace the default Post-History Instructions used for this character. (v2 spec: post_history_instructions)": "此處填入的內容將取代該角色的默認聊天歷史後指示（Post-History Instructions）。\n（v2 格式：specpost_history_instructions）",

     "Narrate user messages": "朗讀使用者訊息",
     "Auto Generation": "自動生成",
     "Requires auto generation to be enabled.": "需要啟用自動生成功能。",
-    "Narrate by paragraphs (when streaming)": "按段落朗讀（使用「串流」傳輸時）",
+    "Narrate by paragraphs (when streaming)": "按段落朗讀（使用「串流」時）",
     "Only narrate quotes": "僅朗讀「引號」中的文字",
     "Ignore text, even quotes, inside asterisk": "忽略 *（星號）內的文字（包括「引號」）",
     "Narrate only the translated text": "僅朗讀翻譯後的文本",

     "Modules provided by your Extras API:": "由您的 Extras API 提供的模組：",
     "Not connected to the API!": "未連線到 API！",
     "ext_type_system": "這是內建的擴充功能，無法刪除，且會跟隨系統更新。",
-    "Valid": "已驗證"
+    "Valid": "已驗證",
+    "Request Model Reasoning": "請求模型推理",
+    "Global list": "全域列表",
+    "Preset-specific list": "特定預設列表",
+    "Constrains effort on reasoning for reasoning models.": "限制推理模型的推理耗費。\n目前支援的值為低、中和高。\n降低推理耗費可加快回應速度，並減少推理所使用的符元數量。",
+    "Reasoning Effort": "推理耗費",
+    "openai_reasoning_effort_low": "低",
+    "openai_reasoning_effort_medium": "中",
+    "openai_reasoning_effort_high": "高",
+    "Reasoning": "推理 Reasoning",
+    "reasoning_auto_parse": "自動解析主要內容中推理區塊，需定義且不為空的前綴與後綴欄位。",
+    "Auto-Parse": "自動解析",
+    "reasoning_auto_expand": "自動展開推理區塊。",
+    "Auto-Expand": "自動展開",
+    "reasoning_show_hidden": "顯示隱藏推理功能模型的推理時間",
+    "Show Hidden": "顯示隱藏內容",
+    "reasoning_add_to_prompts": "將現有推理區塊添加至提示詞中。若需新增推理區塊，請使用訊息編輯選單。",
+    "Add to Prompts": "添加至提示詞",
+    "reasoning_max_additions": "從最後一則訊息起算，每則提示詞中可添加的最大推理區塊數量。",
+    "Max": "最大值",
+    "Reasoning Formatting": "推理格式",
+    "reasoning_prefix": "插入於推理內容之前。",
+    "Prefix": "前綴",
+    "reasoning_suffix": "插入於推理內容之後。",
+    "Suffix": "後綴",
+    "reasoning_separator": "插入於推理內容與訊息內容之間。",
+    "Separator": "分隔符",
+    "Character details are hidden.": "角色詳情已隱藏。",
+    "Add a reasoning block": "新增推理區塊",
+    "Thought for some time": "思考了一段時間",
+    "Confirmedit": "確認",
+    "Remove reasoning": "移除推理",
+    "Cancel edit": "取消編輯",
+    "Copy reasoning": "複製推理",
+    "Edit reasoning": "編輯推理",
+    "extension_install_1": "若要從此頁面下載擴充功能，您需要安裝",
+    "extension_install_2": "已安裝。",
+    "extension_install_3": "點擊",
+    "extension_install_4": "圖示以訪問擴充功能的儲存庫，查看使用技巧。",
+    "Use the selected API from Chat Translation extension settings.": "使用擴充功能設定中，「聊天翻譯」所選的翻譯提供者（API）。",
+    "A single expression can have multiple sprites. Whenever the expression is chosen, a random sprite for this expression will be selected.": "單個同名表情可以有多張角色立繪。每次使用該表情時，會隨機擇一顯示。",
+    "Allow multiple sprites per expression": "允許單一表情使用多張立繪",
+    "If the same expression is used again, re-roll the sprite. This only applies to expressions that have multiple available sprites assigned.": "若再次使用相同的表情，將重新隨機選擇。此功能僅適用於分配了多張立繪的表情。",
+    "Re-roll if same expression is used again": "重複使用同名表情時，隨機選用其他立繪",
+    "upload_expression_request": "請輸入角色立繪名稱（不含副檔名）。",
+    "upload_expression_naming_1": "角色立繪名稱必須符合所選表情的命名規則：{{expression}}",
+    "upload_expression_naming_2": "對於多個表情，名稱必須包含表情名稱和有效的後綴，允許的分隔符為「-」或「.」。",
+    "upload_expression_replace": "點擊「取代」以取代現有表情：",
+    "ext_regex_reasoning_desc": "推理區塊內容。當「僅格式化提示詞」已勾選時，這也會影響添加至提示詞的推理內容。",
+    "Token Counter": "符元計數器",
+    "Type / paste in the box below to see the number of tokens in the text.": "在下框中輸入或貼上文字以查看符元（Token）數量。",
+    "Selected tokenizer:": "選擇的分詞器：",
+    "Input:": "輸入：",
+    "Tokens:": "符元數：",
+    "Tokenized text:": "已符元化的文字：",
+    "Token IDs:": "符元 ID：",
+    "Narrate by paragraphs (when not streaming)": "按段落朗讀（不使用「串流」時）",
+    " folder (typically in ": "資料夾（通常位於 ",
+    "Copy to Clipboard": "複製到剪貼簿",
+    "Reset to Defaults": "重設為預設值",
+    "Toggles Guinevere features.": "切換 Guinevere 功能。",
+    "Update customCSS": "更新 customCSS",
+    "Apply Theme": "套用主題",
+    "Enable Guinevere": "啟用 Guinevere",
+    "Note: Themes can be made/applied by going to the ": "注意：主題可通過前往以下位置進行創建／應用",
+    "Theme Name": "主題名稱",
+    "An unknown error occurred while counting tokens. Further information may be available in console.": "計算符元時發生未知錯誤。更多資訊可能可在主控台（console）中查看。",
+    "Qvink Memory": "Qvink Memory（進階聊天記憶）",
+    "Toggle whether memory is enabled for this chat specifically (overrides all settings).": "切換是否為此聊天啟用記憶功能（將覆蓋所有設定）。",
+    "Toggle Chat Memory": "切換聊天記憶",
+    "Preview current memory state (the exact text that will be injected into your context).": "預覽目前記憶狀態（包含將嵌入上下文的具體內容）。",
+    "Copy ALL memories to clipboard (all memories in the entire chat, not just those injected).": "將所有記憶複製到剪貼簿（包含整個聊天的所有記憶，而非僅限於注入的部分）。",
+    "Just refreshes which memories are included and re-renders the memories under each message, doesn't change summaries. This is done automatically all the time, the button is here just in case.": "不影響摘要，僅更新已包含的聊天記憶，並重新顯示在每則訊息下方。此過程通常會自動執行，按鈕只是備用選項。",
+    "Active Settings Profile ": "目前設定檔",
+    "Create, edit, and save configuration profiles for this extension.": "建立、編輯及儲存此擴充功能的設定檔。",
+    "The currently selected profile": "目前選取的設定檔",
+    "Save current profile": "儲存此設定檔",
+    "Rename current profile": "重新命名此設定檔",
+    "Create new profile": "建立新設定檔",
+    "Restore current profile": "還原此設定檔",
+    "Delete current profile": "刪除此設定檔",
+    "Set as default profile for current character": "設為目前角色的預設設定檔",
+    "Summarization": "摘要",
+    "Customize the prompt used to summarize a given message": "自訂用於摘要指定訊息的提示詞",
+    "Edit the summary prompt": "編輯摘要提示",
+    "Preview the filled-in summary prompt, using the last message as an example.": "以最後一則訊息為例，預覽填充完成的摘要提示",
+    "Mass re-summarization. Brings up dialog to choose subsets of messages to summarize or re-summarize.": "批量重新摘要：開啟對話框以選擇訊息子集進行摘要或重新摘要。",
+    "Stop all summarization immediately.": "立即停止所有摘要。",
+    "New messages will be automatically summarized if they will be included in short-term memory.": "如果新訊息將被納入短期記憶，將自動進行摘要。",
+    "Auto Summarize": "自動摘要",
+    "Auto-summarization will be triggered before a new message is sent instead of after.": "自動摘要將在發送新訊息之前觸發。",
+    "Auto Summarize Before Generation": "在生成內容前自動摘要",
+    "Show the progress bar when auto-summarizing more than 1 message.": "在自動摘要多於 1 則訊息時顯示進度條。",
+    "Auto Summarize Progress Bar": "自動摘要進度條",
+    "Number of messages to delay summarization (0 = summarize up to the most recent message, 1 = lag behind by one message, etc.)": "延遲摘要的訊息數量（0 = 摘要至最新訊息，1 = 延遲摘要 1 則訊息，以此類推）。",
+    "Auto Summarize Message Lag": "自動摘要訊息延遲",
+    "Wait until this many messages before auto-summarizing them all in sequence (1 = summarize every message immediately, 2 = summarize when you have two ready, etc). Still summarizes one at a time.": "在訊息數量達到此設定值後，依序自動摘要（1 = 即時摘要每則訊息，2 = 等待 2 則訊息後再摘要，以此類推）。摘要將逐條執行。",
+    "Auto Summarize Batch Size": "自動摘要批次大小",
+    "The maximum number of messages back that auto-summarization will apply (-1 to disable).": "自動摘要可回溯的訊息最大數量（-1 表示禁用此功能）。",
+    "Auto Summarize Message Limit": "自動摘要訊息上限",
+    "Time in seconds to wait between summarizations. May be needed if you are using a external API with a rate limit.": "每次摘要的間隔時間（秒）。此設定適用於使用具有請求速率限制的外部 API。",
+    "Summarization Time Delay": "摘要時間延遲",
+    "The maximum token length a summary is allowed to be before cutting it off. Use the {{words}} macro in the summarization prompt to get this value.": "摘要在被截斷前允許的最大符元（token）長度。可在摘要提示中使用 {{words}} 巨集以取得此數值。",
+    "Summary Max Token Length": "摘要允許的最大符元長度",
+    "Editing a message will automatically trigger a re-summarization if it has already been summarized.": "編輯訊息時，若該訊息已被摘要，將自動觸發重新摘要。",
+    "Re-summarize on Edit": "編輯後重新摘要",
+    "Swiping a message will automatically trigger a re-summarization if it has already been summarized.": "滑動訊息後若已進行摘要，將自動觸發重新摘要。",
+    "Re-summarize on Swipe": "滑動後重新摘要",
+    "Block chat input while summarizing.": "在摘要進行時暫時禁用聊天訊息輸入。",
+    "Block Chat": "訊息輸入鎖定",
+    "Whether to use messages and/or summaries as context for summarization. You must use {{history}} in the summary prompt.": "決定是否在摘要中使用訊息及／或過往摘要作為背景資訊。需於摘要提示詞中，使用 {{history}}。",
+    "Message History": "訊息歷史",
+    "Messages": "僅訊息",
+    "Summaries": "僅摘要",
+    "Both": "訊息與摘要",
+    "Preview what the message history will look like": "預覽訊息歷史的顯示效果",
+    "How many previous messages to include in the summarization prompt as context.": "摘要提示中要包含多少先前訊息作為上下文。",
+    "Number of Previous Messages": "先前訊息數量",
+    "When including previous messages, also include user messages.": "包含先前訊息時，也包含使用者訊息。",
+    "Include Previous User Messages": "包含先前使用者訊息",
+    "The message to summarize will be inside the system instruct template itself. In unchecked (default), the message will instead be added separately after the prompt. Some models benefit from this, but it is not recommended.": "系統指令模板內將直接包含需要摘要的訊息。若未啟用此選項（預設設定），訊息會在提示後分開添加。儘管某些模型可能更適合此設定，但一般不建議使用。",
+    "Nest Message in Summary Prompt": "在摘要提示中內嵌訊息",
+    "WARNING: doesn't work great. Attempts to preserve context-shifting by including all the content that is sent in regular prompts (world info, description, personas, example messages, message history, etc). If your regular prompts are static, this can allow Context Shifting to work between summarizations, but it decreases the accuracy of summarization due to all the extra stuff in the prompt. It also can't be previewed as this injection is handled by ST, not the extension.": "警告：效果不佳。此功能嘗試透過在摘要時包含所有常規提示內容（如世界資訊、描述、角色設定、示範訊息、聊天歷史等）來保留上下文轉換。若您的常規提示為靜態內容，則可在摘要之間維持上下文轉換，但由於提示中包含大量額外資訊，將降低摘要的準確性。此外，此內容注入由 ST 處理，而非此擴充功能，因此無法進行預覽。",
+    "Include All Context Content": "包含所有上下文內容",
+    "Short-term Memory Injection": "短期記憶注入",
+    "Determines which messages are included in the short-term memory injection and where. If you change this and include messages that weren't summarized previously, you can either manually trigger a re-summarization or just wait until automatic summarization triggers.": "設定短期記憶注入中所包含的訊息及其插入位置。若更改此設定並包含先前未摘要的訊息，您可手動觸發重新摘要，或等待自動摘要啟動。",
+    "Edit the short-term memory prompt": "編輯短期記憶提示",
+    "Include User Messages": "包含使用者訊息",
+    "Include System Messages": "包含系統訊息",
+    "Include Thought Message": "包含思考訊息",
+    "Message Length Threshold": "訊息長度閾值",
+    "The minimum token length a message has to be in order to get summarized.": "可被摘要的訊息最小符元長度。",
+    "The max percent of the context that short-term memory can take up.": "短期記憶可佔用上下文的最大百分比。",
+    "Short-Term Context %": "短期記憶上下文％",
+    "Include short-term memory in the World Info Scan": "在世界資訊掃描中包含短期記憶",
+    "Do not inject": "不注入",
+    "Before main prompt": "主提示之前",
+    "After main prompt": "主提示之後",
+    "In chat at depth": "在對話中位於深度",
+    "Long-Term Memory Injection": "長期記憶注入",
+    "Determines where long-term messages are injected.": "決定長期訊息注入的位置。",
+    "Edit the long-term memory prompt": "編輯長期記憶提示",
+    "The max percent of the context that long-term memory can take up.": "長期記憶可佔用上下文的最大百分比。",
+    "Long-Term Context %": "長期記憶上下文％",
+    "Include long-term memory in the World Info Scan": "在世界資訊掃描中包含長期記憶",
+    "Misc.": "其他",
+    "Fill your console with debug messages": "將偵錯訊息填入主控台",
+    "Debug Mode": "偵錯模式",
+    "Display summarizations below each message": "在每則訊息下顯示摘要",
+    "Display Memories": "顯示記憶",
+    "Enable Memory in New Chats": "在新對話中啟用記憶",
+    "Limit Message History": "限制訊息歷史",
+    "Revert Settings": "還原設定",
+    "Auto-summarize user messages and include summaries in memory.": "自動摘要使用者訊息，並將該摘要納入記憶。",
+    "Auto-summarize system messages and include summaries in memory.": "自動摘要系統訊息，並將該摘要納入記憶。",
+    "Auto-summarize thought messages and include summaries in memory (from the Stepped Thinking extension).": "自動摘要思考訊息並將摘要納入記憶（來自 Stepped Thinking 擴充功能）。",
+    "Revert all settings to default (not the default profile, just the default that comes with the extension). Your other profiles won't be affected.": "將所有設定恢復為預設值（並非恢復至「預設設定檔」，而是擴充功能隨附的原始預設值）。其他設定檔將不受影響。",
+    "Limit the number of messages to send in regular prompts to this number (-1 for no limit). Message memories will still be sent.": "限制常規提示中傳送的訊息數量至此數值（-1 表示無限制）。訊息記憶仍將一併傳送。",
+    "Whether memory is enabled by default for new chats.": "是否在新對話中預設啟用記憶。",
+    "Summarize Chat": "摘要對話",
+    "Choose settings for the chat summarization. All message inclusion/exclusion settings from the main config profile are used, in addition to the following options.": "選擇聊天摘要的設定。摘要時將使用主要設定檔中的所有訊息包含／排除規則，並可額外設定以下選項。",
+    "Currently preparing to summarize:": "目前正在準備摘要：",
+    "Summarize messages with no existing summary": "摘要尚無摘要的訊息",
+    "Re-summarize messages with existing short-term memories": "重新摘要具有現有短期記憶的訊息",
+    "Re-summarize messages with existing long-term memories": "重新摘要具有現有長期記憶的訊息",
+    "Re-summarize messages with existing memories, but which are currently excluded from short-term and long-term memory": "重新摘要具有現有記憶，但目前被排除在短期和長期記憶之外的訊息",
+    "Re-summarize messages with existing memories that have been manually edited.": "重新摘要已手動編輯的訊息記憶",
+    "Type the folder name of the theme you want to apply.": "輸入您想套用的主題資料夾名稱。",
+    "Place your theme data in a folder.": "請將主題資料存於該資料夾內。",
+    "Unsure where to start? Type ": "不確定如何開始？輸入：",
+    " to apply the default Google Messages theme or click ": " 即可使用預設主題 Google Messages，或點擊",
+    "here": "這裡",
+    " to learn how to create your own theme.": " 以學習如何創建個人化主題。",
+    "Guinevere (UI Theme Extension)": "Guinevere（進階自定義 UI 主題）",
+    "and Guinaifen.": "和 Guinaifen（桂乃芬）呈獻。"
+}

public/script.js+48 -6 Viewed

         return;
+    }
+    if (!(node instanceof Element)) {
+        return;
+    }
     let mediaBlocked = false;
     switch (node.tagName) {

     // TODO: Naming convention is inconsistent with other events
     CHARACTER_DELETED: 'characterDeleted',
     CHARACTER_DUPLICATED: 'character_duplicated',
+    CHARACTER_RENAMED: 'character_renamed',
     /** @deprecated The event is aliased to STREAM_TOKEN_RECEIVED. */
     SMOOTH_STREAM_TOKEN_RECEIVED: 'stream_token_received',
     STREAM_TOKEN_RECEIVED: 'stream_token_received',

     TOOL_CALLS_RENDERED: 'tool_calls_rendered',
 };
-export const eventSource = new EventEmitter();
+export const eventSource = new EventEmitter([event_types.APP_READY]);
 eventSource.on(event_types.CHAT_CHANGED, processChatSlashCommands);

     document.documentElement.style.setProperty('--animation-duration', `${animation_duration}ms`);
+}
+/**
+ * Sets the currently active character
+ * @param {object|number|string} [entityOrKey] - An entity with id property (character, group, tag), or directly an id or tag key. If not provided, the active character is reset to `null`.
+ */
 export function setActiveCharacter(entityOrKey) {
-    active_character = getTagKeyForEntity(entityOrKey);
+    active_character = entityOrKey ? getTagKeyForEntity(entityOrKey) : null;
+    if (active_character) active_group = null;
+}
+/**
+ * Sets the currently active group.
+ * @param {object|number|string} [entityOrKey] - An entity with id property (character, group, tag), or directly an id or tag key. If not provided, the active group is reset to `null`.
+ */
 export function setActiveGroup(entityOrKey) {
-    active_group = getTagKeyForEntity(entityOrKey);
+    active_group = entityOrKey ? getTagKeyForEntity(entityOrKey) : null;
+    if (active_group) active_character = null;
+}
 /**

             // Update reasoning
             await this.reasoningHandler.process(messageId, mesChanged);
+            processedText = chat[messageId]['mes'];
             // Token count update.
             const tokenCountText = this.reasoningHandler.reasoning + processedText;

@@ -3373,7 +3389,7 @@ class StreamingProcessor {
3373	this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));	3389	this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));
3374	}	3390	}
3375	// Get the updated reasoning string into the handler	3391	// Get the updated reasoning string into the handler
3376	this.reasoningHandler.updateReasoning(this.messageId, state?.reasoning ?? '');	3392	this.reasoningHandler.updateReasoning(this.messageId, state?.reasoning);
3377	await eventSource.emit(event_types.STREAM_TOKEN_RECEIVED, text);	3393	await eventSource.emit(event_types.STREAM_TOKEN_RECEIVED, text);
3378	await sw.tick(async () => await this.onProgressStreaming(this.messageId, this.continueMessage + text));	3394	await sw.tick(async () => await this.onProgressStreaming(this.messageId, this.continueMessage + text));
3379	}	3395	}

             const data = await response.json();
             const newAvatar = data.avatar;
-            // Replace tags list
+            const oldName = getCharaFilename(null, { manualAvatarKey: oldAvatar });
+            const newName = getCharaFilename(null, { manualAvatarKey: newAvatar });
+            // Replace other auxillery fields where was referenced by avatar key
+            // Tag List
             renameTagKey(oldAvatar, newAvatar);
+            // Addtional lore books
+            const charLore = world_info.charLore?.find(x => x.name == oldName);
+            if (charLore) {
+                charLore.name = newName;
+                saveSettingsDebounced();
+            }
+            // Char-bound Author's Notes
+            const charNote = extension_settings.note.chara?.find(x => x.name == oldName);
+            if (charNote) {
+                charNote.name = newName;
+                saveSettingsDebounced();
+            }
+            // Update active character, if the current one was the currently active one
+            if (active_character === oldAvatar) {
+                active_character = newAvatar;
+                saveSettingsDebounced();
+            }
+            await eventSource.emit(event_types.CHARACTER_RENAMED, oldAvatar, newAvatar);
             // Reload characters list
             await getCharacters();

     });
     $(document).on('click', '.mes_edit_copy', async function () {
-        const confirmation = await callGenericPopup('Create a copy of this message?', POPUP_TYPE.CONFIRM);
+        const confirmation = await callGenericPopup(t`Create a copy of this message?`, POPUP_TYPE.CONFIRM);
         if (!confirmation) {
             return;
+        }

public/scripts/RossAscends-mods.js+17 -2 Viewed

         // active character is the name, we should look it up in the character list and get the id
         if (active_character !== null && active_character !== undefined) {
             const active_character_id = characters.findIndex(x => getTagKeyForEntity(x) === active_character);
-            if (active_character_id !== null) {
+            if (active_character_id !== -1) {
                 await selectCharacterById(String(active_character_id));
                 // Do a little tomfoolery to spoof the tag selector
                 const selectedCharElement = $(`#rm_print_characters_block .character_select[chid="${active_character_id}"]`);
                 applyTagsOnCharacterSelect.call(selectedCharElement);
+            } else {
+                setActiveCharacter(null);
+                saveSettingsDebounced();
+                console.warn(`Currently active character with ID ${active_character} not found. Resetting to no active character.`);
+            }
+        }
         if (active_group !== null && active_group !== undefined) {
-            await openGroupById(String(active_group));
+            if (active_character) {
+                console.warn('Active character and active group are both set. Only active character will be loaded. Resetting active group.');
+                setActiveGroup(null);
+                saveSettingsDebounced();
+            } else {
+                const result = await openGroupById(String(active_group));
+                if (!result) {
+                    setActiveGroup(null);
+                    saveSettingsDebounced();
+                    console.warn(`Currently active group with ID ${active_group} not found. Resetting to no active group.`);
+                }
+            }
+        }
         // if the character list hadn't been loaded yet, try again.

public/scripts/chats.js+1 -1 Viewed

             ...chat.filter(x => x?.extra?.type !== system_message_types.ASSISTANT_NOTE),
         ];
-        download(JSON.stringify(chatToSave, null, 4), `Assistant - ${humanizedDateTime()}.json`, 'application/json');
+        download(chatToSave.map((m) => JSON.stringify(m)).join('\n'), `Assistant - ${humanizedDateTime()}.jsonl`, 'application/json');
     });
     // Do not change. #attachFile is added by extension.

public/scripts/extensions.js+14 -4 Viewed

         refine_mode: false,
     },
     expressions: {
+        /** @type {number} see `EXPRESSION_API` */
+        api: undefined,
         /** @type {string[]} */
         custom: [],
+        showDefault: false,
+        translate: false,
+        /** @type {string} */
+        fallback_expression: undefined,
+        /** @type {string} */
+        llmPrompt: undefined,
+        allowMultiple: true,
+        rerollIfSame: false,
     },
     connectionManager: {
         selectedProfile: '',

+    }
     let toggleElement = isActive || isDisabled ?
-        `<input type="checkbox" title="Click to toggle" data-name="${name}" class="${isActive ? 'toggle_disable' : 'toggle_enable'} ${checkboxClass}" ${isActive ? 'checked' : ''}>` :
+        '<input type="checkbox" title="' + t`Click to toggle` + `" data-name="${name}" class="${isActive ? 'toggle_disable' : 'toggle_enable'} ${checkboxClass}" ${isActive ? 'checked' : ''}>` :
         `<input type="checkbox" title="Cannot enable extension" data-name="${name}" class="extension_missing ${checkboxClass}" disabled>`;
-    let deleteButton = isExternal ? `<button class="btn_delete menu_button" data-name="${externalId}" title="Delete"><i class="fa-fw fa-solid fa-trash-can"></i></button>` : '';
+    let deleteButton = isExternal ? `<button class="btn_delete menu_button" data-name="${externalId}" data-i18n="[title]Delete" title="Delete"><i class="fa-fw fa-solid fa-trash-can"></i></button>` : '';
     let updateButton = isExternal ? `<button class="btn_update menu_button displayNone" data-name="${externalId}" title="Update available"><i class="fa-solid fa-download fa-fw"></i></button>` : '';
-    let moveButton = isExternal && isUserAdmin ? `<button class="btn_move menu_button" data-name="${externalId}" title="Move"><i class="fa-solid fa-folder-tree fa-fw"></i></button>` : '';
+    let moveButton = isExternal && isUserAdmin ? `<button class="btn_move menu_button" data-name="${externalId}" data-i18n="[title]Move" title="Move"><i class="fa-solid fa-folder-tree fa-fw"></i></button>` : '';
     let modulesInfo = '';
     if (isActive && Array.isArray(manifest.optional)) {

         modules.forEach(x => optional.delete(x));
         if (optional.size > 0) {
             const optionalString = DOMPurify.sanitize([...optional].join(', '));
-            modulesInfo = `<div class="extension_modules">Optional modules: <span class="optional">${optionalString}</span></div>`;
+            modulesInfo = '<div class="extension_modules">' + t`Optional modules:` + ` <span class="optional">${optionalString}</span></div>`;
+        }
     } else if (!isDisabled) { // Neither active nor disabled
         const requirements = new Set(manifest.requires);

public/scripts/extensions/assets/index.js+13 -15 Viewed

 import { executeSlashCommands } from '../../slash-commands.js';
 import { accountStorage } from '../../util/AccountStorage.js';
 import { flashHighlight, getStringHash, isValidUrl } from '../../utils.js';
+import { t } from '../../i18n.js';
 export { MODULE_NAME };
 const MODULE_NAME = 'assets';

     'blip': 'Blip sounds',
 };
-function downloadAssetsList(url) {
+async function downloadAssetsList(url) {
-    updateCurrentAssets().then(function () {
+    updateCurrentAssets().then(async function () {
         fetch(url, { cache: 'no-cache' })
             .then(response => response.json())
-            .then(json => {
+            .then(async function(json) {
                 availableAssets = {};
                 $('#assets_menu').empty();

                 $('#assets_type_select').empty();
                 $('#assets_search').val('');
-                $('#assets_type_select').append($('<option />', { value: '', text: 'All' }));
+                $('#assets_type_select').append($('<option />', { value: '', text: t`All` }));
                 for (const type of assetTypes) {
-                    const option = $('<option />', { value: type, text: KNOWN_TYPES[type] || type });
+                    const option = $('<option />', { value: type, text: t([KNOWN_TYPES[type] || type]) });
                     $('#assets_type_select').append(option);
+                }

                     assetTypeMenu.append(`<h3>${KNOWN_TYPES[assetType] || assetType}</h3>`).hide();
                     if (assetType == 'extension') {
-                        assetTypeMenu.append(`
+                        assetTypeMenu.append(await renderExtensionTemplateAsync('assets', 'installation'));
-                        <div class="assets-list-git">
-                            To download extensions from this page, you need to have <a href="https://git-scm.com/downloads" target="_blank">Git</a> installed.<br>
-                            Click the <i class="fa-solid fa-sm fa-arrow-up-right-from-square"></i> icon to visit the Extension's repo for tips on how to use it.
-                        </div>`);
+                    }
                     for (const i in availableAssets[assetType].sort((a, b) => a?.name && b?.name && a['name'].localeCompare(b['name']))) {

                         const displayName = DOMPurify.sanitize(asset['name'] || asset['id']);
                         const description = DOMPurify.sanitize(asset['description'] || '');
                         const url = isValidUrl(asset['url']) ? asset['url'] : '';
-                        const title = assetType === 'extension' ? `Extension repo/guide: ${url}` : 'Preview in browser';
+                        const title = assetType === 'extension' ? t`Extension repo/guide:` + ` ${url}` : t`Preview in browser`;
                         const previewIcon = (assetType === 'extension' || assetType === 'character') ? 'fa-arrow-up-right-from-square' : 'fa-headphones-simple';
                         const toolTag = assetType === 'extension' && asset['tool'];

                                             <b>${displayName}</b>
                                             <a class="asset_preview" href="${url}" target="_blank" title="${title}">
                                                 <i class="fa-solid fa-sm ${previewIcon}"></i>
-                                            </a>
+                                            </a>` +
-                                            ${toolTag ? '<span class="tag" title="Adds a function tool"><i class="fa-solid fa-sm fa-wrench"></i> Tool</span>' : ''}
+                                            (toolTag ? '<span class="tag" title="' + t`Adds a function tool` + '"><i class="fa-solid fa-sm fa-wrench"></i> ' +
-                                        </span>
+                                            t`Tool` + '</span>' : '') +
+                                        `</span>
                                         <small class="asset-description">
                                             ${description}
                                         </small>

         const rememberKey = `Assets_SkipConfirm_${getStringHash(url)}`;
         const skipConfirm = accountStorage.getItem(rememberKey) === 'true';
-        const confirmation = skipConfirm || await Popup.show.confirm('Loading Asset List', `<span>Are you sure you want to connect to the following url?</span><var>${url}</var>`, {
+        const confirmation = skipConfirm || await Popup.show.confirm(t`Loading Asset List`, '<span>' + t`Are you sure you want to connect to the following url?` + `</span><var>${url}</var>`, {
             customInputs: [{ id: 'assets-remember', label: 'Don\'t ask again for this URL' }],
             onClose: popup => {
                 if (popup.result) {

public/scripts/extensions/assets/installation.html+4 -0 Viewed

+<div class="assets-list-git">
+    <span data-i18n="extension_install_1">To download extensions from this page, you need to have </span><a href="https://git-scm.com/downloads" target="_blank">Git</a><span data-i18n="extension_install_2"> installed.</span><br>
+    <span data-i18n="extension_install_3">Click the </span><i class="fa-solid fa-sm fa-arrow-up-right-from-square"></i><span data-i18n="extension_install_4"> icon to visit the Extension's repo for tips on how to use it.</span>
+</div>
 \ No newline at end of file

public/scripts/extensions/assets/window.html+1 -1 Viewed

             <div id="assets_filters" class="flex-container">
                 <select id="assets_type_select" class="text_pole flex1">
                 </select>
-                <input id="assets_search" class="text_pole flex1" placeholder="Search" type="search">
+                <input id="assets_search" class="text_pole flex1" data-i18n="[placeholder]Search" placeholder="Search" type="search">
                 <div id="assets-characters-button" class="menu_button menu_button_icon">
                     <i class="fa-solid fa-image-portrait"></i>
                     <span data-i18n="Characters">Characters</span>

public/scripts/extensions/expressions/index.js+788 -707 Viewed

 import { Fuse } from '../../../lib.js';
-import { callPopup, eventSource, event_types, generateRaw, getRequestHeaders, main_api, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types } from '../../../script.js';
+import { characters, eventSource, event_types, generateRaw, getRequestHeaders, main_api, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types, this_chid } from '../../../script.js';
 import { dragElement, isMobile } from '../../RossAscends-mods.js';
 import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js';
-import { loadMovingUIState, power_user } from '../../power-user.js';
+import { loadMovingUIState, performFuzzySearch, power_user } from '../../power-user.js';
 import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar } from '../../utils.js';
-import { hideMutedSprites } from '../../group-chats.js';
+import { hideMutedSprites, selected_group } from '../../group-chats.js';
 import { isJsonSchemaSupported } from '../../textgen-settings.js';
 import { debounce_timeout } from '../../constants.js';
 import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';

 import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 import { slashCommandReturnHelper } from '../../slash-commands/SlashCommandReturnHelper.js';
 import { generateWebLlmChatPrompt, isWebLlmSupported } from '../shared.js';
+import { Popup, POPUP_RESULT } from '../../popup.js';
+import { t } from '../../i18n.js';
 export { MODULE_NAME };
+/**
+* @typedef {object} Expression Expression definition with label and file path
+* @property {string} label The label of the expression
+* @property {ExpressionImage[]} files One or more images to represent this expression
+*/
+/**
+ * @typedef {object} ExpressionImage An expression image
+ * @property {string} expression - The expression
+ * @property {boolean} [isCustom=false] - If the expression is added by user
+ * @property {string} fileName - The filename with extension
+ * @property {string} title - The title for the image
+ * @property {string} imageSrc - The image source / full path
+ * @property {'success' | 'additional' | 'failure'} type - The type of the image
+ */
 const MODULE_NAME = 'expressions';
 const UPDATE_INTERVAL = 2000;
 const STREAMING_UPDATE_INTERVAL = 10000;
-const TALKINGCHECK_UPDATE_INTERVAL = 500;
 const DEFAULT_FALLBACK_EXPRESSION = 'joy';
 const DEFAULT_LLM_PROMPT = 'Ignore previous instructions. Classify the emotion of the last message. Output just one word, e.g. "joy" or "anger". Choose only one of the following labels: {{labels}}';
 const DEFAULT_EXPRESSIONS = [
-    'talkinghead',
     'admiration',
     'amusement',
     'anger',

     'surprise',
     'neutral',
 ];
+const OPTION_NO_FALLBACK = '#none';
+const OPTION_EMOJI_FALLBACK = '#emoji';
+const RESET_SPRITE_LABEL = '#reset';
 /** @enum {number} */
 const EXPRESSION_API = {
     local: 0,

 let expressionsList = null;
 let lastCharacter = undefined;
 let lastMessage = null;
-let lastTalkingState = false;
+/** @type {{[characterKey: string]: Expression[]}} */
-let lastTalkingStateMessage = null;  // last message as seen by `updateTalkingState` (tracked separately, different timer)
 let spriteCache = {};
 let inApiCall = false;
 let lastServerResponseTime = 0;
-export let lastExpression = {};
-function isTalkingHeadEnabled() {
-    return extension_settings.expressions.talkinghead && extension_settings.expressions.api == EXPRESSION_API.extras;
-}
-/**
+/** @type {{[characterName: string]: string}} */
- * Returns the fallback expression if explicitly chosen, otherwise the default one
+export let lastExpression = {};
- * @returns {string} expression name
- */
-function getFallbackExpression() {
-    return extension_settings.expressions.fallback_expression ?? DEFAULT_FALLBACK_EXPRESSION;
-}
 /**
- * Toggles Talkinghead mode on/off.
+ * Returns a placeholder image object for a given expression
- *
+ * @param {string} expression - The expression label
- * Implements the `/th` slash command, which is meant to be bound to a Quick Reply button
+ * @param {boolean} [isCustom=false] - Whether the expression is custom
- * as a quick way to switch Talkinghead on or off (e.g. to conserve GPU resources when AFK
+ * @returns {ExpressionImage} The placeholder image object
- * for a long time).
  */
-function toggleTalkingHeadCommand(_) {
+function getPlaceholderImage(expression, isCustom = false) {
-    setTalkingHeadState(!extension_settings.expressions.talkinghead);
+    return {
-    return String(extension_settings.expressions.talkinghead);
+        expression: expression,
+        isCustom: isCustom,
+        title: 'No Image',
+        type: 'failure',
+        fileName: 'No-Image-Placeholder.svg',
+        imageSrc: '/img/No-Image-Placeholder.svg',
+    };
+}
 function isVisualNovelMode() {

 const updateVisualNovelModeDebounced = debounce(forceUpdateVisualNovelMode, debounce_timeout.quick);
-async function updateVisualNovelMode(name, expression) {
+async function updateVisualNovelMode(spriteFolderName, expression) {
-    const container = $('#visual-novel-wrapper');
+    const vnContainer = $('#visual-novel-wrapper');
-    await visualNovelRemoveInactive(container);
+    await visualNovelRemoveInactive(vnContainer);
-    const setSpritePromises = await visualNovelSetCharacterSprites(container, name, expression);
+    const setSpritePromises = await visualNovelSetCharacterSprites(vnContainer, spriteFolderName, expression);
     // calculate layer indices based on recent messages
-    await visualNovelUpdateLayers(container);
+    await visualNovelUpdateLayers(vnContainer);
     await Promise.allSettled(setSpritePromises);
     // update again based on new sprites
     if (setSpritePromises.length > 0) {
-        await visualNovelUpdateLayers(container);
+        await visualNovelUpdateLayers(vnContainer);
+    }
+}

     await Promise.allSettled(removeInactiveCharactersPromises);
+}
-async function visualNovelSetCharacterSprites(container, name, expression) {
+/**
+ * Sets the character sprites for visual novel mode based on the provided container, name, and expression.
+ *
+ * @param {JQuery<HTMLElement>} vnContainer - The container element where the sprites will be set
+ * @param {string} spriteFolderName - The name of the sprite folder
+ * @param {string} expression - The expression to set for the characters
+ * @returns {Promise<Array>} - An array of promises that resolve when the sprites are set
+ */
+async function visualNovelSetCharacterSprites(vnContainer, spriteFolderName, expression) {
+    const originalExpression = expression;
     const context = getContext();
     const group = context.groups.find(x => x.id == context.groupId);
-    const labels = await getExpressionsList();
-    const createCharacterPromises = [];
     const setSpritePromises = [];
     for (const avatar of group.members) {
-        const isDisabled = group.disabled_members.includes(avatar);
         // skip disabled characters
+        const isDisabled = group.disabled_members.includes(avatar);
         if (isDisabled && hideMutedSprites) {
             continue;
+        }
         const character = context.characters.find(x => x.avatar == avatar);
         if (!character) {
             continue;
+        }
-        const spriteFolderName = getSpriteFolderName({ original_avatar: character.avatar }, character.name);
+        const expressionImage = vnContainer.find(`.expression-holder[data-avatar="${avatar}"]`);
+        /** @type {JQuery<HTMLElement>} */
+        let img;
+        const memberSpriteFolderName = getSpriteFolderName({ original_avatar: character.avatar }, character.name);
         // download images if not downloaded yet
-        if (spriteCache[spriteFolderName] === undefined) {
+        if (spriteCache[memberSpriteFolderName] === undefined) {
-            spriteCache[spriteFolderName] = await getSpritesList(spriteFolderName);
+            spriteCache[memberSpriteFolderName] = await getSpritesList(memberSpriteFolderName);
+        }
-        const sprites = spriteCache[spriteFolderName];
+        const prevExpressionSrc = expressionImage.find('img').attr('src') || null;
-        const expressionImage = container.find(`.expression-holder[data-avatar="${avatar}"]`);
-        const defaultExpression = getFallbackExpression();
-        const defaultSpritePath = sprites.find(x => x.label === defaultExpression)?.path;
-        const noSprites = sprites.length === 0;
-        if (expressionImage.length > 0) {
+        if (!originalExpression && Array.isArray(spriteCache[memberSpriteFolderName]) && spriteCache[memberSpriteFolderName].length > 0) {
-            if (name == spriteFolderName) {
+            expression = await getLastMessageSprite(avatar);
-                await validateImages(spriteFolderName, true);
+        }
-                setExpressionOverrideHtml(true); // <= force clear expression override input
-                const currentSpritePath = labels.includes(expression) ? sprites.find(x => x.label === expression)?.path : '';
-                const path = currentSpritePath || defaultSpritePath || '';
+        const spriteFile = chooseSpriteForExpression(memberSpriteFolderName, expression, { prevExpressionSrc: prevExpressionSrc });
-                const img = expressionImage.find('img');
+        if (expressionImage.length) {
+            if (!spriteFolderName || spriteFolderName == memberSpriteFolderName) {
+                await validateImages(memberSpriteFolderName, true);
+                setExpressionOverrideHtml(true); // <= force clear expression override input
+                const path = spriteFile?.imageSrc || '';
+                img = expressionImage.find('img');
                 await setImage(img, path);
+            }
-            expressionImage.toggleClass('hidden', noSprites);
+            expressionImage.toggleClass('hidden', !spriteFile);
         } else {
             const template = $('#expression-holder').clone();
             template.attr('id', `expression-${avatar}`);

             template.find('.drag-grabber').attr('id', `expression-${avatar}header`);
             $('#visual-novel-wrapper').append(template);
             dragElement($(template[0]));
-            template.toggleClass('hidden', noSprites);
+            template.toggleClass('hidden', !spriteFile);
-            await setImage(template.find('img'), defaultSpritePath || '');
+            img = template.find('img');
+            await setImage(img, spriteFile?.imageSrc || '');
             const fadeInPromise = new Promise(resolve => {
                 template.fadeIn(250, () => resolve());
             });
-            createCharacterPromises.push(fadeInPromise);
+            setSpritePromises.push(fadeInPromise);
-            const setSpritePromise = setLastMessageSprite(template.find('img'), avatar, labels);
-            setSpritePromises.push(setSpritePromise);
+        }
+        if (!img) {
+            continue;
+        }
+        img.attr('data-sprite-folder-name', spriteFolderName);
+        img.attr('data-expression', expression);
+        img.attr('data-sprite-filename', spriteFile?.fileName || null);
+        img.attr('title', expression);
+        if (spriteFile) console.info(`Expression set for group member ${character.name}`, { expression: spriteFile.expression, file: spriteFile.fileName });
+        else if (expressionImage.length) console.info(`Expression unset for group member ${character.name} - No sprite found`, { expression: expression });
+        else console.info(`Expression not available for group member ${character.name}`, { expression: expression });
+    }
-    await Promise.allSettled(createCharacterPromises);
     return setSpritePromises;
+}
+/**
+ * Classifies the text of the latest message and returns the expression label.
+ * @param {string} avatar - The avatar of the character to get the last message for
+ * @returns {Promise<string>} - The expression label
+ */
+async function getLastMessageSprite(avatar) {
+    const context = getContext();
+    const lastMessage = context.chat.slice().reverse().find(x => x.original_avatar == avatar || (x.force_avatar && x.force_avatar.includes(encodeURIComponent(avatar))));
+    if (lastMessage) {
+        const text = lastMessage.mes || '';
+        return await getExpressionLabel(text);
+    }
+    return null;
+}
 async function visualNovelUpdateLayers(container) {
     const context = getContext();
     const group = context.groups.find(x => x.id == context.groupId);

     const containerWidth = container.width();
     const pivotalPoint = containerWidth * 0.5;
-    let images = $('#visual-novel-wrapper .expression-holder');
+    let images = Array.from($('#visual-novel-wrapper .expression-holder')).sort(sortFunction);
     let imagesWidth = [];
-    images.sort(sortFunction).each(function () {
+    for (const image of images) {
-        imagesWidth.push($(this).width());
+        if (image instanceof HTMLImageElement && !image.complete) {
+            await new Promise(resolve => image.addEventListener('load', resolve, { once: true }));
+        }
+    }
+    images.forEach(image => {
+        imagesWidth.push($(image).width());
     });
     let totalWidth = imagesWidth.reduce((a, b) => a + b, 0);

         currentPosition = 0; // Reset the initial position to 0
+    }
-    images.sort(sortFunction).each((index, current) => {
+    images.forEach((current, index) => {
         const element = $(current);
         const elementID = element.attr('id');

         element.show();
         const promise = new Promise(resolve => {
+            if (power_user.reduced_motion) {
+                element.css('left', currentPosition + 'px');
+                requestAnimationFrame(() => resolve());
+            }
+            else {
                 element.animate({ left: currentPosition + 'px' }, 500, () => {
                     resolve();
                 });
+            }
         });
         currentPosition += imagesWidth[index];

     await Promise.allSettled(setLayerIndicesPromises);
+}
-async function setLastMessageSprite(img, avatar, labels) {
+/**
-    const context = getContext();
+ * Sets the expression for the given character image.
-    const lastMessage = context.chat.slice().reverse().find(x => x.original_avatar == avatar || (x.force_avatar && x.force_avatar.includes(encodeURIComponent(avatar))));
+ * @param {JQuery<HTMLElement>} img - The image element to set the image on
+ * @param {string} path - The path to the image
-    if (lastMessage) {
+ * @returns {Promise<void>} - A promise that resolves when the image is set
-        const text = lastMessage.mes || '';
+ */
-        const spriteFolderName = getSpriteFolderName(lastMessage, lastMessage.name);
-        const sprites = spriteCache[spriteFolderName] || [];
-        const label = await getExpressionLabel(text);
-        const path = labels.includes(label) ? sprites.find(x => x.label === label)?.path : '';
-        if (path) {
-            setImage(img, path);
-        }
-    }
-}
 async function setImage(img, path) {
     // Cohee: If something goes wrong, uncomment this to return to the old behavior
     /*

     return new Promise(resolve => {
         const prevExpressionSrc = img.attr('src');
         const expressionClone = img.clone();
-        const originalId = img.attr('id');
+        const originalId = img.data('filename');
         //only swap expressions when necessary
         if (prevExpressionSrc !== path && !img.hasClass('expression-animating')) {

             expressionClone.addClass('expression-clone');
             //make invisible and remove id to prevent double ids
             //must be made invisible to start because they share the same Z-index
-            expressionClone.attr('id', '').css({ opacity: 0 });
+            expressionClone.data('filename', '').css({ opacity: 0 });
             //add new sprite path to clone src
             expressionClone.attr('src', path);
             //add invisible clone to html

                     //remove old expression
                     img.remove();
                     //replace ID so it becomes the new 'original' expression for next change
-                    expressionClone.attr('id', originalId);
+                    expressionClone.data('filename', originalId);
                     expressionClone.removeClass('expression-animating');
                     // Reset the expression holder min height and width
                     expressionHolder.css('min-width', 100);
                     expressionHolder.css('min-height', 100);
+                    if (expressionClone.prop('complete')) {
                         resolve();
+                    } else {
+                        expressionClone.one('load', () => resolve());
+                    }
                 });
             expressionClone.removeClass('expression-clone');

     });
+}
-function onExpressionsShowDefaultInput() {
+async function moduleWorker({ newChat = false } = {}) {
-    const value = $(this).prop('checked');
-    extension_settings.expressions.showDefault = value;
-    saveSettingsDebounced();
-    const existingImageSrc = $('img.expression').prop('src');
-    if (existingImageSrc !== undefined) {                      //if we have an image in src
-        if (!value && existingImageSrc.includes('/img/default-expressions/')) {    //and that image is from /img/ (default)
-            $('img.expression').prop('src', '');               //remove it
-            lastMessage = null;
-        }
-        if (value) {
-            lastMessage = null;
-        }
-    }
-}
-/**
-  * Stops animating Talkinghead.
-  */
-async function unloadTalkingHead() {
-    if (!modules.includes('talkinghead')) {
-        console.debug('talkinghead module is disabled');
-        return;
-    }
-    console.debug('expressions: Stopping Talkinghead');
-    try {
-        const url = new URL(getApiUrl());
-        url.pathname = '/api/talkinghead/unload';
-        const loadResponse = await doExtrasFetch(url);
-        if (!loadResponse.ok) {
-            throw new Error(loadResponse.statusText);
-        }
-        //console.log(`Response: ${loadResponseText}`);
-    } catch (error) {
-        //console.error(`Error unloading - ${error}`);
-    }
-}
-/**
-  * Posts `talkinghead.png` of the current character to the talkinghead module in SillyTavern-extras, to start animating it.
-  */
-async function loadTalkingHead() {
-    if (!modules.includes('talkinghead')) {
-        console.debug('talkinghead module is disabled');
-        return;
-    }
-    console.debug('expressions: Starting Talkinghead');
-    const spriteFolderName = getSpriteFolderName();
-    const talkingheadPath = `/characters/${encodeURIComponent(spriteFolderName)}/talkinghead.png`;
-    const emotionsSettingsPath = `/characters/${encodeURIComponent(spriteFolderName)}/_emotions.json`;
-    const animatorSettingsPath = `/characters/${encodeURIComponent(spriteFolderName)}/_animator.json`;
-    try {
-        const spriteResponse = await fetch(talkingheadPath);
-        if (!spriteResponse.ok) {
-            throw new Error(spriteResponse.statusText);
-        }
-        const spriteBlob = await spriteResponse.blob();
-        const spriteFile = new File([spriteBlob], 'talkinghead.png', { type: 'image/png' });
-        const formData = new FormData();
-        formData.append('file', spriteFile);
-        const url = new URL(getApiUrl());
-        url.pathname = '/api/talkinghead/load';
-        const loadResponse = await doExtrasFetch(url, {
-            method: 'POST',
-            body: formData,
-        });
-        if (!loadResponse.ok) {
-            throw new Error(loadResponse.statusText);
-        }
-        const loadResponseText = await loadResponse.text();
-        console.log(`Load talkinghead response: ${loadResponseText}`);
-        // Optional: per-character emotion templates
-        let emotionsSettings;
-        try {
-            const emotionsResponse = await fetch(emotionsSettingsPath);
-            if (emotionsResponse.ok) {
-                emotionsSettings = await emotionsResponse.json();
-                console.log(`Loaded ${emotionsSettingsPath}`);
-            } else {
-                throw new Error();
-            }
-        }
-        catch (error) {
-            emotionsSettings = {};  // blank -> use server defaults (to unload the previous character's customizations)
-            console.log(`No valid config at ${emotionsSettingsPath}, using server defaults`);
-        }
-        try {
-            const url = new URL(getApiUrl());
-            url.pathname = '/api/talkinghead/load_emotion_templates';
-            const apiResult = await doExtrasFetch(url, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Bypass-Tunnel-Reminder': 'bypass',
-                },
-                body: JSON.stringify(emotionsSettings),
-            });
-            if (!apiResult.ok) {
-                throw new Error(apiResult.statusText);
-            }
-        }
-        catch (error) {
-            // it's ok if not supported
-            console.log('Failed to send _emotions.json (backend too old?), ignoring');
-        }
-        // Optional: per-character animator and postprocessor config
-        let animatorSettings;
-        try {
-            const animatorResponse = await fetch(animatorSettingsPath);
-            if (animatorResponse.ok) {
-                animatorSettings = await animatorResponse.json();
-                console.log(`Loaded ${animatorSettingsPath}`);
-            } else {
-                throw new Error();
-            }
-        }
-        catch (error) {
-            animatorSettings = {};  // blank -> use server defaults (to unload the previous character's customizations)
-            console.log(`No valid config at ${animatorSettingsPath}, using server defaults`);
-        }
-        try {
-            const url = new URL(getApiUrl());
-            url.pathname = '/api/talkinghead/load_animator_settings';
-            const apiResult = await doExtrasFetch(url, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Bypass-Tunnel-Reminder': 'bypass',
-                },
-                body: JSON.stringify(animatorSettings),
-            });
-            if (!apiResult.ok) {
-                throw new Error(apiResult.statusText);
-            }
-        }
-        catch (error) {
-            // it's ok if not supported
-            console.log('Failed to send _animator.json (backend too old?), ignoring');
-        }
-    } catch (error) {
-        console.error(`Error loading talkinghead image: ${talkingheadPath} - ${error}`);
-    }
-}
-function handleImageChange() {
-    const imgElement = document.querySelector('img#expression-image.expression');
-    if (!imgElement || !(imgElement instanceof HTMLImageElement)) {
-        console.log('Cannot find addExpressionImage()');
-        return;
-    }
-    if (isTalkingHeadEnabled() && modules.includes('talkinghead')) {
-        const talkingheadResultFeedSrc = `${getApiUrl()}/api/talkinghead/result_feed`;
-        $('#expression-holder').css({ display: '' });
-        if (imgElement.src !== talkingheadResultFeedSrc) {
-            const expressionImageElement = document.querySelector('.expression_list_image');
-            if (expressionImageElement && expressionImageElement instanceof HTMLImageElement) {
-                doExtrasFetch(expressionImageElement.src, {
-                    method: 'HEAD',
-                })
-                    .then(response => {
-                        if (response.ok) {
-                            imgElement.src = talkingheadResultFeedSrc;
-                        }
-                    })
-                    .catch(error => {
-                        console.error(error);
-                    });
-            }
-        }
-    } else {
-        imgElement.src = '';  // remove in case char doesn't have expressions
-        // When switching Talkinghead off, force-set the character to the last known expression, if any.
-        // This preserves the same expression Talkinghead had at the moment it was switched off.
-        const charName = getContext().name2;
-        const last = lastExpression[charName];
-        const targetExpression = last ? last : getFallbackExpression();
-        setExpression(charName, targetExpression, true);
-    }
-}
-async function moduleWorker() {
     const context = getContext();
-    // Hide and disable Talkinghead while not in extras
-    $('#image_type_block').toggle(extension_settings.expressions.api == EXPRESSION_API.extras);
-    if (extension_settings.expressions.api != EXPRESSION_API.extras && extension_settings.expressions.talkinghead) {
-        $('#image_type_toggle').prop('checked', false);
-        setTalkingHeadState(false);
-    }
     // non-characters not supported
     if (!context.groupId && context.characterId === undefined) {
         removeExpression();

+    }
     const currentLastMessage = getLastCharacterMessage();
-    let spriteFolderName = context.groupId ? getSpriteFolderName(currentLastMessage, currentLastMessage.name) : getSpriteFolderName();
+    let spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage.name);
     // character has no expressions or it is not loaded
     if (Object.keys(spriteCache).length === 0) {

         offlineMode.css('display', 'none');
+    }
+    if (context.groupId && vnMode && newChat) {
+        await forceUpdateVisualNovelMode();
+    }
     // Don't bother classifying if current char has no sprites and no default expressions are enabled
     if ((!Array.isArray(spriteCache[spriteFolderName]) || spriteCache[spriteFolderName].length === 0) && !extension_settings.expressions.showDefault) {
         return;

@@ -732,11 +586,11 @@ async function moduleWorker() {
732	const force = !!context.groupId;	586	const force = !!context.groupId;
733		587
734	// Character won't be angry on you for swiping	588	// Character won't be angry on you for swiping
735	if (currentLastMessage.mes == '...' && expressionsList.includes(getFallbackExpression())) {	589	if (currentLastMessage.mes == '...' && expressionsList.includes(extension_settings.expressions.fallback_expression)) {
736	expression = getFallbackExpression();	590	expression = extension_settings.expressions.fallback_expression;
737	}	591	}
738		592
739	await sendExpressionCall(spriteFolderName, expression, force, vnMode);	593	await sendExpressionCall(spriteFolderName, expression, { force: force, vnMode: vnMode });
740	}	594	}
741	catch (error) {	595	catch (error) {
742	console.log(error);	596	console.log(error);

+    }
+}
-/**
-  * Starts/stops Talkinghead talking animation.
-  *
-  * Talking starts only when all the following conditions are met:
-  *   - The LLM is currently streaming its output.
-  *   - The AI's current last message is non-empty, and also not just '...' (as produced by a swipe).
-  *   - The AI's current last message has changed from what we saw during the previous call.
-  *
-  * In all other cases, talking stops.
-  *
-  * A Talkinghead API call is made only when the talking state changes.
-  *
-  * Note that also the TTS system, if enabled, starts/stops the Talkinghead talking animation.
-  * See `talkingAnimation` in `SillyTavern/public/scripts/extensions/tts/index.js`.
-  */
-async function updateTalkingState() {
-    // Don't bother if Talkinghead is disabled or not loaded.
-    if (!isTalkingHeadEnabled() || !modules.includes('talkinghead')) {
-        return;
-    }
-    const context = getContext();
-    const currentLastMessage = getLastCharacterMessage();
-    try {
-        // TODO: Not sure if we need also "&& !context.groupId" here - the classify check in `moduleWorker`
-        //       (that similarly checks the streaming processor state) does that for some reason.
-        //       Talkinghead isn't currently designed to work with groups.
-        const lastMessageChanged = !((lastCharacter === context.characterId || lastCharacter === context.groupId) && lastTalkingStateMessage === currentLastMessage.mes);
-        const url = new URL(getApiUrl());
-        let newTalkingState;
-        if (context.streamingProcessor && !context.streamingProcessor.isFinished &&
-            currentLastMessage.mes.length !== 0 && currentLastMessage.mes !== '...' && lastMessageChanged) {
-            url.pathname = '/api/talkinghead/start_talking';
-            newTalkingState = true;
-        } else {
-            url.pathname = '/api/talkinghead/stop_talking';
-            newTalkingState = false;
-        }
-        try {
-            // Call the Talkinghead API only if the talking state changed.
-            if (newTalkingState !== lastTalkingState) {
-                console.debug(`updateTalkingState: calling ${url.pathname}`);
-                await doExtrasFetch(url);
-            }
-        }
-        catch (error) {
-            // it's ok if not supported
-        }
-        finally {
-            lastTalkingState = newTalkingState;
-        }
-    }
-    catch (error) {
-        // console.log(error);
-    }
-    finally {
-        lastTalkingStateMessage = currentLastMessage.mes;
-    }
-}
-/**
- * Checks whether the current character has a talkinghead image available.
- * @returns {Promise<boolean>} True if the character has a talkinghead image available, false otherwise.
- */
-async function isTalkingHeadAvailable() {
-    let spriteFolderName = getSpriteFolderName();
-    try {
-        await validateImages(spriteFolderName);
-        let talkingheadObj = spriteCache[spriteFolderName].find(obj => obj.label === 'talkinghead');
-        let talkingheadPath = talkingheadObj ? talkingheadObj.path : null;
-        if (talkingheadPath != null) {
-            return true;
-        } else {
-            await unloadTalkingHead();
-            return false;
-        }
-    } catch (err) {
-        return err;
-    }
-}
 function getSpriteFolderName(characterMessage = null, characterName = null) {
     const context = getContext();
     let spriteFolderName = characterName ?? context.name2;

     return spriteFolderName;
+}
-function setTalkingHeadState(newState) {
-    console.debug(`expressions: New talkinghead state: ${newState}`);
-    extension_settings.expressions.talkinghead = newState; // Store setting
-    saveSettingsDebounced();
-    if ([EXPRESSION_API.local, EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(extension_settings.expressions.api)) {
-        return;
-    }
-    isTalkingHeadAvailable().then(result => {
-        if (result) {
-            //console.log("talkinghead exists!");
-            if (extension_settings.expressions.talkinghead) {
-                loadTalkingHead();
-            } else {
-                unloadTalkingHead();
-            }
-            handleImageChange(); // Change image as needed
-        } else {
-            //console.log("talkinghead does not exist.");
-        }
-    });
-}
 function getFolderNameByMessage(message) {
     const context = getContext();
     let avatarPath = '';

     return folderName;
+}
-async function sendExpressionCall(name, expression, force, vnMode) {
+/**
-    lastExpression[name.split('/')[0]] = expression;
+ * Update the expression for the given character.
-    if (!vnMode) {
+ *
+ * @param {string} spriteFolderName The character name, optionally with a sprite folder override, e.g. "folder/expression".
+ * @param {string} expression The expression label, e.g. "amusement", "joy", etc.
+ * @param {Object} [options] Additional options
+ * @param {boolean} [options.force=false] If true, the expression will be sent even if it is the same as the current expression.
+ * @param {boolean} [options.vnMode=null] If true, the expression will be sent in Visual Novel mode. If null, it will be determined by the current chat mode.
+ * @param {string?} [options.overrideSpriteFile=null] - Set if a specific sprite file should be used. Must be sprite file name.
+ */
+export async function sendExpressionCall(spriteFolderName, expression, { force = false, vnMode = null, overrideSpriteFile = null } = {}) {
+    lastExpression[spriteFolderName.split('/')[0]] = expression;
+    if (vnMode === null) {
         vnMode = isVisualNovelMode();
+    }
     if (vnMode) {
-        await updateVisualNovelMode(name, expression);
+        await updateVisualNovelMode(spriteFolderName, expression);
     } else {
-        setExpression(name, expression, force);
+        setExpression(spriteFolderName, expression, { force: force, overrideSpriteFile: overrideSpriteFile });
+    }
+}
-async function setSpriteSetCommand(_, folder) {
+async function setSpriteFolderCommand(_, folder) {
     if (!folder) {
         console.log('Clearing sprite set');
         folder = '';
+    }
     if (folder.startsWith('/') || folder.startsWith('\\')) {
-        folder = folder.slice(1);
         const currentLastMessage = getLastCharacterMessage();
+        folder = folder.slice(1);
         folder = `${currentLastMessage.name}/${folder}`;
+    }
     $('#expression_override').val(folder.trim());
     onClickExpressionOverrideButton();
-    // removeExpression();
-    // moduleWorker();
+    // No need to resend the expression, the folder override will automatically update the currently displayed one.
-    const vnMode = isVisualNovelMode();
-    await sendExpressionCall(folder, lastExpression, true, vnMode);
     return '';
+}
 async function classifyCallback(/** @type {{api: string?, prompt: string?}} */ { api = null, prompt = null }, text) {
     if (!text) {
-        toastr.warning('No text provided');
+        toastr.error('No text provided');
         return '';
+    }
     if (api && !Object.keys(EXPRESSION_API).includes(api)) {
-        toastr.warning('Invalid API provided');
+        toastr.error('Invalid API provided');
         return '';
+    }

     return label;
+}
-async function setSpriteSlashCommand(_, spriteId) {
+/** @type {(args: {type: 'expression' | 'sprite'}, searchTerm: string) => Promise<string>} */
-    if (!spriteId) {
+async function setSpriteSlashCommand({ type }, searchTerm) {
-        console.log('No sprite id provided');
+    type ??= 'expression';
+    searchTerm = searchTerm.trim().toLowerCase();
+    if (!searchTerm) {
+        toastr.error(t`No expression or sprite name provided`, t`Set Sprite`);
         return '';
+    }
-    spriteId = spriteId.trim().toLowerCase();
+    const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
+    const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
+    let label = searchTerm;
+    /** @type {string?} */
+    let spriteFile = null;
-    // In Talkinghead mode, don't check for the existence of the sprite
-    // (emotion names are the same as for sprites, but it only needs "talkinghead.png").
-    const currentLastMessage = getLastCharacterMessage();
-    const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage.name);
-    let label = spriteId;
-    if (!isTalkingHeadEnabled() || !modules.includes('talkinghead')) {
     await validateImages(spriteFolderName);
-        // Fuzzy search for sprite
+    // Handle reset as a special term and just reset the sprite via expression call
-        const fuse = new Fuse(spriteCache[spriteFolderName], { keys: ['label'] });
+    if (searchTerm === RESET_SPRITE_LABEL) {
-        const results = fuse.search(spriteId);
+        await sendExpressionCall(spriteFolderName, label, { force: true });
-        const spriteItem = results[0]?.item;
+        return lastExpression[spriteFolderName] ?? '';
+    }
+    switch (type) {
+        case 'expression': {
+            // Fuzzy search for expression
+            const existingExpressions = getCachedExpressions().map(x => ({ label: x }));
+            const results = performFuzzySearch('expression-expressions', existingExpressions, [
+                { name: 'label', weight: 1 },
+            ], searchTerm);
+            const matchedExpression = results[0]?.item;
+            if (!matchedExpression) {
+                toastr.warning(t`No expression found for search term ${searchTerm}`, t`Set Sprite`);
+                return '';
+            }
-        if (!spriteItem) {
+            label = matchedExpression.label;
-            console.log('No sprite found for search term ' + spriteId);
+            break;
+        }
+        case 'sprite': {
+            // Fuzzy search for sprite file
+            const sprites = spriteCache[spriteFolderName].map(x => x.files).flat();
+            const results = performFuzzySearch('expression-expressions', sprites, [
+                { name: 'title', weight: 1 },
+                { name: 'fileName', weight: 1 },
+            ], searchTerm);
+            const matchedSprite = results[0]?.item;
+            if (!matchedSprite) {
+                toastr.warning(t`No sprite file found for search term ${searchTerm}`, t`Set Sprite`);
                 return '';
+            }
-        label = spriteItem.label;
+            label = matchedSprite.expression;
+            spriteFile = matchedSprite.fileName;
+            break;
+        }
+        default: throw Error('Invalid sprite set type: ' + type);
+    }
-    const vnMode = isVisualNovelMode();
+    await sendExpressionCall(spriteFolderName, label, { force: true, overrideSpriteFile: spriteFile });
-    await sendExpressionCall(spriteFolderName, label, true, vnMode);
     return label;
+}

+}
 /**
+ * Generates a unique sprite name by appending an index to the given expression. *
+ * @param {string} expression - The base expression to be used as the prefix for the sprite name.
+ * @param {ExpressionImage[]} existingFiles - An array of existing file objects, each containing a fileName property.
+ * @returns {string} - A unique sprite name with the format "expression-index".
+ */
+function generateUniqueSpriteName(expression, existingFiles) {
+    let index = existingFiles.length;
+    let newSpriteName;
+    do {
+        newSpriteName = `${expression}-${index++}`;
+    } while (existingFiles.some(file => withoutExtension(file.fileName) === newSpriteName));
+    return newSpriteName;
+}
+/**
  * Slash command callback for /uploadsprite
+ *
  * label= is required

  * @param {object} args
  * @param {string} args.name Character name or avatar key, passed through findChar
  * @param {string} args.label Expression label
- * @param {string} args.folder Sprite folder path, processed using backslash rules
+ * @param {string} [args.folder=null] Optional sprite folder path, processed using backslash rules
+ * @param {string?} [args.spriteName=null] Optional sprite name
  * @param {string} imageUrl Image URI to fetch and upload
- * @returns {Promise<void>}
+ * @returns {Promise<string>} the sprite name
  */
-async function uploadSpriteCommand({ name, label, folder }, imageUrl) {
+async function uploadSpriteCommand({ name, label, folder = null, spriteName = null }, imageUrl) {
     if (!imageUrl) throw new Error('Image URL is required');
-    if (!label || typeof label !== 'string') throw new Error('Expression label is required');
+    if (!label || typeof label !== 'string') {
+        toastr.error(t`Expression label is required`, t`Error Uploading Sprite`);
+        return '';
+    }
     label = label.replace(/[^a-z]/gi, '').toLowerCase().trim();
-    if (!label) throw new Error('Expression label must contain at least one letter');
+    if (!label) {
+        toastr.error(t`Expression label must contain at least one letter`, t`Error Uploading Sprite`);
+        return '';
+    }
+    spriteName = spriteName || label;
+    if (!validateExpressionSpriteName(label, spriteName)) {
+        toastr.error(t`Invalid sprite name. Must follow the naming pattern for expression sprites.`, t`Error Uploading Sprite`);
+        return '';
+    }
     name = name || getLastCharacterMessage().original_avatar || getLastCharacterMessage().name;
     const char = findChar({ name });

         formData.append('name', folder); // this is the folder or character name
         formData.append('label', label); // this is the expression label
         formData.append('avatar', file); // this is the image file
+        formData.append('spriteName', spriteName); // this is a redundant comment
         await handleFileUpload('/api/sprites/upload', formData);
         console.debug(`[${MODULE_NAME}] Upload of ${imageUrl} completed for ${name} with label ${label}`);

@@ -1048,6 +858,8 @@ async function uploadSpriteCommand({ name, label, folder }, imageUrl) {
1048	console.error(`[${MODULE_NAME}] Error uploading file:`, error);	858	console.error(`[${MODULE_NAME}] Error uploading file:`, error);
1049	throw error;	859	throw error;
1050	}	860	}
		861
		862	return spriteName;
1051	}	863	}
1052		864
1053	/**	865	/**

 function onTextGenSettingsReady(args) {
     // Only call if inside an API call
     if (inApiCall && extension_settings.expressions.api === EXPRESSION_API.llm && isJsonSchemaSupported()) {
-        const emotions = DEFAULT_EXPRESSIONS.filter((e) => e != 'talkinghead');
+        const emotions = DEFAULT_EXPRESSIONS;
         Object.assign(args, {
             top_k: 1,
             stop: [],

  * @param {EXPRESSION_API} [expressionsApi=extension_settings.expressions.api] - The expressions API to use for classification.
  * @param {object} [options={}] - Optional arguments.
  * @param {string?} [options.customPrompt=null] - The custom prompt to use for classification.
- * @returns {Promise<string>} - The label of the expression.
+ * @returns {Promise<string?>} - The label of the expression.
  */
 export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api, { customPrompt = null } = {}) {
     // Return if text is undefined, saving a costly fetch request
     if ((!modules.includes('classify') && expressionsApi == EXPRESSION_API.extras) || !text) {
-        return getFallbackExpression();
+        return extension_settings.expressions.fallback_expression;
+    }
-    if (extension_settings.expressions.translate && typeof window['translate'] === 'function') {
+    if (extension_settings.expressions.translate && typeof globalThis.translate === 'function') {
-        text = await window['translate'](text, 'en');
+        text = await globalThis.translate(text, 'en');
+    }
     text = sampleClassifyText(text);

                     await waitUntilCondition(() => online_status !== 'no_connection', 3000, 250);
                 } catch (error) {
                     console.warn('No LLM connection. Using fallback expression', error);
-                    return getFallbackExpression();
+                    return extension_settings.expressions.fallback_expression;
+                }
                 const expressionsList = await getExpressionsList();

             case EXPRESSION_API.webllm: {
                 if (!isWebLlmSupported()) {
                     console.warn('WebLLM is not supported. Using fallback expression');
-                    return getFallbackExpression();
+                    return extension_settings.expressions.fallback_expression;
+                }
                 const expressionsList = await getExpressionsList();

@@ -1258,9 +1070,9 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin
1258	} break;	1070	} break;
1259	}	1071	}
1260	} catch (error) {	1072	} catch (error) {
1261	toastr.info('Could not classify expression. Check the console or your backend for more information.');	1073	toastr.error('Could not classify expression. Check the console or your backend for more information.');
1262	console.error(error);	1074	console.error(error);
1263	return getFallbackExpression();	1075	return extension_settings.expressions.fallback_expression;
1264	}	1076	}
1265	}	1077	}
1266		1078

     $('#no_chat_expressions').show();
+}
-async function validateImages(character, forceRedrawCached) {
+/**
-    if (!character) {
+ * Validate a character's sprites, and redraw the sprites list if not done before or forced to redraw.
+ * @param {string} spriteFolderName - The character sprite folder to validate
+ * @param {boolean} [forceRedrawCached=false] - Whether to force redrawing the sprites list even if it's already been drawn before
+ */
+async function validateImages(spriteFolderName, forceRedrawCached = false) {
+    if (!spriteFolderName) {
         return;
+    }
     const labels = await getExpressionsList();
-    if (spriteCache[character]) {
+    if (spriteCache[spriteFolderName]) {
-        if (forceRedrawCached && $('#image_list').data('name') !== character) {
+        if (forceRedrawCached && $('#image_list').data('name') !== spriteFolderName) {
             console.debug('force redrawing character sprites list');
-            await drawSpritesList(character, labels, spriteCache[character]);
+            await drawSpritesList(spriteFolderName, labels, spriteCache[spriteFolderName]);
+        }
         return;
+    }
-    const sprites = await getSpritesList(character);
+    const sprites = await getSpritesList(spriteFolderName);
-    let validExpressions = await drawSpritesList(character, labels, sprites);
+    let validExpressions = await drawSpritesList(spriteFolderName, labels, sprites);
-    spriteCache[character] = validExpressions;
+    spriteCache[spriteFolderName] = validExpressions;
+}
+/**
+ * Takes a given sprite as returned from the server, and enriches it with additional data for display/sorting
+ * @param {{ path: string, label: string }} sprite
+ * @returns {ExpressionImage}
+ */
+function getExpressionImageData(sprite) {
+    const fileName = sprite.path.split('/').pop().split('?')[0];
+    const fileNameWithoutExtension = fileName.replace(/\.[^/.]+$/, '');
+    return {
+        expression: sprite.label,
+        fileName: fileName,
+        title: fileNameWithoutExtension,
+        imageSrc: sprite.path,
+        type: 'success',
+        isCustom: extension_settings.expressions.custom?.includes(sprite.label),
+    };
+}
-async function drawSpritesList(character, labels, sprites) {
+/**
+ * Populate the character expression list with sprites for the given character.
+ * @param {string} spriteFolderName - The name of the character to populate the list for
+ * @param {string[]} labels - An array of expression labels that are valid
+ * @param {Expression[]} sprites - An array of sprites
+ * @returns {Promise<Expression[]>} An array of valid expression labels
+ */
+async function drawSpritesList(spriteFolderName, labels, sprites) {
+    /** @type {Expression[]} */
     let validExpressions = [];
     $('#no_chat_expressions').hide();
     $('#open_chat_expressions').show();
     $('#image_list').empty();
-    $('#image_list').data('name', character);
+    $('#image_list').data('name', spriteFolderName);
-    $('#image_list_header_name').text(character);
+    $('#image_list_header_name').text(spriteFolderName);
     if (!Array.isArray(labels)) {
         return [];
+    }
-    for (const item of labels.sort()) {
+    for (const expression of labels.sort()) {
-        const sprite = sprites.find(x => x.label == item);
+        const isCustom = extension_settings.expressions.custom?.includes(expression);
-        const isCustom = extension_settings.expressions.custom.includes(item);
+        const images = sprites
+            .filter(s => s.label === expression)
-        if (sprite) {
+            .map(s => s.files)
-            validExpressions.push(sprite);
+            .flat();
-            const listItem = await getListItem(item, sprite.path, 'success', isCustom);
+        if (images.length === 0) {
+            const listItem = await getListItem(expression, {
+                isCustom,
+                images: [getPlaceholderImage(expression, isCustom)],
+            });
             $('#image_list').append(listItem);
+            continue;
+        }
-        else {
-            const listItem = await getListItem(item, '/img/No-Image-Placeholder.svg', 'failure', isCustom);
+        validExpressions.push({ label: expression, files: images });
+        // Render main = first file, additional = rest
+        let listItem = await getListItem(expression, {
+            isCustom,
+            images,
+        });
         $('#image_list').append(listItem);
+    }
-    }
     return validExpressions;
+}
 /**
  * Renders a list item template for the expressions list.
- * @param {string} item Expression name
+ * @param {string} expression Expression name
- * @param {string} imageSrc Path to image
+ * @param {object} args Arguments object
- * @param {'success' | 'failure'} textClass 'success' or 'failure'
+ * @param {ExpressionImage[]} [args.images] Array of image objects
- * @param {boolean} isCustom If expression is added by user
+ * @param {boolean} [args.isCustom=false] If expression is added by user
  * @returns {Promise<string>} Rendered list item template
  */
-async function getListItem(item, imageSrc, textClass, isCustom) {
+async function getListItem(expression, { images, isCustom = false } = {}) {
-    return renderExtensionTemplateAsync(MODULE_NAME, 'list-item', { item, imageSrc, textClass, isCustom });
+    return renderExtensionTemplateAsync(MODULE_NAME, 'list-item', { expression, images, isCustom: isCustom ?? false });
+}
+/**
+ * Fetches and processes the list of sprites for a given character name.
+ * Retrieves sprite data from the server and organizes it into labeled groups.
+ *
+ * @param {string} name - The character name to fetch sprites for
+ * @returns {Promise<Expression[]>} A promise that resolves to an array of grouped expression objects, each containing a label and associated image data
+ */
 async function getSpritesList(name) {
     console.debug('getting sprites list');
     try {
         const result = await fetch(`/api/sprites/get?name=${encodeURIComponent(name)}`);
+        /** @type {{ label: string, path: string }[]} */
         let sprites = result.ok ? (await result.json()) : [];
-        return sprites;
+        /** @type {Expression[]} */
+        const grouped = sprites.reduce((acc, sprite) => {
+            const imageData = getExpressionImageData(sprite);
+            let existingExpression = acc.find(exp => exp.label === sprite.label);
+            if (existingExpression) {
+                existingExpression.files.push(imageData);
+            } else {
+                acc.push({ label: sprite.label, files: [imageData] });
+            }
+            return acc;
+        }, []);
+        // Sort the sprites for each expression alphabetically, but keep the main expression file at the front
+        for (const expression of grouped) {
+            expression.files.sort((a, b) => {
+                if (a.title === expression.label) return -1;
+                if (b.title === expression.label) return 1;
+                return a.title.localeCompare(b.title);
+            });
+            // Mark all besides the first sprite as 'additional'
+            for (let i = 1; i < expression.files.length; i++) {
+                expression.files[i].type = 'additional';
+            }
+        }
+        return grouped;
+    }
     catch (err) {
         console.log(err);

     const defaultPicker = $('#expression_fallback');
     defaultPicker.empty();
-    const fallbackExpression = getFallbackExpression();
+    addOption(OPTION_NO_FALLBACK, '[ No fallback ]', !extension_settings.expressions.fallback_expression);
+    addOption(OPTION_EMOJI_FALLBACK, '[ Default emojis ]', !!extension_settings.expressions.showDefault);
     for (const expression of expressions) {
+        addOption(expression, expression, expression == extension_settings.expressions.fallback_expression);
+    }
+    /** @type {(value: string, label: string, isSelected: boolean) => void} */
+    function addOption(value, label, isSelected) {
         const option = document.createElement('option');
-        option.value = expression;
+        option.value = value;
-        option.text = expression;
+        option.text = label;
-        option.selected = expression == fallbackExpression;
+        option.selected = isSelected;
         defaultPicker.append(option);
+    }
+}
+/**
+ * Retrieves a unique list of cached expressions.
+ * Combines the default expressions list with custom user-defined expressions.
+ *
+ * @returns {string[]} An array of unique expression labels
+ */
 function getCachedExpressions() {
     if (!Array.isArray(expressionsList)) {
         return [];

@@ -1463,7 +1369,7 @@ export async function getExpressionsList() {
1463	}	1369	}
1464		1370
1465	// If there was no specific list, or an error, just return the default expressions	1371	// If there was no specific list, or an error, just return the default expressions
1466	expressionsList = DEFAULT_EXPRESSIONS.filter(e => e !== 'talkinghead').slice();	1372	expressionsList = DEFAULT_EXPRESSIONS.slice();
1467	return expressionsList;	1373	return expressionsList;
1468	}	1374	}
1469		1375

     return [...result, ...extension_settings.expressions.custom].filter(onlyUnique);
+}
-async function setExpression(character, expression, force) {
+/**
-    if (!isTalkingHeadEnabled() || !modules.includes('talkinghead')) {
+ * Selects a sprite from the given sprite folder for the given expression.
-        console.debug('entered setExpressions');
+ *
-        await validateImages(character);
+ * If multiple sprites are allowed for the expression, it will randomly select one.
+ * If the rerollIfSame option is enabled, it will only select a different sprite if the previous sprite was the same.
+ * If the overrideSpriteFile option is set, it will look for the sprite with the given file name instead of randomly selecting one.
+ *
+ * @param {string} spriteFolderName - The name of the sprite folder
+ * @param {string} expression - The expression to find the sprite for
+ * @param {object} [options] - Options to select the sprite
+ * @param {string} [options.prevExpressionSrc=null] - The source of the previous expression
+ * @param {string} [options.overrideSpriteFile=null] - The file name of the sprite to select
+ * @returns {ExpressionImage?} - The selected sprite
+ */
+function chooseSpriteForExpression(spriteFolderName, expression, { prevExpressionSrc = null, overrideSpriteFile = null } = {}) {
+    if (!spriteCache[spriteFolderName]) return null;
+    if (expression === RESET_SPRITE_LABEL) return null;
+    // Search for sprites of that expression - or fallback expression sprites if enabled
+    let sprite = spriteCache[spriteFolderName].find(x => x.label === expression);
+    if (!(sprite?.files.length > 0) && extension_settings.expressions.fallback_expression) {
+        sprite = spriteCache[spriteFolderName].find(x => x.label === extension_settings.expressions.fallback_expression);
+        console.debug('Expression', expression, 'not found. Using fallback expression', extension_settings.expressions.fallback_expression);
+    }
+    if (!(sprite?.files.length > 0)) return null;
+    let spriteFile = sprite.files[0];
+    // If a specific sprite file should be set, we are looking it up here
+    if (overrideSpriteFile) {
+        const searched = sprite.files.find(x => x.fileName === overrideSpriteFile);
+        if (searched) spriteFile = searched;
+        else toastr.warning(t`Couldn't find sprite file ${overrideSpriteFile} for expression ${expression}.`, t`Sprite Not Found`);
+    }
+    // Else calculate next expression, if multiple are allowed
+    else if (extension_settings.expressions.allowMultiple && sprite.files.length > 1) {
+        let possibleFiles = sprite.files;
+        if (extension_settings.expressions.rerollIfSame) {
+            possibleFiles = possibleFiles.filter(x => !prevExpressionSrc || x.imageSrc !== prevExpressionSrc);
+        }
+        spriteFile = possibleFiles[Math.floor(Math.random() * possibleFiles.length)];
+    }
+    return spriteFile;
+}
+/**
+ * Set the expression of a character.
+ * @param {string} spriteFolderName - The name of the character (folder name - can also be a costume override)
+ * @param {string} expression - The expression or sprite name to set
+ * @param {Object} options - Optional parameters
+ * @param {boolean} [options.force=false] - Whether to force the expression change even if Visual Novel mode is on
+ * @param {string?} [options.overrideSpriteFile=null] - Set if a specific sprite file should be used. Must be sprite file name.
+ * @returns {Promise<void>} A promise that resolves when the expression has been set.
+ */
+async function setExpression(spriteFolderName, expression, { force = false, overrideSpriteFile = null } = {}) {
+    await validateImages(spriteFolderName);
     const img = $('img.expression');
     const prevExpressionSrc = img.attr('src');
     const expressionClone = img.clone();
-        const sprite = (spriteCache[character] && spriteCache[character].find(x => x.label === expression));
+    const spriteFile = chooseSpriteForExpression(spriteFolderName, expression, { prevExpressionSrc: prevExpressionSrc, overrideSpriteFile: overrideSpriteFile });
-        console.debug('checking for expression images to show..');
+    if (spriteFile) {
-        if (sprite) {
-            console.debug('setting expression from character images folder');
         if (force && isVisualNovelMode()) {
             const context = getContext();
             const group = context.groups.find(x => x.id === context.groupId);
-                for (const member of group.members) {
+            // If it's a folder, make sure we find the group member based on the actual name
-                    const groupMember = context.characters.find(x => x.avatar === member);
+            const memberName = spriteFolderName.split('/')[0] ?? spriteFolderName;
-                    if (!groupMember) {
-                        continue;
-                    }
-                    if (groupMember.name == character) {
+            const groupMember = group.members
-                        await setImage($(`.expression-holder[data-avatar="${member}"] img`), sprite.path);
+                .map(member => context.characters.find(x => x.avatar === member))
+                .find(groupMember => groupMember && groupMember.name === memberName);
+            if (groupMember) {
+                await setImage($(`.expression-holder[data-avatar="${groupMember.avatar}"] img`), spriteFile.imageSrc);
                 return;
+            }
+        }
-            }
         //only swap expressions when necessary
-            if (prevExpressionSrc !== sprite.path
+        if (prevExpressionSrc !== spriteFile.imageSrc
             && !img.hasClass('expression-animating')) {
             //clone expression
             expressionClone.addClass('expression-clone');

             //must be made invisible to start because they share the same Z-index
             expressionClone.attr('id', '').css({ opacity: 0 });
             //add new sprite path to clone src
-                expressionClone.attr('src', sprite.path);
+            expressionClone.attr('src', spriteFile.imageSrc);
+            //set relevant data tags
+            expressionClone.attr('data-sprite-folder-name', spriteFolderName);
+            expressionClone.attr('data-expression', expression);
+            expressionClone.attr('data-sprite-filename', spriteFile.fileName);
+            expressionClone.attr('title', expression);
             //add invisible clone to html
             expressionClone.appendTo($('#expression-holder'));

                     expressionHolder.css('min-height', 100);
                 });
             expressionClone.removeClass('expression-clone');
             expressionClone.removeClass('default');
             expressionClone.off('error');
-                expressionClone.on('error', function () {
+            expressionClone.on('error', function (error) {
-                    console.debug('Expression image error', sprite.path);
+                console.debug('Expression image error', spriteFile.imageSrc, error);
                 $(this).attr('src', '');
                 $(this).off('error');
                 if (force && extension_settings.expressions.showDefault) {
-                        setDefault();
+                    setDefaultEmojiForImage(img, expression);
+                }
             });
+        }
+        console.info('Expression set', { expression: spriteFile.expression, file: spriteFile.fileName });
+    }
     else {
-            if (extension_settings.expressions.showDefault) {
+        img.attr('data-sprite-folder-name', spriteFolderName);
-                setDefault();
-            }
-        }
-        function setDefault() {
+        img.off('error');
-            console.debug('setting default');
-            const defImgUrl = `/img/default-expressions/${expression}.png`;
-            //console.log(defImgUrl);
-            img.attr('src', defImgUrl);
-            img.addClass('default');
-        }
-        document.getElementById('expression-holder').style.display = '';
+        if (extension_settings.expressions.showDefault && expression !== RESET_SPRITE_LABEL) {
+            setDefaultEmojiForImage(img, expression);
         } else {
-        // Set the Talkinghead emotion to the specified expression
+            setNoneForImage(img, expression);
-        // TODO: For now, Talkinghead emote only supported when VN mode is off; see also updateVisualNovelMode.
-        try {
-            let result = await isTalkingHeadAvailable();
-            if (result) {
-                const url = new URL(getApiUrl());
-                url.pathname = '/api/talkinghead/set_emotion';
-                await doExtrasFetch(url, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({ emotion_name: expression }),
-                });
-            }
+        }
-        catch (error) {
+        console.debug('Expression unset - No sprite found', { expression: expression });
-            // `set_emotion` is not present in old versions, so let it 404.
+    }
-        try {
+    document.getElementById('expression-holder').style.display = '';
-            // Find the <img> element with id="expression-image" and class="expression"
-            const imgElement = document.querySelector('img#expression-image.expression');
-            //console.log("searching");
-            if (imgElement && imgElement instanceof HTMLImageElement) {
-                //console.log("setting value");
-                imgElement.src = getApiUrl() + '/api/talkinghead/result_feed';
-            }
+}
-        catch (error) {
-            //console.log("The fetch failed!");
+/**
+ * Sets the default expression image for the given image element and expression
+ * @param {JQuery<HTMLElement>} img - The image element to set the default expression for
+ * @param {string} expression - The expression label to use for the default image
+ */
+function setDefaultEmojiForImage(img, expression) {
+    if (extension_settings.expressions.custom?.includes(expression)) {
+        console.debug(`Can't set default emoji for a custom expression (${expression}). setting to ${DEFAULT_FALLBACK_EXPRESSION} instead.`);
+        expression = DEFAULT_FALLBACK_EXPRESSION;
+    }
+    const defImgUrl = `/img/default-expressions/${expression}.png`;
+    img.attr('src', defImgUrl);
+    img.attr('data-expression', expression);
+    img.attr('data-sprite-filename', null);
+    img.attr('title', expression);
+    img.addClass('default');
+}
+/**
+ * Sets the image element to display no expression by clearing its source attribute.
+ * @param {JQuery<HTMLElement>} img - The image element to clear the expression for
+ * @param {string} expression - The expression label to use
+ */
+function setNoneForImage(img, expression) {
+    img.attr('src', '');
+    img.attr('data-expression', expression);
+    img.attr('data-sprite-filename', null);
+    img.attr('title', expression);
+    img.removeClass('default');
+}
 function onClickExpressionImage() {
-    const expression = $(this).attr('id');
+    // If there is no expression image and we clicked on the placeholder, we remove the sprite by calling via the expression label
-    setSpriteSlashCommand({}, expression);
+    if ($(this).attr('data-expression-type') === 'failure') {
+        const label = $(this).attr('data-expression');
+        setSpriteSlashCommand({ type: 'expression' }, label);
+        return;
+    }
+    const spriteFile = $(this).attr('data-filename');
+    setSpriteSlashCommand({ type: 'sprite' }, spriteFile);
+}
 async function onClickExpressionAddCustom() {
     const template = await renderExtensionTemplateAsync(MODULE_NAME, 'add-custom-expression');
-    let expressionName = await callPopup(template, 'input');
+    let expressionName = await Popup.show.input(null, template);
     if (!expressionName) {
         console.debug('No custom expression name provided');

     // a-z, 0-9, dashes and underscores only
     if (!/^[a-z0-9-_]+$/.test(expressionName)) {
-        toastr.info('Invalid custom expression name provided');
+        toastr.warning('Invalid custom expression name provided', 'Add Custom Expression');
         return;
+    }
+    if (DEFAULT_EXPRESSIONS.includes(expressionName) || DEFAULT_EXPRESSIONS.some(x => expressionName.startsWith(x))) {
-    // Check if expression name already exists in default expressions
+        toastr.warning('Expression name already exists', 'Add Custom Expression');
-    if (DEFAULT_EXPRESSIONS.includes(expressionName)) {
-        toastr.info('Expression name already exists');
         return;
+    }
-    // Check if expression name already exists in custom expressions
     if (extension_settings.expressions.custom.includes(expressionName)) {
-        toastr.info('Custom expression already exists');
+        toastr.warning('Custom expression already exists', 'Add Custom Expression');
         return;
+    }

 async function onClickExpressionRemoveCustom() {
     const selectedExpression = String($('#expression_custom').val());
+    const noCustomExpressions = extension_settings.expressions.custom.length === 0;
-    if (!selectedExpression) {
+    if (!selectedExpression || noCustomExpressions) {
         console.debug('No custom expression selected');
         return;
+    }
     const template = await renderExtensionTemplateAsync(MODULE_NAME, 'remove-custom-expression', { expression: selectedExpression });
-    const confirmation = await callPopup(template, 'confirm');
+    const confirmation = await Popup.show.confirm(null, template);
     if (!confirmation) {
         console.debug('Custom expression removal cancelled');

     // Remove custom expression from settings
     const index = extension_settings.expressions.custom.indexOf(selectedExpression);
     extension_settings.expressions.custom.splice(index, 1);
-    if (selectedExpression == getFallbackExpression()) {
+    if (selectedExpression == extension_settings.expressions.fallback_expression) {
-        toastr.warning(`Deleted custom expression '${selectedExpression}' that was also selected as the fallback expression.\nFallback expression has been reset to '${DEFAULT_FALLBACK_EXPRESSION}'.`);
+        toastr.warning(`Deleted custom expression '${selectedExpression}' that was also selected as the fallback expression.\nFallback expression has been reset to '${DEFAULT_FALLBACK_EXPRESSION}'.`, 'Remove Custom Expression');
         extension_settings.expressions.fallback_expression = DEFAULT_FALLBACK_EXPRESSION;
+    }
     await renderAdditionalExpressionSettings();

+    }
+}
-function onExpressionFallbackChanged() {
+async function onExpressionFallbackChanged() {
-    const expression = this.value;
+    /** @type {HTMLSelectElement} */
-    if (expression) {
+    const select = this;
-        extension_settings.expressions.fallback_expression = expression;
+    const selectedValue = select.value;
-        saveSettingsDebounced();
+    switch (selectedValue) {
+        case OPTION_NO_FALLBACK:
+            extension_settings.expressions.fallback_expression = null;
+            extension_settings.expressions.showDefault = false;
+            break;
+        case OPTION_EMOJI_FALLBACK:
+            extension_settings.expressions.fallback_expression = null;
+            extension_settings.expressions.showDefault = true;
+            break;
+        default:
+            extension_settings.expressions.fallback_expression = selectedValue;
+            extension_settings.expressions.showDefault = false;
+            break;
+    }
+    const img = $('img.expression');
+    const spriteFolderName = img.attr('data-sprite-folder-name');
+    const expression = img.attr('data-expression');
+    if (spriteFolderName && expression) {
+        await sendExpressionCall(spriteFolderName, expression, { force: true });
+    }
+    saveSettingsDebounced();
+}
 async function handleFileUpload(url, formData) {

+    }
+}
+/**
+ * Removes the file extension from a file name
+ * @param {string} fileName The file name to remove the extension from
+ * @returns {string} The file name without the extension
+ */
+function withoutExtension(fileName) {
+    return fileName.replace(/\.[^/.]+$/, '');
+}
+function validateExpressionSpriteName(expression, spriteName) {
+    const filenameValidationRegex = new RegExp(`^${expression}(?:[-\\.].*?)?$`);
+    const validFileName = filenameValidationRegex.test(spriteName);
+    return validFileName;
+}
 async function onClickExpressionUpload(event) {
     // Prevents the expression from being set
     event.stopPropagation();
-    const id = $(this).closest('.expression_list_item').attr('id');
+    const expressionListItem = $(this).closest('.expression_list_item');
+    const clickedFileName = expressionListItem.attr('data-expression-type') !== 'failure' ? expressionListItem.attr('data-filename') : null;
+    const expression = expressionListItem.data('expression');
     const name = $('#image_list').data('name');
     const handleExpressionUploadChange = async (e) => {
         const file = e.target.files[0];
-        if (!file) {
+        if (!file || !file.name) {
+            console.debug('No valid file selected');
+            return;
+        }
+        const existingFiles = spriteCache[name]?.find(x => x.label === expression)?.files || [];
+        let spriteName = expression;
+        if (extension_settings.expressions.allowMultiple) {
+            const matchesExisting = existingFiles.some(x => x.fileName === file.name);
+            const fileNameWithoutExtension = withoutExtension(file.name);
+            const validFileName = validateExpressionSpriteName(expression, fileNameWithoutExtension);
+            // If there is no expression yet and it's a valid expression, we just take it
+            if (!clickedFileName && validFileName) {
+                spriteName = fileNameWithoutExtension;
+            }
+            // If the filename matches the one that was clicked, we just take it and replace it
+            else if (clickedFileName === file.name) {
+                spriteName = fileNameWithoutExtension;
+            }
+            // If it's a valid filename and there's no existing file with the same name, we just take it
+            else if (!matchesExisting && validFileName) {
+                spriteName = fileNameWithoutExtension;
+            }
+            else {
+                /** @type {import('../../popup.js').CustomPopupButton[]} */
+                const customButtons = [];
+                if (clickedFileName) {
+                    customButtons.push({
+                        text: t`Replace Existing`,
+                        result: POPUP_RESULT.NEGATIVE,
+                        action: () => {
+                            console.debug('Replacing existing sprite');
+                            spriteName = withoutExtension(clickedFileName);
+                        },
+                    });
+                }
+                spriteName = null;
+                const suggestedSpriteName = generateUniqueSpriteName(expression, existingFiles);
+                const message = await renderExtensionTemplateAsync(MODULE_NAME, 'templates/upload-expression', { expression, clickedFileName });
+                const input = await Popup.show.input(t`Upload Expression Sprite`, message,
+                    suggestedSpriteName, { customButtons: customButtons });
+                if (input) {
+                    if (!validateExpressionSpriteName(expression, input)) {
+                        toastr.warning(t`The name you entered does not follow the naming schema for the selected expression '${expression}'.`, t`Invalid Expression Sprite Name`);
+                        return;
+                    }
+                    spriteName = input;
+                }
+            }
+        } else {
+            spriteName = withoutExtension(clickedFileName);
+        }
+        if (!spriteName) {
+            toastr.warning(t`Cancelled uploading sprite.`, t`Upload Cancelled`);
+            // Reset the input
+            e.target.form.reset();
             return;
+        }
         const formData = new FormData();
         formData.append('name', name);
-        formData.append('label', id);
+        formData.append('label', expression);
         formData.append('avatar', file);
+        formData.append('spriteName', spriteName);
         await handleFileUpload('/api/sprites/upload', formData);
         // Reset the input
         e.target.form.reset();
-        // In Talkinghead mode, when a new talkinghead image is uploaded, refresh the live char.
-        if (id === 'talkinghead' && isTalkingHeadEnabled() && modules.includes('talkinghead')) {
-            await loadTalkingHead();
-        }
     };
     $('#expression_upload')

         inApiCall = true;
         $('#visual-novel-wrapper').empty();
         await validateImages(overridePath.length === 0 ? currentLastMessage.name : overridePath, true);
+        const name = overridePath.length === 0 ? currentLastMessage.name : overridePath;
         const expression = await getExpressionLabel(currentLastMessage.mes);
-        await sendExpressionCall(overridePath.length === 0 ? currentLastMessage.name : overridePath, expression, true);
+        await sendExpressionCall(name, expression, { force: true });
         forceUpdateVisualNovelMode();
     } catch (error) {
         console.debug(`Setting expression override for ${avatarFileName} failed with error: ${error}`);

         const currentLastMessage = getLastCharacterMessage();
         await validateImages(currentLastMessage.name, true);
         const expression = await getExpressionLabel(currentLastMessage.mes);
-        await sendExpressionCall(currentLastMessage.name, expression, true);
+        await sendExpressionCall(currentLastMessage.name, expression, { force: true });
         forceUpdateVisualNovelMode();
         console.debug(extension_settings.expressionOverrides);

         formData.append('name', name);
         formData.append('avatar', file);
+        const uploadToast = toastr.info('Please wait...', 'Upload is processing', { timeOut: 0, extendedTimeOut: 0 });
         const { count } = await handleFileUpload('/api/sprites/upload-zip', formData);
+        toastr.clear(uploadToast);
         toastr.success(`Uploaded ${count} image(s) for ${name}`);
         // Reset the input
         e.target.form.reset();
-        // In Talkinghead mode, refresh the live char.
-        if (isTalkingHeadEnabled() && modules.includes('talkinghead')) {
-            await loadTalkingHead();
-        }
     };
     $('#expression_upload_pack')

     // Prevents the expression from being set
     event.stopPropagation();
-    const confirmation = await callPopup('<h3>Are you sure?</h3>Once deleted, it\'s gone forever!', 'confirm');
+    const expressionListItem = $(this).closest('.expression_list_item');
+    const expression = expressionListItem.data('expression');
+    if (expressionListItem.attr('data-expression-type') === 'failure') {
+        return;
+    }
+    const confirmation = await Popup.show.confirm(t`Delete Expression`, t`Are you sure you want to delete this expression? Once deleted, it\'s gone forever!`
+        + '<br /><br />'
+        + t`Expression:` + ' <tt>' + expressionListItem.attr('data-filename') + '</tt>');
     if (!confirmation) {
         return;
+    }
-    const id = $(this).closest('.expression_list_item').attr('id');
+    const fileName = withoutExtension(expressionListItem.attr('data-filename'));
     const name = $('#image_list').data('name');
     try {
         await fetch('/api/sprites/delete', {
             method: 'POST',
             headers: getRequestHeaders(),
-            body: JSON.stringify({ name, label: id }),
+            body: JSON.stringify({ name, label: expression, spriteName: fileName }),
         });
     } catch (error) {
         toastr.error('Failed to delete image. Try again later.');

         extension_settings.expressions.llmPrompt = DEFAULT_LLM_PROMPT;
         saveSettingsDebounced();
+    }
+    if (extension_settings.expressions.allowMultiple === undefined) {
+        extension_settings.expressions.allowMultiple = true;
+        saveSettingsDebounced();
+    }
+    if (extension_settings.expressions.showDefault && extension_settings.expressions.fallback_expression !== undefined) {
+        extension_settings.expressions.showDefault = false;
+        saveSettingsDebounced();
+    }
+}
 (async function () {

         const template = await renderExtensionTemplateAsync(MODULE_NAME, 'settings');
         $('#expressions_container').append(template);
         $('#expression_override_button').on('click', onClickExpressionOverrideButton);
-        $('#expressions_show_default').on('input', onExpressionsShowDefaultInput);
         $('#expression_upload_pack_button').on('click', onClickExpressionUploadPackButton);
-        $('#expressions_show_default').prop('checked', extension_settings.expressions.showDefault).trigger('input');
         $('#expression_translate').prop('checked', extension_settings.expressions.translate).on('input', function () {
             extension_settings.expressions.translate = !!$(this).prop('checked');
             saveSettingsDebounced();
         });
+        $('#expressions_allow_multiple').prop('checked', extension_settings.expressions.allowMultiple).on('input', function () {
+            extension_settings.expressions.allowMultiple = !!$(this).prop('checked');
+            saveSettingsDebounced();
+        });
+        $('#expressions_reroll_if_same').prop('checked', extension_settings.expressions.rerollIfSame).on('input', function () {
+            extension_settings.expressions.rerollIfSame = !!$(this).prop('checked');
+            saveSettingsDebounced();
+        });
         $('#expression_override_cleanup_button').on('click', onClickExpressionOverrideRemoveAllButton);
         $(document).on('dragstart', '.expression', (e) => {
             e.preventDefault();

         $(document).on('click', '.expression_list_item', onClickExpressionImage);
         $(document).on('click', '.expression_list_upload', onClickExpressionUpload);
         $(document).on('click', '.expression_list_delete', onClickExpressionDelete);
-        $(window).on('resize', updateVisualNovelModeDebounced);
+        $(window).on('resize', () => updateVisualNovelModeDebounced());
         $('#open_chat_expressions').hide();
-        $('#image_type_toggle').on('click', function () {
-            if (this instanceof HTMLInputElement) {
-                setTalkingHeadState(this.checked);
-            }
-        });
         await renderAdditionalExpressionSettings();
         $('#expression_api').val(extension_settings.expressions.api ?? EXPRESSION_API.extras);
         $('.expression_llm_prompt_block').toggle([EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(extension_settings.expressions.api));
         $('#expression_llm_prompt').val(extension_settings.expressions.llmPrompt ?? '');
         $('#expression_llm_prompt').on('input', function () {
-            extension_settings.expressions.llmPrompt = $(this).val();
+            extension_settings.expressions.llmPrompt = String($(this).val());
             saveSettingsDebounced();
         });
         $('#expression_llm_prompt_restore').on('click', function () {

         $('#expression_api').on('change', onExpressionApiChanged);
+    }
-    // Pause Talkinghead to save resources when the ST tab is not visible or the window is minimized.
-    // We currently do this via loading/unloading. Could be improved by adding new pause/unpause endpoints to Extras.
-    document.addEventListener('visibilitychange', function (event) {
-        let pageIsVisible;
-        if (document.hidden) {
-            console.debug('expressions: SillyTavern is now hidden');
-            pageIsVisible = false;
-        } else {
-            console.debug('expressions: SillyTavern is now visible');
-            pageIsVisible = true;
-        }
-        if (isTalkingHeadEnabled() && modules.includes('talkinghead')) {
-            isTalkingHeadAvailable().then(result => {
-                if (result) {
-                    if (pageIsVisible) {
-                        loadTalkingHead();
-                    } else {
-                        unloadTalkingHead();
-                    }
-                    handleImageChange(); // Change image as needed
-                } else {
-                    //console.log("talkinghead does not exist.");
-                }
-            });
-        }
-    });
     addExpressionImage();
     addVisualNovelMode();
     migrateSettings();

     const updateFunction = wrapper.update.bind(wrapper);
     setInterval(updateFunction, UPDATE_INTERVAL);
     moduleWorker();
-    // For setting the Talkinghead talking animation on/off quickly enough for realtime use, we need another timer on a shorter schedule.
-    const wrapperTalkingState = new ModuleWorkerWrapper(updateTalkingState);
-    const updateTalkingStateFunction = wrapperTalkingState.update.bind(wrapperTalkingState);
-    setInterval(updateTalkingStateFunction, TALKINGCHECK_UPDATE_INTERVAL);
-    updateTalkingState();
     dragElement($('#expression-holder'));
     eventSource.on(event_types.CHAT_CHANGED, () => {
         // character changed

             imgElement.src = '';
+        }
-        //set checkbox to global var
-        $('#image_type_toggle').prop('checked', extension_settings.expressions.talkinghead);
-        if (extension_settings.expressions.talkinghead) {
-            setTalkingHeadState(extension_settings.expressions.talkinghead);
-        }
         setExpressionOverrideHtml();
         if (isVisualNovelMode()) {
             $('#visual-novel-wrapper').empty();
+        }
-        updateFunction();
+        updateFunction({ newChat: true });
     });
     eventSource.on(event_types.MOVABLE_PANELS_RESET, updateVisualNovelModeDebounced);
     eventSource.on(event_types.GROUP_UPDATED, updateVisualNovelModeDebounced);
-    eventSource.on(event_types.EXTRAS_CONNECTED, () => {
-        if (extension_settings.expressions.talkinghead) {
-            setTalkingHeadState(extension_settings.expressions.talkinghead);
-        }
-    });
     const localEnumProviders = {
-        expressions: () => getCachedExpressions().map(expression => {
+        expressions: () => {
+            const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
+            const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
+            const expressions = getCachedExpressions();
+            return expressions.map(expression => {
+                const spriteCount = spriteCache[spriteFolderName]?.find(x => x.label === expression)?.files.length ?? 0;
                 const isCustom = extension_settings.expressions.custom?.includes(expression);
-            return new SlashCommandEnumValue(expression, null, isCustom ? enumTypes.name : enumTypes.enum, isCustom ? 'C' : 'D');
+                const subtitle = spriteCount == 0 ? '❌ No sprites available for this expression' :
-        }),
+                    spriteCount > 1 ? `${spriteCount} sprites` : null;
+                return new SlashCommandEnumValue(expression,
+                    subtitle,
+                    isCustom ? enumTypes.name : enumTypes.enum,
+                    isCustom ? 'C' : 'D');
+            });
+        },
+        sprites: () => {
+            const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
+            const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
+            const sprites = spriteCache[spriteFolderName]?.map(x => x.files)?.flat() ?? [];
+            return sprites.map(x => {
+                return new SlashCommandEnumValue(x.title,
+                    x.title !== x.expression ? x.expression : null,
+                    x.isCustom ? enumTypes.name : enumTypes.enum,
+                    x.isCustom ? 'C' : 'D');
+            });
+        },
     };
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'sprite',
+        name: 'expression-set',
-        aliases: ['emote'],
+        aliases: ['sprite', 'emote'],
         callback: setSpriteSlashCommand,
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'type',
+                description: 'Whether to set an expression or a specific sprite.',
+                typeList: [ARGUMENT_TYPE.STRING],
+                isRequired: false,
+                defaultValue: 'expression',
+                enumList: ['expression', 'sprite'],
+            }),
+        ],
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({
-                description: 'spriteId',
+                description: 'expression label to set',
                 typeList: [ARGUMENT_TYPE.STRING],
                 isRequired: true,
-                enumProvider: localEnumProviders.expressions,
+                enumProvider: (executor, _) => {
+                    // Check if command is used to set a sprite, then use those enums
+                    const type = executor.namedArgumentList.find(it => it.name == 'type')?.value || 'expression';
+                    if (type == 'sprite') return localEnumProviders.sprites();
+                    else return [
+                        ...localEnumProviders.expressions(),
+                        new SlashCommandEnumValue(RESET_SPRITE_LABEL, 'Resets the expression (to either default or no sprite)', enumTypes.enum, '❌'),
+                    ];
+                },
             }),
         ],
-        helpString: 'Force sets the sprite for the current character.',
+        helpString: 'Force sets the expression for the current character.',
-        returns: 'the currently set sprite label after setting it.',
+        returns: 'The currently set expression label after setting it.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'spriteoverride',
+        name: 'expression-folder-override',
-        aliases: ['costume'],
+        aliases: ['spriteoverride', 'costume'],
-        callback: setSpriteSetCommand,
+        callback: setSpriteFolderCommand,
         unnamedArgumentList: [
             new SlashCommandArgument(
                 'optional folder', [ARGUMENT_TYPE.STRING], false,
             ),
         ],
-        helpString: 'Sets an override sprite folder for the current character. If the name starts with a slash or a backslash, selects a sub-folder in the character-named folder. Empty value to reset to default.',
+        helpString: `
+            <div>
+                Sets an override sprite folder for the current character.<br />
+                In groups, this will apply to the character who last sent a message.
+            </div>
+            <div>
+                If the name starts with a slash or a backslash, selects a sub-folder in the character-named folder. Empty value to reset to default.
+            </div>
+        `,
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'lastsprite',
+        name: 'expression-last',
-        callback: (_, name) => {
+        aliases: ['lastsprite'],
+        /** @type {(args: object, name: string) => Promise<string>} */
+        callback: async (_, name) => {
             if (typeof name !== 'string') throw new Error('name must be a string');
+            if (!name) {
+                if (selected_group) {
+                    toastr.error(t`In group chats, you must specify a character name.`, t`No character name specified`);
+                    return '';
+                }
+                name = characters[this_chid]?.avatar;
+            }
             const char = findChar({ name: name });
+            if (!char) toastr.warning(t`Couldn't find character ${name}.`, t`Character not found`);
             const sprite = lastExpression[char?.name ?? name] ?? '';
             return sprite;
         },
-        returns: 'the last set sprite / expression for the named character.',
+        returns: 'the last set expression for the named character.',
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({
-                description: 'Character name - or unique character identifier (avatar key)',
+                description: 'Character name - or unique character identifier (avatar key). If not provided, the current character for this chat will be used (does not work in group chats)',
                 typeList: [ARGUMENT_TYPE.STRING],
-                isRequired: true,
                 enumProvider: commonEnumProviders.characters('character'),
             }),
         ],
-        helpString: 'Returns the last set sprite / expression for the named character.',
+        helpString: 'Returns the last set expression for the named character.',
-    }));
-    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'th',
-        callback: toggleTalkingHeadCommand,
-        aliases: ['talkinghead'],
-        helpString: 'Character Expressions: toggles <i>Image Type - talkinghead (extras)</i> on/off.',
-        returns: 'the current state of the <i>Image Type - talkinghead (extras)</i> on/off.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'classify-expressions',
+        name: 'expression-list',
         aliases: ['expressions'],
+        /** @type {(args: {return: string}) => Promise<string>} */
         callback: async (args) => {
+            let returnType =
                 /** @type {import('../../slash-commands/SlashCommandReturnHelper.js').SlashCommandReturnType} */
-            // @ts-ignore
+                (args.return);
-            let returnType = args.return;
-            // Old legacy return type handling
-            if (args.format) {
-                toastr.warning(`Legacy argument 'format' with value '${args.format}' is deprecated. Please use 'return' instead. Routing to the correct return type...`, 'Deprecation warning');
-                const type = String(args?.format).toLowerCase().trim();
-                switch (type) {
-                    case 'json':
-                        returnType = 'object';
-                        break;
-                    default:
-                        returnType = 'pipe';
-                        break;
-                }
-            }
-            // Now the actual new return type handling
             const list = await getExpressionsList();
             return await slashCommandReturnHelper.doReturn(returnType ?? 'pipe', list, { objectToStringFunc: list => list.join(', ') });

                 enumList: slashCommandReturnHelper.enumList({ allowObject: true }),
                 forceEnum: true,
             }),
-            // TODO remove some day
-            SlashCommandNamedArgument.fromProps({
-                name: 'format',
-                description: '!!! DEPRECATED - use "return" instead !!! The format to return the list in: comma-separated plain text or JSON array. Default is plain text.',
-                typeList: [ARGUMENT_TYPE.STRING],
-                enumList: [
-                    new SlashCommandEnumValue('plain', null, enumTypes.enum, ', '),
-                    new SlashCommandEnumValue('json', null, enumTypes.enum, '[]'),
-                ],
-            }),
         ],
         returns: 'The comma-separated list of available expressions, including custom expressions.',
         helpString: 'Returns a list of available expressions, including custom expressions.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'classify',
+        name: 'expression-classify',
+        aliases: ['classify'],
         callback: classifyCallback,
         namedArgumentList: [
             SlashCommandNamedArgument.fromProps({

         `,
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'uploadsprite',
+        name: 'expression-upload',
+        aliases: ['uploadsprite'],
+        /** @type {(args: {name: string, label: string, folder: string?, spriteName: string?}, url: string) => Promise<string>} */
         callback: async (args, url) => {
-            await uploadSpriteCommand(args, url);
+            return await uploadSpriteCommand(args, url);
-            return '';
         },
+        returns: 'the resulting sprite name',
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({
                 description: 'URL of the image to upload',

                 description: 'Character name or avatar key (default is current character)',
                 typeList: [ARGUMENT_TYPE.STRING],
                 isRequired: false,
-                acceptsMultiple: false,
             }),
             SlashCommandNamedArgument.fromProps({
                 name: 'label',

                 typeList: [ARGUMENT_TYPE.STRING],
                 enumProvider: localEnumProviders.expressions,
                 isRequired: true,
-                acceptsMultiple: false,
             }),
             SlashCommandNamedArgument.fromProps({
                 name: 'folder',
                 description: 'Override folder to upload into',
                 typeList: [ARGUMENT_TYPE.STRING],
                 isRequired: false,
-                acceptsMultiple: false,
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'spriteName',
+                description: 'Override sprite name to allow multiple sprites per expressions. Has to follow the naming pattern. If unspecified, the label will be used as sprite name.',
+                typeList: [ARGUMENT_TYPE.STRING],
+                isRequired: false,
             }),
         ],
-        helpString: '<div>Upload a sprite from a URL.</div><div>Example:</div><pre><code>/uploadsprite name=Seraphina label=joy /user/images/Seraphina/Seraphina_2024-12-22@12h37m57s.png</code></pre>',
+        helpString: `
+            <div>
+                Upload a sprite from a URL.
+            </div>
+            <div>
+                <strong>Example:</strong>
+                <ul>
+                    <li>
+                        <pre><code>/uploadsprite name=Seraphina label=joy /user/images/Seraphina/Seraphina_2024-12-22@12h37m57s.png</code></pre>
+                    </li>
+                </ul>
+            </div>
+        `,
     }));
 })();

public/scripts/extensions/expressions/list-item.html+9 -5 Viewed

-<div id="{{item}}" class="expression_list_item">
+{{#each images}}
+<div class="expression_list_item interactable" data-expression="{{../expression}}" data-expression-type="{{this.type}}" data-filename="{{this.fileName}}">
     <div class="expression_list_buttons">
         <div class="menu_button expression_list_upload" title="Upload image">
             <i class="fa-solid fa-upload"></i>

             <i class="fa-solid fa-trash"></i>
         </div>
     </div>
-    <div class="expression_list_title {{textClass}}">
+    <div class="expression_list_title">
-        <span>{{item}}</span>
+        <span>{{../expression}}</span>
-        {{#if isCustom}}
+        {{#if ../isCustom}}
             <small class="expression_list_custom">(custom)</small>
         {{/if}}
     </div>
-    <img class="expression_list_image" src="{{imageSrc}}" />
+    <div class="expression_list_image_container" title="{{this.title}}">
+        <img class="expression_list_image" src="{{this.imageSrc}}" alt="{{this.title}}" data-epression="{{../expression}}" />
     </div>
+</div>
+{{/each}}

public/scripts/extensions/expressions/settings.html+21 -9 Viewed

         </div>
         <div class="inline-drawer-content">
-            <label class="checkbox_label" for="expression_translate" title="Use the selected API from Chat Translation extension settings.">
+            <label class="checkbox_label" for="expression_translate" title="Use the selected API from Chat Translation extension settings." data-i18n="[title]Use the selected API from Chat Translation extension settings.">
                 <input id="expression_translate" type="checkbox">
                 <span data-i18n="Translate text to English before classification">Translate text to English before classification</span>
             </label>
-            <label class="checkbox_label" for="expressions_show_default">
+            <label class="checkbox_label" for="expressions_allow_multiple" title="A single expression can have multiple sprites. Whenever the expression is chosen, a random sprite for this expression will be selected." data-i18n="[title]A single expression can have multiple sprites. Whenever the expression is chosen, a random sprite for this expression will be selected.">
-                <input id="expressions_show_default" type="checkbox">
+                <input id="expressions_allow_multiple" type="checkbox">
-                <span data-i18n="Show default images (emojis) if sprite missing">Show default images (emojis) if sprite missing</span>
+                <span data-i18n="Allow multiple sprites per expression">Allow multiple sprites per expression</span>
             </label>
-            <label id="image_type_block" class="checkbox_label" for="image_type_toggle">
+            <label class="checkbox_label" for="expressions_reroll_if_same" title="If the same expression is used again, re-roll the sprite. This only applies to expressions that have multiple available sprites assigned." data-i18n="[title]If the same expression is used again, re-roll the sprite. This only applies to expressions that have multiple available sprites assigned.">
-                <input id="image_type_toggle" type="checkbox">
+                <input id="expressions_reroll_if_same" type="checkbox">
-                <span data-i18n="Image Type - talkinghead (extras)">Image Type - talkinghead (extras)</span>
+                <span data-i18n="Re-roll if same expression is used again">Re-roll if same sprite is used again</span>
             </label>
             <div class="expression_api_block m-b-1 m-t-1">
                 <label for="expression_api" data-i18n="Classifier API">Classifier API</label>

                         <span data-i18n="Remove all image overrides">Remove all image overrides</span>
                     </div>
                 </div>
-                <p class="hint"><b data-i18n="Hint:">Hint:</b> <i><span data-i18n="Create new folder in the _space">Create new folder in the </span><b>/characters/</b> <span data-i18n="folder of your user data directory and name it as the name of the character.">folder of your user data directory and name it as the name of the character.</span>
+                <p class="hint">
-                <span data-i18n="Put images with expressions there. File names should follow the pattern:">Put images with expressions there. File names should follow the pattern: </span><tt data-i18n="expression_label_pattern">[expression_label].[image_format]</tt></i></p>
+                    <b data-i18n="Hint:">Hint:</b>
+                    <i>
+                        <span data-i18n="Create new folder in the _space">Create new folder in the </span><b>/characters/</b> <span data-i18n="folder of your user data directory and name it as the name of the character.">folder of your user data directory and name it as the name of the character.</span>
+                        <span data-i18n="Put images with expressions there. File names should follow the pattern:">Put images with expressions there. File names should follow the pattern: </span><tt data-i18n="expression_label_pattern">[expression_label].[image_format]</tt>
+                    </i>
+                </p>
+                <p>
+                    <i>
+                        <span>In case of multiple files per expression, file names can contain a suffix, either separated by a dot or a
+                            dash.
+                            Examples: </span><tt>joy.png</tt>, <tt>joy-1.png</tt>, <tt>joy.expressive.png</tt>
+                    </i>
+                </p>
                 <h3 id="image_list_header">
                     <strong data-i18n="Sprite set:">Sprite set:</strong>&nbsp;<span id="image_list_header_name"></span>
                 </h3>

public/scripts/extensions/expressions/style.css+31 -2 Viewed

     justify-content: center;
+}
+.expression_list_image_container {
+    overflow: hidden;
+}
 .expression_list_title {
     position: absolute;
     bottom: 0;

     flex-direction: column;
     line-height: 1;
+}
+.expression_list_custom {
+    font-size: 0.66rem;
+}
 .expression_list_buttons {
     position: absolute;

     row-gap: 1rem;
+}
-#image_list .success {
+#image_list .expression_list_item[data-expression-type="success"] .expression_list_title {
     color: green;
+}
-#image_list .failure {
+#image_list .expression_list_item[data-expression-type="additional"] .expression_list_title {
+    color: darkolivegreen;
+}
+#image_list .expression_list_item[data-expression-type="additional"] .expression_list_title::before {
+    content: '➕';
+    position: absolute;
+    top: -7px;
+    left: -9px;
+    font-size: 14px;
+    color: transparent;
+    text-shadow: 0 0 0 darkolivegreen;
+}
+#image_list .expression_list_item[data-expression-type="failure"] .expression_list_title {
     color: red;
+}

     flex-direction: row;
+}
+#expressions_container:has(#expressions_allow_multiple:not(:checked)) #image_list .expression_list_item[data-expression-type="additional"],
+#expressions_container:has(#expressions_allow_multiple:not(:checked)) label[for="expressions_reroll_if_same"] {
+    opacity: 0.3;
+    transition: opacity var(--animation-duration) ease;
+}
+#expressions_container:has(#expressions_allow_multiple:not(:checked)) #image_list .expression_list_item[data-expression-type="additional"]:hover,
+#expressions_container:has(#expressions_allow_multiple:not(:checked)) #image_list .expression_list_item[data-expression-type="additional"]:focus {
+    opacity: unset;
+}

public/scripts/extensions/expressions/templates/upload-expression.html+12 -0 Viewed

+<div class="m-b-1" data-i18n="upload_expression_request">Please enter a name for the sprite (without extension).</div>
+<div class="m-b-1" data-i18n="upload_expression_naming_1">
+    Sprite names must follow the naming schema for the selected expression: {{expression}}
+</div>
+<div data-i18n="upload_expression_naming_2">
+    For multiple expressions, the name must follow the expression name and a valid suffix. Allowed separators are '-' or dot '.'.
+</div>
+<span class="m-b-1" data-i18n="Examples:">Examples:</span> <tt>{{expression}}.png</tt>, <tt>{{expression}}-1.png</tt>, <tt>{{expression}}.expressive.png</tt>
+{{#if clickedFileName}}
+<div class="m-t-1" data-i18n="upload_expression_replace">Click 'Replace' to replace the existing expression:</div>
+<tt>{{clickedFileName}}</tt>
+{{/if}}

public/scripts/extensions/token-counter/index.js+6 -20 Viewed

 import { resetScrollHeight, debounce } from '../../utils.js';
 import { debounce_timeout } from '../../constants.js';
 import { POPUP_TYPE, callGenericPopup } from '../../popup.js';
+import { renderExtensionTemplateAsync } from '../../extensions.js';
+import { t } from '../../i18n.js';
 function rgb2hex(rgb) {
     rgb = rgb.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);

 async function doTokenCounter() {
     const { tokenizerName, tokenizerId } = getFriendlyTokenizerName(main_api);
-    const html = `
+    const html = await renderExtensionTemplateAsync('token-counter', 'window', {tokenizerName});
-    <div class="wide100p">
-        <h3>Token Counter</h3>
-        <div class="justifyLeft flex-container flexFlowColumn">
-            <h4>Type / paste in the box below to see the number of tokens in the text.</h4>
-            <p>Selected tokenizer: ${tokenizerName}</p>
-            <div>Input:</div>
-            <textarea id="token_counter_textarea" class="wide100p textarea_compact" rows="1"></textarea>
-            <div>Tokens: <span id="token_counter_result">0</span></div>
-            <hr>
-            <div>Tokenized text:</div>
-            <div id="tokenized_chunks_display" class="wide100p">—</div>
-            <hr>
-            <div>Token IDs:</div>
-            <textarea id="token_counter_ids" class="wide100p textarea_compact" readonly rows="1">—</textarea>
-        </div>
-    </div>`;
     const dialog = $(html);
     const countDebounced = debounce(async () => {

 jQuery(() => {
     const buttonHtml = `
         <div id="token_counter" class="list-group-item flex-container flexGap5">
-            <div class="fa-solid fa-1 extensionsMenuExtensionButton" /></div>
+            <div class="fa-solid fa-1 extensionsMenuExtensionButton" /></div>` +
-            Token Counter
+            t`Token Counter` +
-        </div>`;
+        '</div>';
     $('#token_counter_wand_container').append(buttonHtml);
     $('#token_counter').on('click', doTokenCounter);
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({

public/scripts/extensions/token-counter/window.html+16 -0 Viewed

+<div class="wide100p">
+    <h3 data-i18n="Token Counter">Token Counter</h3>
+    <div class="justifyLeft flex-container flexFlowColumn">
+        <h4 data-i18n="Type / paste in the box below to see the number of tokens in the text.">Type / paste in the box below to see the number of tokens in the text.</h4>
+        <p><span data-i18n="Selected tokenizer:">Selected tokenizer:</span> {{tokenizerName}}</p>
+        <div data-i18n="Input:">Input:</div>
+        <textarea id="token_counter_textarea" class="wide100p textarea_compact" rows="1"></textarea>
+        <div><span data-i18n="Tokens:">Tokens:</span> <span id="token_counter_result">0</span></div>
+        <hr>
+        <div data-i18n="Tokenized text:">Tokenized text:</div>
+        <div id="tokenized_chunks_display" class="wide100p">—</div>
+        <hr>
+        <div data-i18n="Token IDs:">Token IDs:</div>
+        <textarea id="token_counter_ids" class="wide100p textarea_compact" readonly rows="1">—</textarea>
+    </div>
+</div>
 \ No newline at end of file

public/scripts/extensions/translate/index.js+1 -1 Viewed

 const handleImpersonateReady = createEventHandler(translateImpersonate, () => shouldTranslate(incomingTypes));
 const handleMessageEdit = createEventHandler(translateMessageEdit, () => true);
-window['translate'] = translate;
+globalThis.translate = translate;
 jQuery(async () => {
     const html = await renderExtensionTemplateAsync('translate', 'index');

public/scripts/extensions/tts/index.js+0 -26 Viewed

 import { enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 import { POPUP_TYPE, callGenericPopup } from '../../popup.js';
 import { GoogleTranslateTtsProvider } from './google-translate.js';
-export { talkingAnimation };
 const UPDATE_INTERVAL = 1000;
 const wrapper = new ModuleWorkerWrapper(moduleWorker);
 let voiceMapEntries = [];
 let voiceMap = {}; // {charName:voiceid, charName2:voiceid2}
-let talkingHeadState = false;
 let lastChatId = null;
 let lastMessage = null;
 let lastMessageHash = null;

     updateUiAudioPlayState();
+}
-function talkingAnimation(switchValue) {
-    if (!modules.includes('talkinghead')) {
-        console.debug('Talking Animation module not loaded');
-        return;
-    }
-    const apiUrl = getApiUrl();
-    const animationType = switchValue ? 'start' : 'stop';
-    if (switchValue !== talkingHeadState) {
-        try {
-            console.log(animationType + ' Talking Animation');
-            doExtrasFetch(`${apiUrl}/api/talkinghead/${animationType}_talking`);
-            talkingHeadState = switchValue;
-        } catch (error) {
-            // Handle the error here or simply ignore it to prevent logging
-        }
-    }
-    updateUiAudioPlayState();
-}
 function resetTtsPlayback() {
     // Stop system TTS utterance
     cancelTtsPlay();

     // Not pausing, doing a full stop to anything TTS is doing. Better UX as pause is not as useful
     if (!audioElement.paused || isTtsProcessing()) {
         resetTtsPlayback();
-        talkingAnimation(false);
     } else {
         // Default play behavior if not processing or playing is to play the last message.
         processAndQueueTtsMessage(context.chat[context.chat.length - 1]);

 function completeCurrentAudioJob() {
     audioQueueProcessorReady = true;
     currentAudioJob = null;
-    talkingAnimation(false); //stop lip animation
     // updateUiPlayState();
     wrapper.update();
+}

         audioQueueProcessorReady = false;
         currentAudioJob = audioJobQueue.shift();
         playAudioData(currentAudioJob);
-        talkingAnimation(true);
     } catch (error) {
         toastr.error(error.toString());
         console.error(error);

public/scripts/extensions/tts/openai-compatible.js+3 -3 Viewed

         <label for="openai_compatible_tts_endpoint">Provider Endpoint:</label>
         <div class="flex-container alignItemsCenter">
             <div class="flex1">
-                <input id="openai_compatible_tts_endpoint" type="text" class="text_pole" maxlength="250" value="${this.defaultSettings.provider_endpoint}"/>
+                <input id="openai_compatible_tts_endpoint" type="text" class="text_pole" maxlength="500" value="${this.defaultSettings.provider_endpoint}"/>
             </div>
             <div id="openai_compatible_tts_key" class="menu_button menu_button_icon">
                 <i class="fa-solid fa-key"></i>

             </div>
         </div>
         <label for="openai_compatible_model">Model:</label>
-        <input id="openai_compatible_model" type="text" class="text_pole" maxlength="250" value="${this.defaultSettings.model}"/>
+        <input id="openai_compatible_model" type="text" class="text_pole" maxlength="500" value="${this.defaultSettings.model}"/>
         <label for="openai_compatible_tts_voices">Available Voices (comma separated):</label>
-        <input id="openai_compatible_tts_voices" type="text" class="text_pole" maxlength="250" value="${this.defaultSettings.available_voices.join()}"/>
+        <input id="openai_compatible_tts_voices" type="text" class="text_pole" value="${this.defaultSettings.available_voices.join()}"/>
         <label for="openai_compatible_tts_speed">Speed: <span id="openai_compatible_tts_speed_output"></span></label>
         <input type="range" id="openai_compatible_tts_speed" value="1" min="0.25" max="4" step="0.05">`;
         return html;

public/scripts/extensions/tts/system.js+0 -3 Viewed

 import { isMobile } from '../../RossAscends-mods.js';
 import { getPreviewString } from './index.js';
-import { talkingAnimation } from './index.js';
 import { saveTtsProviderSettings } from './index.js';
 export { SystemTtsProvider };

     //placing the speak invocation inside a callback fixes ordering and onend issues.
     setTimeout(function () {
         speechSynthesis.speak(newUtt);
-        talkingAnimation(true);
     }, 0);
 };

                 //some code to execute when done
                 resolve(silence);
                 console.log('System TTS done');
-                talkingAnimation(false);
             });
         });
+    }

public/scripts/extensions/vectors/index.js+58 -64 Viewed

  */
 async function vectorizeFile(fileText, fileName, collectionId, chunkSize, overlapPercent) {
     try {
-        if (settings.translate_files && typeof window['translate'] === 'function') {
+        if (settings.translate_files && typeof globalThis.translate === 'function') {
             console.log(`Vectors: Translating file ${fileName} to English...`);
-            const translatedText = await window['translate'](fileText, 'en');
+            const translatedText = await globalThis.translate(fileText, 'en');
             fileText = translatedText;
+        }

+}
 /**
- * Gets the saved hashes for a collection
+ * Gets common body parameters for vector requests.
-* @param {string} collectionId
+ * @returns {object}
-* @returns {Promise<number[]>} Saved hashes
  */
-async function getSavedHashes(collectionId) {
+function getVectorsRequestBody() {
-    const response = await fetch('/api/vector/list', {
+    const body = {};
-        method: 'POST',
-        headers: getVectorHeaders(),
-        body: JSON.stringify({
-            collectionId: collectionId,
-            source: settings.source,
-        }),
-    });
-    if (!response.ok) {
-        throw new Error(`Failed to get saved hashes for collection ${collectionId}`);
-    }
-    const hashes = await response.json();
-    return hashes;
-}
-function getVectorHeaders() {
-    const headers = getRequestHeaders();
     switch (settings.source) {
         case 'extras':
-            Object.assign(headers, {
+            body.extrasUrl =  extension_settings.apiUrl;
-                'X-Extras-Url': extension_settings.apiUrl,
+            body.extrasKey =  extension_settings.apiKey;
-                'X-Extras-Key': extension_settings.apiKey,
-            });
             break;
         case 'togetherai':
-            Object.assign(headers, {
+            body.model = extension_settings.vectors.togetherai_model;
-                'X-Togetherai-Model': extension_settings.vectors.togetherai_model,
-            });
             break;
         case 'openai':
-            Object.assign(headers, {
+            body.model = extension_settings.vectors.openai_model;
-                'X-OpenAI-Model': extension_settings.vectors.openai_model,
-            });
             break;
         case 'cohere':
-            Object.assign(headers, {
+            body.model = extension_settings.vectors.cohere_model;
-                'X-Cohere-Model': extension_settings.vectors.cohere_model,
-            });
             break;
         case 'ollama':
-            Object.assign(headers, {
+            body.model = extension_settings.vectors.ollama_model;
-                'X-Ollama-Model': extension_settings.vectors.ollama_model,
+            body.apiUrl = textgenerationwebui_settings.server_urls[textgen_types.OLLAMA];
-                'X-Ollama-URL': textgenerationwebui_settings.server_urls[textgen_types.OLLAMA],
+            body.keep = !!extension_settings.vectors.ollama_keep;
-                'X-Ollama-Keep': !!extension_settings.vectors.ollama_keep,
-            });
             break;
         case 'llamacpp':
-            Object.assign(headers, {
+            body.apiUrl = textgenerationwebui_settings.server_urls[textgen_types.LLAMACPP];
-                'X-LlamaCpp-URL': textgenerationwebui_settings.server_urls[textgen_types.LLAMACPP],
-            });
             break;
         case 'vllm':
-            Object.assign(headers, {
+            body.apiUrl = textgenerationwebui_settings.server_urls[textgen_types.VLLM];
-                'X-Vllm-URL': textgenerationwebui_settings.server_urls[textgen_types.VLLM],
+            body.model = extension_settings.vectors.vllm_model;
-                'X-Vllm-Model': extension_settings.vectors.vllm_model,
-            });
             break;
         default:
             break;
+    }
-    return headers;
+    return body;
+}
+/**
+ * Gets the saved hashes for a collection
+* @param {string} collectionId
+* @returns {Promise<number[]>} Saved hashes
+*/
+async function getSavedHashes(collectionId) {
+    const response = await fetch('/api/vector/list', {
+        method: 'POST',
+        headers: getRequestHeaders(),
+        body: JSON.stringify({
+            ...getVectorsRequestBody(),
+            collectionId: collectionId,
+            source: settings.source,
+        }),
+    });
+    if (!response.ok) {
+        throw new Error(`Failed to get saved hashes for collection ${collectionId}`);
+    }
+    const hashes = await response.json();
+    return hashes;
+}
 /**

 async function insertVectorItems(collectionId, items) {
     throwIfSourceInvalid();
-    const headers = getVectorHeaders();
     const response = await fetch('/api/vector/insert', {
         method: 'POST',
-        headers: headers,
+        headers: getRequestHeaders(),
         body: JSON.stringify({
+            ...getVectorsRequestBody(),
             collectionId: collectionId,
             items: items,
             source: settings.source,

 async function deleteVectorItems(collectionId, hashes) {
     const response = await fetch('/api/vector/delete', {
         method: 'POST',
-        headers: getVectorHeaders(),
+        headers: getRequestHeaders(),
         body: JSON.stringify({
+            ...getVectorsRequestBody(),
             collectionId: collectionId,
             hashes: hashes,
             source: settings.source,

  * @returns {Promise<{ hashes: number[], metadata: object[]}>} - Hashes of the results
  */
 async function queryCollection(collectionId, searchText, topK) {
-    const headers = getVectorHeaders();
     const response = await fetch('/api/vector/query', {
         method: 'POST',
-        headers: headers,
+        headers: getRequestHeaders(),
         body: JSON.stringify({
+            ...getVectorsRequestBody(),
             collectionId: collectionId,
             searchText: searchText,
             topK: topK,

  * @returns {Promise<Record<string, { hashes: number[], metadata: object[] }>>} - Results mapped to collection IDs
  */
 async function queryMultipleCollections(collectionIds, searchText, topK, threshold) {
-    const headers = getVectorHeaders();
     const response = await fetch('/api/vector/query-multi', {
         method: 'POST',
-        headers: headers,
+        headers: getRequestHeaders(),
         body: JSON.stringify({
+            ...getVectorsRequestBody(),
             collectionIds: collectionIds,
             searchText: searchText,
             topK: topK,

         const response = await fetch('/api/vector/purge', {
             method: 'POST',
-            headers: getVectorHeaders(),
+            headers: getRequestHeaders(),
             body: JSON.stringify({
+                ...getVectorsRequestBody(),
                 collectionId: collectionId,
             }),
         });

         const response = await fetch('/api/vector/purge', {
             method: 'POST',
-            headers: getVectorHeaders(),
+            headers: getRequestHeaders(),
             body: JSON.stringify({
+                ...getVectorsRequestBody(),
                 collectionId: collectionId,
             }),
         });

     try {
         const response = await fetch('/api/vector/purge-all', {
             method: 'POST',
-            headers: getVectorHeaders(),
+            headers: getRequestHeaders(),
+            body: JSON.stringify({
+                ...getVectorsRequestBody(),
+            }),
         });
         if (!response.ok) {

public/scripts/group-chats.js+5 -2 Viewed

 export async function openGroupById(groupId) {
     if (isChatSaving) {
         toastr.info(t`Please wait until the chat is saved before switching characters.`, t`Your chat is still saving...`);
-        return;
+        return false;
+    }
     if (!groups.find(x => x.id === groupId)) {
         console.log('Group not found', groupId);
-        return;
+        return false;
+    }
     if (!is_send_press && !is_group_generating) {

@@ -1686,8 +1686,11 @@ export async function openGroupById(groupId) {
1686	updateChatMetadata({}, true);	1686	updateChatMetadata({}, true);
1687	chat.length = 0;	1687	chat.length = 0;
1688	await getGroupChat(groupId);	1688	await getGroupChat(groupId);
		1689	return true;
1689	}	1690	}
1690	}	1691	}
		1692
		1693	return false;
1691	}	1694	}
1692		1695
1693	function openCharacterDefinition(characterSelect) {	1696	function openCharacterDefinition(characterSelect) {

public/scripts/openai.js+45 -28 Viewed

             state.reasoning += (data.choices?.filter(x => x?.delta?.reasoning)?.[0]?.delta?.reasoning || '');
+        }
         return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
+    } else if (oai_settings.chat_completion_source === chat_completion_sources.CUSTOM) {
+        if (oai_settings.show_thoughts) {
+            state.reasoning +=
+                data.choices?.filter(x => x?.delta?.reasoning_content)?.[0]?.delta?.reasoning_content ??
+                data.choices?.filter(x => x?.delta?.reasoning)?.[0]?.delta?.reasoning ??
+                '';
+        }
+        return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
     } else {
         return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
+    }

+    }
+}
+/**
+ * Get the maximum context size for the Groq model
+ * @param {string} model Model identifier
+ * @param {boolean} isUnlocked Whether context limits are unlocked
+ * @returns {number} Maximum context size in tokens
+ */
+function getGroqMaxContext(model, isUnlocked) {
+    if (isUnlocked) {
+        return unlocked_max;
+    }
+    const contextMap = {
+        'gemma2-9b-it': max_8k,
+        'llama-3.3-70b-versatile': max_128k,
+        'llama-3.1-8b-instant': max_128k,
+        'llama3-70b-8192': max_8k,
+        'llama3-8b-8192': max_8k,
+        'llama-guard-3-8b': max_8k,
+        'mixtral-8x7b-32768': max_32k,
+        'deepseek-r1-distill-llama-70b': max_128k,
+        'llama-3.3-70b-specdec': max_8k,
+        'llama-3.2-1b-preview': max_128k,
+        'llama-3.2-3b-preview': max_128k,
+        'llama-3.2-11b-vision-preview': max_128k,
+        'llama-3.2-90b-vision-preview': max_128k,
+        'qwen-2.5-32b': max_128k,
+        'deepseek-r1-distill-qwen-32b': max_128k,
+        'deepseek-r1-distill-llama-70b-specdec': max_128k,
+    };
+    // Return context size if model found, otherwise default to 128k
+    return Object.entries(contextMap).find(([key]) => model.includes(key))?.[1] || max_128k;
+}
 async function onModelChange() {
     biasCache = undefined;
     let value = String($(this).val() || '');

@@ -4387,7 +4429,7 @@ async function onModelChange() {
4387	if (oai_settings.max_context_unlocked) {	4429	if (oai_settings.max_context_unlocked) {
4388	$('#openai_max_context').attr('max', unlocked_max);	4430	$('#openai_max_context').attr('max', unlocked_max);
4389	}	4431	}
4390	else if (['sonar', 'sonar-reasoning'].includes(oai_settings.perplexity_model)) {	4432	else if (['sonar', 'sonar-reasoning', 'sonar-reasoning-pro', 'r1-1776'].includes(oai_settings.perplexity_model)) {
4391	$('#openai_max_context').attr('max', 127000);	4433	$('#openai_max_context').attr('max', 127000);
4392	}	4434	}
4393	else if (['sonar-pro'].includes(oai_settings.perplexity_model)) {	4435	else if (['sonar-pro'].includes(oai_settings.perplexity_model)) {

+    }
     if (oai_settings.chat_completion_source == chat_completion_sources.GROQ) {
-        if (oai_settings.max_context_unlocked) {
+        const maxContext = getGroqMaxContext(oai_settings.groq_model, oai_settings.max_context_unlocked);
-            $('#openai_max_context').attr('max', unlocked_max);
+        $('#openai_max_context').attr('max', maxContext);
-        } else if (oai_settings.groq_model.includes('gemma2-9b-it')) {
-            $('#openai_max_context').attr('max', max_8k);
-        } else if (oai_settings.groq_model.includes('llama-3.3-70b-versatile')) {
-            $('#openai_max_context').attr('max', max_128k);
-        } else if (oai_settings.groq_model.includes('llama-3.1-8b-instant')) {
-            $('#openai_max_context').attr('max', max_128k);
-        } else if (oai_settings.groq_model.includes('llama3-70b-8192')) {
-            $('#openai_max_context').attr('max', max_8k);
-        } else if (oai_settings.groq_model.includes('llama3-8b-8192')) {
-            $('#openai_max_context').attr('max', max_8k);
-        } else if (oai_settings.groq_model.includes('mixtral-8x7b-32768')) {
-            $('#openai_max_context').attr('max', max_32k);
-        } else if (oai_settings.groq_model.includes('deepseek-r1-distill-llama-70b')) {
-            $('#openai_max_context').attr('max', max_128k);
-        } else if (oai_settings.groq_model.includes('llama-3.3-70b-specdec')) {
-            $('#openai_max_context').attr('max', max_8k);
-        } else if (oai_settings.groq_model.includes('llama-3.2-1b-preview')) {
-            $('#openai_max_context').attr('max', max_128k);
-        } else if (oai_settings.groq_model.includes('llama-3.2-3b-preview')) {
-            $('#openai_max_context').attr('max', max_128k);
-        } else if (oai_settings.groq_model.includes('llama-3.2-11b-vision-preview')) {
-            $('#openai_max_context').attr('max', max_128k);
-        } else if (oai_settings.groq_model.includes('llama-3.2-90b-vision-preview')) {
-            $('#openai_max_context').attr('max', max_128k);
-        }
         oai_settings.openai_max_context = Math.min(Number($('#openai_max_context').attr('max')), oai_settings.openai_max_context);
         $('#openai_max_context').val(oai_settings.openai_max_context).trigger('input');
         oai_settings.temp_openai = Math.min(oai_max_temp, oai_settings.temp_openai);

public/scripts/power-user.js+5 -4 Viewed

 /**
  * Common function to perform fuzzy search with optional caching
+ * @template T
  * @param {string} type - Type of search from fuzzySearchCategories
- * @param {any[]} data - Data array to search in
+ * @param {T[]} data - Data array to search in
- * @param {Array<{name: string, weight: number, getFn?: (obj: any) => string}>} keys - Fuse.js keys configuration
+ * @param {Array<{name: string, weight: number, getFn?: (obj: T) => string}>} keys - Fuse.js keys configuration
  * @param {string} searchValue - The search term
  * @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
+ * @returns {import('fuse.js').FuseResult<T>[]} Results as items with their score
  */
-function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches = null) {
+export function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches = null) {
     // Check cache if provided
     if (fuzzySearchCaches) {
         const cache = fuzzySearchCaches[type];

public/scripts/reasoning.js+192 -37 Viewed

 import {
     moment,
 } from '../lib.js';
-import { chat, closeMessageEditor, event_types, eventSource, main_api, messageFormatting, saveChatConditional, saveSettingsDebounced, substituteParams, updateMessageBlock } from '../script.js';
+import { chat, closeMessageEditor, event_types, eventSource, main_api, messageFormatting, saveChatConditional, saveChatDebounced, saveSettingsDebounced, substituteParams, updateMessageBlock } from '../script.js';
 import { getRegexedString, regex_placement } from './extensions/regex/engine.js';
-import { getCurrentLocale, t } from './i18n.js';
+import { getCurrentLocale, t, translate } from './i18n.js';
 import { MacrosParser } from './macros.js';
 import { chat_completion_sources, getChatCompletionModel, oai_settings } from './openai.js';
 import { Popup } from './popup.js';
 import { power_user } from './power-user.js';
 import { SlashCommand } from './slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js';
-import { commonEnumProviders } from './slash-commands/SlashCommandCommonEnumsProvider.js';
+import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
+import { enumTypes, SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
 import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
 import { textgen_types, textgenerationwebui_settings } from './textgen-settings.js';
-import { copyText, escapeRegex, isFalseBoolean, setDatasetProperty } from './utils.js';
+import { copyText, escapeRegex, isFalseBoolean, setDatasetProperty, trimSpaces } from './utils.js';
+/**
+ * Enum representing the type of the reasoning for a message (where it came from)
+ * @enum {string}
+ * @readonly
+ */
+export const ReasoningType = {
+    Model: 'model',
+    Parsed: 'parsed',
+    Manual: 'manual',
+    Edited: 'edited',
+};
 /**
  * Gets a message from a jQuery element.

                     return data?.choices?.[0]?.message?.reasoning ?? '';
                 case chat_completion_sources.MAKERSUITE:
                     return data?.responseContent?.parts?.filter(part => part.thought)?.map(part => part.text)?.join('\n\n') ?? '';
+                case chat_completion_sources.CUSTOM: {
+                    return data?.choices?.[0]?.message?.reasoning_content
+                        ?? data?.choices?.[0]?.message?.reasoning
+                        ?? '';
+                }
+            }
             break;
+    }

         { name: 'gemini-2.0-pro-exp', func: FUNCS.startsWith },
     ];
-    const model = getChatCompletionModel();
+    const model = getChatCompletionModel() || '';
     const isHidden = hiddenReasoningModels.some(({ name, func }) => func(model, name));
     return isHidden;

  * This class is used inside the {@link StreamingProcessor} to manage reasoning states and UI updates.
  */
 export class ReasoningHandler {
+    /** @type {boolean} True if the model supports reasoning, but hides the reasoning output */
     #isHiddenReasoningModel;
+    /** @type {boolean} True if the handler is currently handling a manual parse of reasoning blocks */
+    #isParsingReasoning = false;
+    /** @type {number?} When reasoning is being parsed manually, and the reasoning has ended, this will be the index at which the actual messages starts */
+    #parsingReasoningMesStartIndex = null;
     /**
      * @param {Date?} [timeStarted=null] - When the generation started

     constructor(timeStarted = null) {
         /** @type {ReasoningState} The current state of the reasoning process */
         this.state = ReasoningState.None;
+        /** @type {ReasoningType?} The type of the reasoning (where it came from) */
+        this.type = null;
         /** @type {string} The reasoning output */
         this.reasoning = '';
         /** @type {Date} When the reasoning started */

         /** @type {Date} Initial starting time of the generation */
         this.initialTime = timeStarted ?? new Date();
-        /** @type {boolean} True if the model supports reasoning, but hides the reasoning output */
         this.#isHiddenReasoningModel = isHiddenReasoningModel();
         // Cached DOM elements for reasoning

             this.state = ReasoningState.Hidden;
+        }
+        this.type = extra?.reasoning_type;
         this.reasoning = extra?.reasoning ?? '';
         if (this.state !== ReasoningState.None) {

         // Make sure reset correctly clears all relevant states
         if (reset) {
             this.state = this.#isHiddenReasoningModel ? ReasoningState.Thinking : ReasoningState.None;
+            this.type = null;
             this.reasoning = '';
             this.initialTime = new Date();
             this.startTime = null;

      * Updates the reasoning text/string for a message.
+     *
      * @param {number} messageId - The ID of the message to update
-     * @param {string?} [reasoning=null] - The reasoning text to update - If null, uses the current reasoning
+     * @param {string?} [reasoning=null] - The reasoning text to update - If null or empty, uses the current reasoning
      * @param {Object} [options={}] - Optional arguments
      * @param {boolean} [options.persist=false] - Whether to persist the reasoning to the message object
+     * @param {boolean} [options.allowReset=false] - Whether to allow empty reasoning provided to reset the reasoning, instead of just taking the existing one
      * @returns {boolean} - Returns true if the reasoning was changed, otherwise false
      */
-    updateReasoning(messageId, reasoning = null, { persist = false } = {}) {
+    updateReasoning(messageId, reasoning = null, { persist = false, allowReset = false } = {}) {
         if (messageId == -1 || !chat[messageId]) {
             return false;
+        }
-        reasoning = reasoning ?? this.reasoning;
+        reasoning = allowReset ? reasoning ?? this.reasoning : reasoning || this.reasoning;
-        reasoning = power_user.trim_spaces ? reasoning.trim() : reasoning;
+        reasoning = trimSpaces(reasoning);
         // Ensure the chat extra exists
         if (!chat[messageId].extra) {

         const reasoningChanged = extra.reasoning !== reasoning;
         this.reasoning = getRegexedString(reasoning ?? '', regex_placement.REASONING);
+        this.type = (this.#isParsingReasoning || this.#parsingReasoningMesStartIndex) ? ReasoningType.Parsed : ReasoningType.Model;
         if (persist) {
             // Build and save the reasoning data to message extras
             extra.reasoning = this.reasoning;
             extra.reasoning_duration = this.getDuration();
+            extra.reasoning_type = (this.#isParsingReasoning || this.#parsingReasoningMesStartIndex) ? ReasoningType.Parsed : ReasoningType.Model;
+        }
         return reasoningChanged;

      * @returns {Promise<void>}
      */
     async process(messageId, mesChanged) {
-        if (!this.reasoning && !this.#isHiddenReasoningModel) return;
+        mesChanged = this.#autoParseReasoningFromMessage(messageId, mesChanged);
+        if (!this.reasoning && !this.#isHiddenReasoningModel)
+            return;
         // Ensure reasoning string is updated and regexes are applied correctly
         const reasoningChanged = this.updateReasoning(messageId, null, { persist: true });

+        }
+    }
+    #autoParseReasoningFromMessage(messageId, mesChanged) {
+        if (!power_user.reasoning.auto_parse)
+            return;
+        if (!power_user.reasoning.prefix || !power_user.reasoning.suffix)
+            return mesChanged;
+        /** @type {{ mes: string, [key: string]: any}} */
+        const message = chat[messageId];
+        if (!message) return mesChanged;
+        // If we are done with reasoning parse, we just split the message correctly so the reasoning doesn't show up inside of it.
+        if (this.#parsingReasoningMesStartIndex) {
+            message.mes = trimSpaces(message.mes.slice(this.#parsingReasoningMesStartIndex));
+            return mesChanged;
+        }
+        if (this.state === ReasoningState.None || this.#isHiddenReasoningModel) {
+            // If streamed message starts with the opening, cut it out and put all inside reasoning
+            if (message.mes.startsWith(power_user.reasoning.prefix) && message.mes.length > power_user.reasoning.prefix.length) {
+                this.#isParsingReasoning = true;
+                // Manually set starting state here, as we might already have received the ending suffix
+                this.state = ReasoningState.Thinking;
+                this.startTime = this.startTime ?? this.initialTime;
+                this.endTime = null;
+            }
+        }
+        if (!this.#isParsingReasoning)
+            return mesChanged;
+        // If we are in manual parsing mode, all currently streaming mes tokens will go the the reasoning block
+        const originalMes = message.mes;
+        this.reasoning = originalMes.slice(power_user.reasoning.prefix.length);
+        message.mes = '';
+        // If the reasoning contains the ending suffix, we cut that off and continue as message streaming
+        if (this.reasoning.includes(power_user.reasoning.suffix)) {
+            this.reasoning = this.reasoning.slice(0, this.reasoning.indexOf(power_user.reasoning.suffix));
+            this.#parsingReasoningMesStartIndex = originalMes.indexOf(power_user.reasoning.suffix) + power_user.reasoning.suffix.length;
+            message.mes = trimSpaces(originalMes.slice(this.#parsingReasoningMesStartIndex));
+            this.#isParsingReasoning = false;
+        }
+        // Only return the original mesChanged value if we haven't cut off the complete message
+        return message.mes.length ? mesChanged : false;
+    }
     /**
      * Completes the reasoning process for a message.
+     *

         // Update states to the relevant DOM elements
         setDatasetProperty(this.messageDom, 'reasoningState', this.state !== ReasoningState.None ? this.state : null);
         setDatasetProperty(this.messageReasoningDetailsDom, 'state', this.state);
+        setDatasetProperty(this.messageReasoningDetailsDom, 'type', this.type);
         // Update the reasoning message
-        const reasoning = power_user.trim_spaces ? this.reasoning.trim() : this.reasoning;
+        const reasoning = trimSpaces(this.reasoning);
         const displayReasoning = messageFormatting(reasoning, '', false, false, messageId, {}, true);
         this.messageReasoningContentDom.innerHTML = displayReasoning;

         const element = this.messageReasoningHeaderDom;
         const duration = this.getDuration();
         let data = null;
+        let title = '';
         if (duration) {
-            const durationStr = moment.duration(duration).locale(getCurrentLocale()).humanize({ s: 50, ss: 3 });
+            const seconds = moment.duration(duration).asSeconds();
-            const secondsStr = moment.duration(duration).asSeconds();
-            const span = document.createElement('span');
-            span.title = t`${secondsStr} seconds`;
-            span.textContent = durationStr;
-            element.textContent = t`Thought for `;
+            const durationStr = moment.duration(duration).locale(getCurrentLocale()).humanize({ s: 50, ss: 3 });
-            element.appendChild(span);
+            element.textContent = t`Thought for ${durationStr}`;
-            data = String(secondsStr);
+            data = String(seconds);
+            title = `${seconds} seconds`;
         } else if ([ReasoningState.Done, ReasoningState.Hidden].includes(this.state)) {
             element.textContent = t`Thought for some time`;
             data = 'unknown';

             data = null;
+        }
+        if (this.type !== ReasoningType.Model) {
+            title += ` [${translate(this.type)}]`;
+            title = title.trim();
+        }
+        element.title = title;
         setDatasetProperty(this.messageReasoningDetailsDom, 'duration', data);
         setDatasetProperty(element, 'duration', data);
+    }

         callback: async (args, value) => {
             const messageId = !isNaN(Number(args.at)) ? Number(args.at) : chat.length - 1;
             const message = chat[messageId];
-            if (!message?.extra) {
+            if (!message) {
                 return '';
+            }
+            // Make sure the message has an extra object
+            if (!message.extra || typeof message.extra !== 'object') {
+                message.extra = {};
+            }
             message.extra.reasoning = String(value ?? '');
+            message.extra.reasoning_type = ReasoningType.Manual;
             await saveChatConditional();
             closeMessageEditor('reasoning');

                 typeList: [ARGUMENT_TYPE.BOOLEAN],
                 defaultValue: 'true',
                 isRequired: false,
-                enumProvider: commonEnumProviders.boolean('trueFalse'),
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'return',
+                description: 'Whether to return the parsed reasoning or the content without reasoning',
+                typeList: [ARGUMENT_TYPE.STRING],
+                defaultValue: 'reasoning',
+                isRequired: false,
+                enumList: [
+                    new SlashCommandEnumValue('reasoning', null, enumTypes.enum, enumIcons.reasoning),
+                    new SlashCommandEnumValue('content', null, enumTypes.enum, enumIcons.message),
+                ],
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'strict',
+                description: 'Whether to require the reasoning block to be at the beginning of the string (excluding whitespaces).',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'true',
+                isRequired: false,
+                enumList: commonEnumProviders.boolean('trueFalse')(),
             }),
         ],
         unnamedArgumentList: [

             }),
         ],
         callback: (args, value) => {
-            if (!value) {
+            if (!value || typeof value !== 'string') {
                 return '';
+            }
             if (!power_user.reasoning.prefix || !power_user.reasoning.suffix) {
-                toastr.warning(t`Both prefix and suffix must be set in the Reasoning Formatting settings.`);
+                toastr.warning(t`Both prefix and suffix must be set in the Reasoning Formatting settings.`, t`Reasoning Parse`);
-                return String(value);
+                return value;
+            }
+            if (typeof args.return !== 'string' || !['reasoning', 'content'].includes(args.return)) {
+                toastr.warning(t`Invalid return type '${args.return}', defaulting to 'reasoning'.`, t`Reasoning Parse`);
+            }
-            const parsedReasoning = parseReasoningFromString(String(value));
+            const returnMessage = args.return === 'content';
+            const parsedReasoning = parseReasoningFromString(value, { strict: !isFalseBoolean(String(args.strict ?? '')) });
             if (!parsedReasoning) {
-                return '';
+                return returnMessage ? value : '';
+            }
+            if (returnMessage) {
+                return parsedReasoning.content;
+            }
             const applyRegex = !isFalseBoolean(String(args.regex ?? ''));

+}
 function setReasoningEventHandlers() {
+    /**
+     * Updates the reasoning block of a message from a value.
+     * @param {object} message Message object
+     * @param {string} value Reasoning value
+     */
+    function updateReasoningFromValue(message, value) {
+        const reasoning = getRegexedString(value, regex_placement.REASONING, { isEdit: true });
+        message.extra.reasoning = reasoning;
+        message.extra.reasoning_type = message.extra.reasoning_type ? ReasoningType.Edited : ReasoningType.Manual;
+    }
     $(document).on('click', '.mes_reasoning_details', function (e) {
         if (!e.target.closest('.mes_reasoning_actions') && !e.target.closest('.mes_reasoning_header')) {
             e.preventDefault();

+        }
         const textarea = messageBlock.find('.reasoning_edit_textarea');
-        const reasoning = getRegexedString(String(textarea.val()), regex_placement.REASONING, { isEdit: true });
+        updateReasoningFromValue(message, String(textarea.val()));
-        message.extra.reasoning = reasoning;
         await saveChatConditional();
         updateMessageBlock(messageId, message);
         textarea.remove();

             return;
+        }
         message.extra.reasoning = '';
+        delete message.extra.reasoning_type;
+        delete message.extra.reasoning_duration;
         await saveChatConditional();
         updateMessageBlock(messageId, message);
         const textarea = messageBlock.find('.reasoning_edit_textarea');

         await copyText(reasoning);
         toastr.info(t`Copied!`, '', { timeOut: 2000 });
     });
+    $(document).on('input', '.reasoning_edit_textarea', function () {
+        if (!power_user.auto_save_msg_edits) {
+            return;
+        }
+        const { message } = getMessageFromJquery(this);
+        if (!message?.extra) {
+            return;
+        }
+        updateReasoningFromValue(message, String($(this).val()));
+        saveChatDebounced();
+    });
+}
 /**

  * @property {string} reasoning Reasoning block
  * @property {string} content Message content
  * @param {string} str Content of the message
+ * @param {Object} options Optional arguments
+ * @param {boolean} [options.strict=true] Whether the reasoning block **has** to be at the beginning of the provided string (excluding whitespaces), or can be anywhere in it
  * @returns {ParsedReasoning|null} Parsed reasoning block and message content
  */
-function parseReasoningFromString(str) {
+function parseReasoningFromString(str, { strict = true } = {}) {
     // Both prefix and suffix must be defined
     if (!power_user.reasoning.prefix || !power_user.reasoning.suffix) {
         return null;
+    }
     try {
-        const regex = new RegExp(`${escapeRegex(power_user.reasoning.prefix)}(.*?)${escapeRegex(power_user.reasoning.suffix)}`, 's');
+        const regex = new RegExp(`${(strict ? '^\\s*?' : '')}${escapeRegex(power_user.reasoning.prefix)}(.*?)${escapeRegex(power_user.reasoning.suffix)}`, 's');
         let didReplace = false;
         let reasoning = '';

             return '';
         });
-        if (didReplace && power_user.trim_spaces) {
+        if (didReplace) {
-            reasoning = reasoning.trim();
+            reasoning = trimSpaces(reasoning);
-            content = content.trim();
+            content = trimSpaces(content);
+        }
         return { reasoning, content };

@@ -851,7 +996,7 @@ function parseReasoningFromString(str) {
851	}	996	}
852		997
853	function registerReasoningAppEvents() {	998	function registerReasoningAppEvents() {
854	eventSource.makeFirst(event_types.MESSAGE_RECEIVED, (/** @type {number} */ idx) => {	999	const eventHandler = (/** @type {number} */ idx) => {
855	if (!power_user.reasoning.auto_parse) {	1000	if (!power_user.reasoning.auto_parse) {
856	return;	1001	return;
857	}	1002	}

             return null;
+        }
+        if (message.extra?.reasoning) {
+            console.debug('[Reasoning] Message already has reasoning', idx);
+            return null;
+        }
         const parsedReasoning = parseReasoningFromString(message.mes);
         // No reasoning block found

         // If reasoning was found, add it to the message
         if (parsedReasoning.reasoning) {
             message.extra.reasoning = getRegexedString(parsedReasoning.reasoning, regex_placement.REASONING);
+            message.extra.reasoning_type = ReasoningType.Parsed;
+        }
         // Update the message text if it was changed

@@ -901,7 +1052,11 @@ function registerReasoningAppEvents() {
901	updateMessageBlock(idx, message);	1052	updateMessageBlock(idx, message);
902	}	1053	}
903	}	1054	}
904	});	1055	};
		1056
		1057	for (const event of [event_types.MESSAGE_RECEIVED, event_types.MESSAGE_UPDATED]) {
		1058	eventSource.on(event, eventHandler);
		1059	}
905	}	1060	}
906		1061
907	export function initReasoning() {	1062	export function initReasoning() {

public/scripts/slash-commands/SlashCommandCommonEnumsProvider.js+1 -0 Viewed

     preset: '⚙️',
     file: '📄',
     message: '💬',
+    reasoning: '💡',
     voice: '🎤',
     server: '🖥️',
     popup: '🗔',

public/scripts/textgen-settings.js+2 -2 Viewed

     const formattedUrl = formatTextGenURL(url);
     if (!formattedUrl) {
-        toastr.error('Enter a valid API URL', 'Text Completion API');
+        toastr.error(t`Enter a valid API URL`, 'Text Completion API');
         return;
+    }

             return settings.aphrodite_model;
         case OLLAMA:
             if (!settings.ollama_model) {
-                toastr.error('No Ollama model selected.', 'Text Completion API');
+                toastr.error(t`No Ollama model selected.`, 'Text Completion API');
                 throw new Error('No Ollama model selected');
+            }
             return settings.ollama_model;

public/scripts/tokenizers.js+4 -1 Viewed

@@ -679,7 +679,7 @@ export function getTokenizerModel() {
679	}	679	}
680		680
681	if (oai_settings.chat_completion_source === chat_completion_sources.PERPLEXITY) {	681	if (oai_settings.chat_completion_source === chat_completion_sources.PERPLEXITY) {
682	if (oai_settings.perplexity_model.includes('sonar-reasoning')) {	682	if (oai_settings.perplexity_model.includes('sonar-reasoning') \|\| oai_settings.perplexity_model.includes('r1-1776')) {
683	return deepseekTokenizer;	683	return deepseekTokenizer;
684	}	684	}
685	if (oai_settings.perplexity_model.includes('llama-3') \|\| oai_settings.perplexity_model.includes('llama3')) {	685	if (oai_settings.perplexity_model.includes('llama-3') \|\| oai_settings.perplexity_model.includes('llama3')) {

@@ -694,6 +694,9 @@ export function getTokenizerModel() {
694	}	694	}
695		695
696	if (oai_settings.chat_completion_source === chat_completion_sources.GROQ) {	696	if (oai_settings.chat_completion_source === chat_completion_sources.GROQ) {
		697	if (oai_settings.groq_model.includes('qwen')) {
		698	return qwen2Tokenizer;
		699	}
697	if (oai_settings.groq_model.includes('llama-3') \|\| oai_settings.groq_model.includes('llama3')) {	700	if (oai_settings.groq_model.includes('llama-3') \|\| oai_settings.groq_model.includes('llama3')) {
698	return llama3Tokenizer;	701	return llama3Tokenizer;
699	}	702	}

public/scripts/user.js+26 -0 Viewed

 export let currentUser = null;
 export let accountsEnabled = false;
+// Extend the session every 30 minutes
+const SESSION_EXTEND_INTERVAL = 30 * 60 * 1000;
 /**
  * Enable or disable user account controls in the UI.
  * @param {boolean} isEnabled User account controls enabled

+    }
+}
+/**
+ * Pings the server to extend the user session.
+ */
+async function extendUserSession() {
+    try {
+        const response = await fetch('/api/ping?extend=1', {
+            method: 'GET',
+            headers: getRequestHeaders(),
+        });
+        if (!response.ok) {
+            throw new Error('Ping did not succeed', { cause: response.status });
+        }
+    } catch (error) {
+        console.error('Failed to extend user session', error);
+    }
+}
 jQuery(() => {
     $('#logout_button').on('click', () => {
         logout();

     $('#account_button').on('click', () => {
         openUserProfile();
     });
+    setInterval(async () => {
+        if (currentUser) {
+            await extendUserSession();
+        }
+    }, SESSION_EXTEND_INTERVAL);
 });

public/scripts/utils.js+24 -6 Viewed

 import { getContext } from './extensions.js';
 import { characters, getRequestHeaders, this_chid } from '../script.js';
 import { isMobile } from './RossAscends-mods.js';
-import { collapseNewlines } from './power-user.js';
+import { collapseNewlines, power_user } from './power-user.js';
 import { debounce_timeout } from './constants.js';
 import { Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js';
 import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';

+}
 /**
+ * Trims leading and trailing whitespace from the input string based on a configuration setting.
+ * @param {string} input - The string to be trimmed
+ * @returns {string} The trimmed string if trimming is enabled; otherwise, returns the original string
+ */
+export function trimSpaces(input) {
+    if (!input || typeof input !== 'string') {
+        return input;
+    }
+    return power_user.trim_spaces ? input.trim() : input;
+}
+/**
  * Trims a string to the end of a nearest sentence.
  * @param {string} input The string to trim.
  * @returns {string} The trimmed string.

     });
+}
-export function getCharaFilename(chid) {
+/**
+ * Gets the filename of the character avatar without extension
+ * @param {number?} [chid=null] - Character ID. If not provided, uses the current character ID
+ * @param {object} [options={}] - Options arguments
+ * @param {string?} [options.manualAvatarKey=null] - Manually take the following avatar key, instead of using the chid to determine the name
+ * @returns {string?} The filename of the character avatar without extension, or null if the character ID is invalid
+ */
+export function getCharaFilename(chid = null, { manualAvatarKey = null } = {}) {
     const context = getContext();
-    const fileName = context.characters[chid ?? context.characterId]?.avatar;
+    const fileName = manualAvatarKey ?? context.characters[chid ?? context.characterId]?.avatar;
-    if (fileName) {
+    return fileName?.replace(/\.[^/.]+$/, '') ?? null;
-        return fileName.replace(/\.[^/.]+$/, '');
-    }
+}
 /**

public/style.css+23 -21 Viewed

     --interactable-outline-color: var(--white100);
     --interactable-outline-color-faint: var(--white20a);
+    --reasoning-body-color: var(--SmartThemeEmColor);
+    --reasoning-em-color: color-mix(in srgb, var(--SmartThemeEmColor) 67%, var(--SmartThemeBlurTintColor) 33%);
+    --reasoning-saturation: 0.5;
     /*Default Theme, will be changed by ToolCool Color Picker*/
     --SmartThemeBodyColor: rgb(220, 220, 210);

 .mes_reasoning {
     display: block;
-    border-left: 2px solid var(--SmartThemeEmColor);
+    border-left: 2px solid var(--reasoning-body-color);
     border-radius: 2px;
     padding: 5px;
     padding-left: 14px;
     margin-bottom: 0.5em;
     overflow-y: auto;
-    color: var(--SmartThemeEmColor);
+    color: hsl(from var(--reasoning-body-color) h calc(s * var(--reasoning-saturation)) l);
+}
 .mes_reasoning_details {

     margin-bottom: 0;
+}
-.mes_reasoning em,
-.mes_reasoning i,
-.mes_reasoning u,
-.mes_reasoning q,
-.mes_reasoning blockquote {
-    filter: saturate(0.5);
-}
-.mes_reasoning_details .mes_reasoning em {
-    color: color-mix(in srgb, var(--SmartThemeEmColor) 67%, var(--SmartThemeBlurTintColor) 33%);
-}
 .mes_reasoning_header_block {
     flex-grow: 1;
+}

@@ -438,7 +430,7 @@ input[type='checkbox']:focus-visible {
438	}	430	}
439		431
440	/** If hidden reasoning should not be shown, we hide all blocks that don't have content */	432	/** If hidden reasoning should not be shown, we hide all blocks that don't have content */
441	#chat:not([data-show-hidden-reasoning="true"]) .mes:has(.mes_reasoning:empty) .mes_reasoning_details {	433	#chat:not([data-show-hidden-reasoning="true"]):not(:has(.reasoning_edit_textarea)) .mes:has(.mes_reasoning:empty) .mes_reasoning_details {
442	display: none;	434	display: none;
443	}	435	}
444		436

+}
 .mes_text i,
-.mes_text em,
+.mes_text em {
+    color: var(--SmartThemeEmColor);
+}
 .mes_reasoning i,
 .mes_reasoning em {
-    color: var(--SmartThemeEmColor);
+    color: hsl(from var(--reasoning-em-color) h calc(s * var(--reasoning-saturation)) l);
+}
 .mes_text q i,
 .mes_text q em {
     color: inherit;
+}
+.mes_reasoning q i,
+.mes_reasoning q em {
+    color: hsl(from var(--SmartThemeQuoteColor) h calc(s * var(--reasoning-saturation)) l);
+}
-.mes_text u,
+.mes_text u {
-.mes_reasoning u {
     color: var(--SmartThemeUnderlineColor);
+}
+.mes_reasoning u {
+    color: hsl(from var(--SmartThemeUnderlineColor) h calc(s * var(--reasoning-saturation)) l);
+}
-.mes_text q,
+.mes_text q {
-.mes_reasoning q {
     color: var(--SmartThemeQuoteColor);
+}
+.mes_reasoning q {
+    color: hsl(from var(--SmartThemeQuoteColor) h calc(s * var(--reasoning-saturation)) l);
+}
 .mes_text font[color] em,
 .mes_text font[color] i,

server.js+20 -5 Viewed

 import getWebpackServeMiddleware from './src/middleware/webpack-serve.js';
 import basicAuthMiddleware from './src/middleware/basicAuth.js';
 import whitelistMiddleware from './src/middleware/whitelist.js';
+import accessLoggerMiddleware, { getAccessLogPath, migrateAccessLog } from './src/middleware/accessLogWriter.js';
 import multerMonkeyPatch from './src/middleware/multerMonkeyPatch.js';
 import initRequestProxy from './src/request-proxy.js';
 import getCacheBusterMiddleware from './src/middleware/cacheBuster.js';

         describe: 'Request proxy URL (HTTP or SOCKS protocols)',
     }).option('requestProxyBypass', {
         type: 'array',
-        default: null,
         describe: 'Request proxy bypass list (space separated list of hosts)',
     }).parseSync();

 app.use(CORS);
-if (listen && basicAuthMode) app.use(basicAuthMiddleware);
+if (listen && basicAuthMode) {
+    app.use(basicAuthMiddleware);
+}
-app.use(whitelistMiddleware(enableWhitelist, listen));
+if (enableWhitelist) {
+    app.use(whitelistMiddleware());
+}
+if (listen) {
+    app.use(accessLoggerMiddleware());
+}
 if (enableCorsProxy) {
     app.use(bodyParser.json({

 // Everything below this line requires authentication
 app.use(requireLoginMiddleware);
-app.get('/api/ping', (_, response) => response.sendStatus(204));
+app.get('/api/ping', (request, response) => {
+    if (request.query.extend && request.session) {
+        request.session.touch = Date.now();
+    }
+    response.sendStatus(204);
+});
 // File uploads
 app.use(multer({ dest: uploadsPath, limits: { fieldSize: 10 * 1024 * 1024 } }).single('avatar'));

     await checkForNewContent(directories);
     await ensureThumbnailCache();
     cleanUploads();
+    migrateAccessLog();
     await settingsInit();
     await statsInit();

     if (listen) {
         console.log();
         console.log('To limit connections to internal localhost only ([::1] or 127.0.0.1), change the setting in config.yaml to "listen: false".');
-        console.log('Check the "access.log" file in the SillyTavern directory to inspect incoming connections.');
+        console.log('Check the "access.log" file in the data directory to inspect incoming connections:', color.green(getAccessLogPath()));
+    }
     console.log('\n' + getSeparator(plainGoToLog.length) + '\n');
     console.log(goToLog);

src/endpoints/backends/chat-completions.js+1 -4 Viewed

         headers = { ...OPENROUTER_HEADERS };
         bodyParams = {
             'transforms': getOpenRouterTransforms(request),
+            'include_reasoning': Boolean(request.body.include_reasoning),
         };
         if (request.body.min_p !== undefined) {

             bodyParams['route'] = 'fallback';
+        }
-        if (request.body.include_reasoning) {
-            bodyParams['include_reasoning'] = true;
-        }
         let cachingAtDepth = getConfigValue('claude.cachingAtDepth', -1);
         if (Number.isInteger(cachingAtDepth) && cachingAtDepth >= 0 && request.body.model?.startsWith('anthropic/claude-3')) {
             cachingAtDepthForOpenRouterClaude(request.body.messages, cachingAtDepth);

src/endpoints/extensions.js+1 -1 Viewed

         } catch (error) {
             // it is not a git repo, or has no commits yet, or is a bare repo
             // not possible to update it, most likely can't get the branch name either
-            return response.send({ currentBranchName: null, currentCommitHash, isUpToDate: true, remoteUrl: null });
+            return response.send({ currentBranchName: '', currentCommitHash: '', isUpToDate: true, remoteUrl: '' });
+        }
         const currentBranch = await git.cwd(extensionPath).branch();

src/endpoints/sprites.js+13 -5 Viewed

                 .map((file) => {
                     const pathToSprite = path.join(spritesPath, file);
                     const mtime = fs.statSync(pathToSprite).mtime?.toISOString().replace(/[^0-9]/g, '').slice(0, 14);
+                    const fileName = path.parse(pathToSprite).name.toLowerCase();
+                    // Extract the label from the filename via regex, which can be suffixed with a sub-name, either connected with a dash or a dot.
+                    // Examples: joy.png, joy-1.png, joy.expressive.png
+                    const label = fileName.match(/^(.+?)(?:[-\\.].*?)?$/)?.[1] ?? fileName;
                     return {
-                        label: path.parse(pathToSprite).name.toLowerCase(),
+                        label: label,
                         path: `/characters/${name}/${file}` + (mtime ? `?t=${mtime}` : ''),
                     };
                 });

 router.post('/delete', jsonParser, async (request, response) => {
     const label = request.body.label;
     const name = request.body.name;
+    const spriteName = request.body.spriteName || label;
-    if (!label || !name) {
+    if (!spriteName || !name) {
         return response.sendStatus(400);
+    }

@@ -158,7 +165,7 @@ router.post('/delete', jsonParser, async (request, response) => {
158		165
159	// Remove existing sprite with the same label	166	// Remove existing sprite with the same label
160	for (const file of files) {	167	for (const file of files) {
161	if (path.parse(file).name === label) {	168	if (path.parse(file).name === spriteName) {
162	fs.rmSync(path.join(spritesPath, file));	169	fs.rmSync(path.join(spritesPath, file));
163	}	170	}
164	}	171	}

     const file = request.file;
     const label = request.body.label;
     const name = request.body.name;
+    const spriteName = request.body.spriteName || label;
     if (!file || !label || !name) {
         return response.sendStatus(400);

         // Remove existing sprite with the same label
         for (const file of files) {
-            if (path.parse(file).name === label) {
+            if (path.parse(file).name === spriteName) {
                 fs.rmSync(path.join(spritesPath, file));
+            }
+        }
-        const filename = label + path.parse(file.originalname).ext;
+        const filename = spriteName + path.parse(file.originalname).ext;
         const spritePath = path.join(file.destination, file.filename);
         const pathToFile = path.join(spritesPath, filename);
         // Copy uploaded file to sprites folder

src/endpoints/users-public.js+10 -7 Viewed

 import storage from 'node-persist';
 import express from 'express';
 import { RateLimiterMemory, RateLimiterRes } from 'rate-limiter-flexible';
-import { jsonParser, getIpFromRequest } from '../express-common.js';
+import { jsonParser, getIpFromRequest, getRealIpFromHeader } from '../express-common.js';
 import { color, Cache, getConfigValue } from '../util.js';
 import { KEY_PREFIX, getUserAvatar, toKey, getPasswordHash, getPasswordSalt } from '../users.js';
 const DISCREET_LOGIN = getConfigValue('enableDiscreetLogin', false);
+const PREFER_REAL_IP_HEADER = getConfigValue('rateLimiting.preferRealIpHeader', false);
 const MFA_CACHE = new Cache(5 * 60 * 1000);
+const getIpAddress = (request) => PREFER_REAL_IP_HEADER ? getRealIpFromHeader(request) : getIpFromRequest(request);
 export const router = express.Router();
 const loginLimiter = new RateLimiterMemory({
     points: 5,

             return response.status(400).json({ error: 'Missing required fields' });
+        }
-        const ip = getIpFromRequest(request);
+        const ip = getIpAddress(request);
         await loginLimiter.consume(ip);
         /** @type {import('../users.js').User} */

         return response.json({ handle: user.handle });
     } catch (error) {
         if (error instanceof RateLimiterRes) {
-            console.error('Login failed: Rate limited from', getIpFromRequest(request));
+            console.error('Login failed: Rate limited from', getIpAddress(request));
             return response.status(429).send({ error: 'Too many attempts. Try again later or recover your password.' });
+        }

             return response.status(400).json({ error: 'Missing required fields' });
+        }
-        const ip = getIpFromRequest(request);
+        const ip = getIpAddress(request);
         await recoverLimiter.consume(ip);
         /** @type {import('../users.js').User} */

         return response.sendStatus(204);
     } catch (error) {
         if (error instanceof RateLimiterRes) {
-            console.error('Recover step 1 failed: Rate limited from', getIpFromRequest(request));
+            console.error('Recover step 1 failed: Rate limited from', getIpAddress(request));
             return response.status(429).send({ error: 'Too many attempts. Try again later or contact your admin.' });
+        }

         /** @type {import('../users.js').User} */
         const user = await storage.getItem(toKey(request.body.handle));
-        const ip = getIpFromRequest(request);
+        const ip = getIpAddress(request);
         if (!user) {
             console.error('Recover step 2 failed: User', request.body.handle, 'not found');

         return response.sendStatus(204);
     } catch (error) {
         if (error instanceof RateLimiterRes) {
-            console.error('Recover step 2 failed: Rate limited from', getIpFromRequest(request));
+            console.error('Recover step 2 failed: Rate limited from', getIpAddress(request));
             return response.status(429).send({ error: 'Too many attempts. Try again later or contact your admin.' });
+        }

src/endpoints/vectors.js+11 -11 Viewed

     switch (source) {
         case 'togetherai':
             return {
-                model: String(request.headers['x-togetherai-model']),
+                model: String(request.body.model),
             };
         case 'openai':
             return {
-                model: String(request.headers['x-openai-model']),
+                model: String(request.body.model),
             };
         case 'cohere':
             return {
-                model: String(request.headers['x-cohere-model']),
+                model: String(request.body.model),
             };
         case 'llamacpp':
             return {
-                apiUrl: String(request.headers['x-llamacpp-url']),
+                apiUrl: String(request.body.apiUrl),
             };
         case 'vllm':
             return {
-                apiUrl: String(request.headers['x-vllm-url']),
+                apiUrl: String(request.body.apiUrl),
-                model: String(request.headers['x-vllm-model']),
+                model: String(request.body.model),
             };
         case 'ollama':
             return {
-                apiUrl: String(request.headers['x-ollama-url']),
+                apiUrl: String(request.body.apiUrl),
-                model: String(request.headers['x-ollama-model']),
+                model: String(request.body.model),
-                keep: Boolean(request.headers['x-ollama-keep']),
+                keep: Boolean(request.body.keep),
             };
         case 'extras':
             return {
-                extrasUrl: String(request.headers['x-extras-url']),
+                extrasUrl: String(request.body.extrasUrl),
-                extrasKey: String(request.headers['x-extras-key']),
+                extrasKey: String(request.body.extrasKey),
             };
         case 'transformers':
             return {

src/express-common.js+14 -0 Viewed

+    }
     return clientIp;
+}
+/**
+ * Gets the IP address of the client when behind reverse proxy using x-real-ip header, falls back to socket remote address.
+ * This function should be used when the application is running behind a reverse proxy (e.g., Nginx, traefik, Caddy...).
+ * @param {import('express').Request} req Request object
+ * @returns {string} IP address of the client
+ */
+export function getRealIpFromHeader(req) {
+    if (req.headers['x-real-ip']) {
+        return req.headers['x-real-ip'].toString();
+    }
+    return getIpFromRequest(req);
+}

src/middleware/accessLogWriter.js+59 -0 Viewed

+import path from 'node:path';
+import fs from 'node:fs';
+import { getRealIpFromHeader } from '../express-common.js';
+import { color, getConfigValue } from '../util.js';
+const enableAccessLog = getConfigValue('logging.enableAccessLog', true);
+const knownIPs = new Set();
+export const getAccessLogPath = () => path.join(globalThis.DATA_ROOT, 'access.log');
+export function migrateAccessLog() {
+    try {
+        if (!fs.existsSync('access.log')) {
+            return;
+        }
+        const logPath = getAccessLogPath();
+        if (fs.existsSync(logPath)) {
+            return;
+        }
+        fs.renameSync('access.log', logPath);
+        console.log(color.yellow('Migrated access.log to new location:'), logPath);
+    } catch (e) {
+        console.error('Failed to migrate access log:', e);
+        console.info('Please move access.log to the data directory manually.');
+    }
+}
+/**
+ * Creates middleware for logging access and new connections
+ * @returns {import('express').RequestHandler}
+ */
+export default function accessLoggerMiddleware() {
+    return function (req, res, next) {
+        const clientIp = getRealIpFromHeader(req);
+        const userAgent = req.headers['user-agent'];
+        if (!knownIPs.has(clientIp)) {
+            // Log new connection
+            console.info(color.yellow(`New connection from ${clientIp}; User Agent: ${userAgent}\n`));
+            knownIPs.add(clientIp);
+            // Write to access log if enabled
+            if (enableAccessLog) {
+                const logPath = getAccessLogPath();
+                const timestamp = new Date().toISOString();
+                const log = `${timestamp} ${clientIp} ${userAgent}\n`;
+                fs.appendFile(logPath, log, (err) => {
+                    if (err) {
+                        console.error('Failed to write access log:', err);
+                    }
+                });
+            }
+        }
+        next();
+    };
+}

src/middleware/webpack-serve.js+9 -5 Viewed

 import path from 'node:path';
 import webpack from 'webpack';
-import { publicLibConfig } from '../../webpack.config.js';
+import getPublicLibConfig from '../../webpack.config.js';
 export default function getWebpackServeMiddleware() {
-    const outputPath = publicLibConfig.output?.path;
-    const outputFile = publicLibConfig.output?.filename;
     /**
      * A very spartan recreation of webpack-dev-middleware.
      * @param {import('express').Request} req Request object.

      * @type {import('express').RequestHandler}
      */
     function devMiddleware(req, res, next) {
+        const publicLibConfig = getPublicLibConfig();
+        const outputPath = publicLibConfig.output?.path;
+        const outputFile = publicLibConfig.output?.filename;
         if (req.method === 'GET' && path.parse(req.path).base === outputFile) {
             return res.sendFile(outputFile, { root: outputPath });
+        }

     /**
      * Wait until Webpack is done compiling.
+     * @param {object} param Parameters.
+     * @param {boolean} [param.forceDist] Whether to force the use the /dist folder.
      * @returns {Promise<void>}
      */
-    devMiddleware.runWebpackCompiler = () => {
+    devMiddleware.runWebpackCompiler = ({ forceDist = false } = {}) => {
+        const publicLibConfig = getPublicLibConfig(forceDist);
         const compiler = webpack(publicLibConfig);
         return new Promise((resolve) => {

src/middleware/whitelist.js+11 -20 Viewed

 const whitelistPath = path.join(process.cwd(), './whitelist.txt');
 const enableForwardedWhitelist = getConfigValue('enableForwardedWhitelist', false);
 let whitelist = getConfigValue('whitelist', []);
-let knownIPs = new Set();
 if (fs.existsSync(whitelistPath)) {
     try {

 /**
  * Returns a middleware function that checks if the client IP is in the whitelist.
- * @param {boolean} whitelistMode If whitelist mode is enabled via config or command line
- * @param {boolean} listen If listen mode is enabled via config or command line
  * @returns {import('express').RequestHandler} The middleware function
  */
-export default function whitelistMiddleware(whitelistMode, listen) {
+export default function whitelistMiddleware() {
     const forbiddenWebpage = Handlebars.compile(
         safeReadFileSync('./public/error/forbidden-by-whitelist.html') ?? '',
     );
+    const noLogPaths = [
+        '/favicon.ico',
+    ];
     return function (req, res, next) {
         const clientIp = getIpFromRequest(req);
         const forwardedIp = getForwardedIp(req);
         const userAgent = req.headers['user-agent'];
-        if (listen && !knownIPs.has(clientIp)) {
-            console.info(color.yellow(`New connection from ${clientIp}; User Agent: ${userAgent}\n`));
-            knownIPs.add(clientIp);
-            // Write access log
-            const timestamp = new Date().toISOString();
-            const log = `${timestamp} ${clientIp} ${userAgent}\n`;
-            fs.appendFile('access.log', log, (err) => {
-                if (err) {
-                    console.error('Failed to write access log:', err);
-                }
-            });
-        }
         //clientIp = req.connection.remoteAddress.split(':').pop();
-        if (whitelistMode === true && !whitelist.some(x => ipMatching.matches(clientIp, ipMatching.getMatch(x)))
+        if (!whitelist.some(x => ipMatching.matches(clientIp, ipMatching.getMatch(x)))
-            || forwardedIp && whitelistMode === true && !whitelist.some(x => ipMatching.matches(forwardedIp, ipMatching.getMatch(x)))
+            || forwardedIp && !whitelist.some(x => ipMatching.matches(forwardedIp, ipMatching.getMatch(x)))
         ) {
             // Log the connection attempt with real IP address
             const ipDetails = forwardedIp
                 ? `${clientIp} (forwarded from ${forwardedIp})`
                 : clientIp;
+            if (!noLogPaths.includes(req.path)) {
                 console.warn(
                     color.red(
                         `Blocked connection from ${clientIp}; User Agent: ${userAgent}\n\tTo allow this connection, add its IP address to the whitelist or disable whitelist mode by editing config.yaml in the root directory of your SillyTavern installation.\n`,
                     ),
                 );
+            }
             return res.status(403).send(forbiddenWebpage({ ipDetails }));
+        }
         next();

src/plugin-loader.js+2 -2 Viewed

 import url from 'node:url';
 import express from 'express';
-import { default as git } from 'simple-git';
+import { default as git, CheckRepoActions } from 'simple-git';
 import { sync as commandExistsSync } from 'command-exists';
 import { getConfigValue, color } from './util.js';

             const pluginPath = path.join(pluginsPath, directory);
             const pluginRepo = git(pluginPath);
-            const isRepo = await pluginRepo.checkIsRepo();
+            const isRepo = await pluginRepo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
             if (!isRepo) {
                 continue;
+            }

src/util.js+1 -1 Viewed

  * Setup the minimum log level
  */
 export function setupLogLevel() {
-    const logLevel = getConfigValue('minLogLevel', LOG_LEVELS.DEBUG);
+    const logLevel = getConfigValue('logging.minLogLevel', LOG_LEVELS.DEBUG);
     globalThis.console.debug = logLevel <= LOG_LEVELS.DEBUG ? console.debug : () => {};
     globalThis.console.info = logLevel <= LOG_LEVELS.INFO ? console.info : () => {};

webpack.config.js+41 -4 Viewed

 import process from 'node:process';
 import path from 'node:path';
+import isDocker from 'is-docker';
-/** @type {import('webpack').Configuration} */
+/**
-export const publicLibConfig = {
+ * Get the Webpack configuration for the public/lib.js file.
+ * 1. Docker has got cache and the output file pre-baked.
+ * 2. Non-Docker environments use the global DATA_ROOT variable to determine the cache and output directories.
+ * @param {boolean} forceDist Whether to force the use the /dist folder.
+ * @returns {import('webpack').Configuration}
+ * @throws {Error} If the DATA_ROOT variable is not set.
+ * */
+export default function getPublicLibConfig(forceDist = false) {
+    function getCacheDirectory() {
+        if (forceDist || isDocker()) {
+            return path.resolve(process.cwd(), 'dist/webpack');
+        }
+        if (typeof globalThis.DATA_ROOT === 'string') {
+            return path.resolve(globalThis.DATA_ROOT, '_webpack', 'cache');
+        }
+        throw new Error('DATA_ROOT variable is not set.');
+    }
+    function getOutputDirectory() {
+        if (forceDist || isDocker()) {
+            return path.resolve(process.cwd(), 'dist');
+        }
+        if (typeof globalThis.DATA_ROOT === 'string') {
+            return path.resolve(globalThis.DATA_ROOT, '_webpack', 'output');
+        }
+        throw new Error('DATA_ROOT variable is not set.');
+    }
+    const cacheDirectory = getCacheDirectory();
+    const outputDirectory = getOutputDirectory();
+    return {
         mode: 'production',
         entry: './public/lib.js',
         cache: {
             type: 'filesystem',
-        cacheDirectory: path.resolve(process.cwd(), 'dist/webpack'),
+            cacheDirectory: cacheDirectory,
             store: 'pack',
             compression: 'gzip',
         },

             hints: false,
         },
         output: {
-        path: path.resolve(process.cwd(), 'dist'),
+            path: outputDirectory,
             filename: 'lib.js',
             libraryTarget: 'module',
         },
     };
+}

Merge branch 'staging' of github.com-qvink:SillyTavern/SillyTavern into get_chat_completion_presets_from_preset_manager