8bd4fd76 · permissionBRICK/SillyTavern

.github/ISSUE_TEMPLATE/bug-report.yml+2 -0 Viewed

           required: true
         - label: I have checked the [docs](https://docs.sillytavern.app/) ![important](https://img.shields.io/badge/Important!-F6094E)
           required: true
+        - label: I confirm that my issue is not related to third-party content, unofficial extension or patch. If in doubt, check with a new [user account](https://docs.sillytavern.app/administration/multi-user/) and with extensions disabled
+          required: true
   - type: markdown
     attributes:

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+24 -0 Viewed

 # -- SERVER CONFIGURATION --
 # Listen for incoming connections
 listen: false
+# Listen on a specific address, supports IPv4 and IPv6
+listenAddress:
+  ipv4: 0.0.0.0
+  ipv6: '[::]'
 # Enables IPv6 and/or IPv4 protocols. Need to have at least one enabled!
+# - Use option "auto" to automatically detect support
+# - Use true or false (no qoutes) to enable or disable each protocol
 protocol:
     ipv4: true
     ipv6: false

 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

   # * 0: Unload the model immediately after the request
   # * N (any positive number): Keep the model loaded for N seconds after the request.
   keepAlive: -1
+  # Controls the "num_batch" (batch size) parameter of the generation request
+  # * -1: Use the default value of the model
+  # * N (positive number): Use the specified value. Must be a power of 2, e.g. 128, 256, 512, etc.
+  batchSize: -1
 # -- ANTHROPIC CLAUDE API CONFIGURATION --
 claude:
   # Enables caching of the system prompt (if supported).

   cachingAtDepth: -1
 # -- SERVER PLUGIN CONFIGURATION --
 enableServerPlugins: false
+# Attempt to automatically update server plugins on startup
+enableServerPluginsAutoUpdate: true

default/content/index.json+0 -4 Viewed

         "type": "moving_ui"
     },
+    {
-        "filename": "presets/moving-ui/Black Magic Time.json",
-        "type": "moving_ui"
-    },
-    {
         "filename": "presets/quick-replies/Default.json",
         "type": "quick_replies"
     },

default/content/presets/moving-ui/Black Magic Time.json+0 -45 Viewed

-{
-    "name": "Black Magic Time",
-    "movingUIState": {
-        "sheld": {
-            "top": 488,
-            "left": 1407,
-            "right": 1,
-            "bottom": 4,
-            "margin": "unset",
-            "width": 471,
-            "height": 439
-        },
-        "floatingPrompt": {
-            "width": 369,
-            "height": 441
-        },
-        "right-nav-panel": {
-            "top": 0,
-            "left": 1400,
-            "right": 111,
-            "bottom": 446,
-            "margin": "unset",
-            "width": 479,
-            "height": 487
-        },
-        "WorldInfo": {
-            "top": 41,
-            "left": 369,
-            "right": 642,
-            "bottom": 51,
-            "margin": "unset",
-            "width": 1034,
-            "height": 858
-        },
-        "left-nav-panel": {
-            "top": 442,
-            "left": 0,
-            "right": 1546,
-            "bottom": 25,
-            "margin": "unset",
-            "width": 368,
-            "height": 483
-        }
-    }
-}
 \ No newline at end of file

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+65 -11 Viewed

+{
     "name": "sillytavern",
-    "version": "1.12.11",
+    "version": "1.12.12",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
-            "version": "1.12.11",
+            "version": "1.12.12",
             "hasInstallScript": true,
             "license": "AGPL-3.0",
             "dependencies": {

                 "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",

                 "html-entities": "^2.5.2",
                 "iconv-lite": "^0.6.3",
                 "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/jquery": "*"
+            }
         },
+        "node_modules/@types/trusted-types": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+            "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+            "license": "MIT",
+            "optional": true
+        },
         "node_modules/@types/write-file-atomic": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/@types/write-file-atomic/-/write-file-atomic-4.0.3.tgz",

+            }
         },
         "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",

             "integrity": "sha512-/ok+VhKMasgR5gvTRViwRFQfc0qYt9Vdowg6TO4/pFlDCob5ZjGPkwuOoQVCd5OrMm20zqh+1vA8KLJZTeWudg==",
             "license": "LGPL-3.0-only"
         },
+        "node_modules/ip-regex": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-5.0.0.tgz",
+            "integrity": "sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==",
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/ipaddr.js": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",

             "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+5 -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",

         "html-entities": "^2.5.2",
         "iconv-lite": "^0.6.3",
         "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",

         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.12.11",
+    "version": "1.12.12",
     "scripts": {
         "start": "node server.js",
+        "debug": "node server.js --inspect",
         "start:deno": "deno run --allow-run --allow-net --allow-read --allow-write --allow-sys --allow-env server.js",
         "start:bun": "bun server.js",
         "start:no-csrf": "node server.js --disableCsrf",

plugins.js+8 -1 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));

             console.log(`Updating plugin ${color.green(directory)}...`);
             const pluginPath = path.join(pluginsPath, directory);
             const pluginRepo = git(pluginPath);
+            const isRepo = await pluginRepo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
+            if (!isRepo) {
+                console.log(`Directory ${color.yellow(directory)} is not a Git repository`);
+                continue;
+            }
             await pluginRepo.fetch();
             const commitHash = await pluginRepo.revparse(['HEAD']);
             const trackingBranch = await pluginRepo.revparse(['--abbrev-ref', '@{u}']);

post-install.js+5 -0 Viewed

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

public/css/mobile-styles.css+0 -2 Viewed

+    }
-    #showRawPrompt,
-    #copyPromptToClipboard,
     #groupCurrentMemberPopoutButton,
     #summaryExtensionPopoutButton {
         display: none;

public/css/popup.css+4 -0 Viewed

     overflow-x: auto;
+}
+.popup.left_aligned_dialogue_popup .popup-content {
+    text-align: start;
+}
 /* Opening animation */
 .popup[opening] {
     animation: pop-in var(--popup-animation-speed) ease-in-out;

public/css/select2-overrides.css+7 -0 Viewed

     border: 1px solid var(--SmartThemeBorderColor);
+}
+.select2-container .select2-results .select2-results__option--disabled {
+    color: inherit;
+    background-color: inherit;
+    cursor: not-allowed;
+    filter: brightness(0.5);
+}
 .select2-container .select2-selection--multiple .select2-selection__choice,
 .select2-container .select2-selection--single .select2-selection__choice {
     border-radius: 5px;

public/css/toggle-dependent.css+9 -0 Viewed

     display: none;
+}
+label[for="trim_spaces"]:not(:has(input:checked)) small {
+    color: var(--warning);
+    opacity: 1;
+}
 #claude_function_prefill_warning {
     display: none;
     color: red;

 #mistralai_other_models:empty {
     display: none;
+}
+#banned_tokens_block_ooba:not(:has(#send_banned_tokens_textgenerationwebui:checked)) #banned_tokens_controls_ooba {
+    filter: brightness(0.5);
+}

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+167 -111 Viewed

                                             <input type="range" id="top_k_openai" name="volume" min="0" max="500" step="1">
                                         </div>
                                         <div class="range-block-counter">
-                                            <input type="number" min="0" max="200" step="1" data-for="top_k_openai" id="top_k_counter_openai">
+                                            <input type="number" min="0" max="500" step="1" data-for="top_k_openai" id="top_k_counter_openai">
                                         </div>
                                     </div>
                                 </div>

                                                 <input type="checkbox" id="skip_special_tokens_textgenerationwebui" />
                                                 <small data-i18n="Skip Special Tokens">Skip Special Tokens</small>
                                             </label>
+                                            <label data-tg-type="openrouter" class="checkbox_label flexGrow flexShrink" for="include_reasoning_textgenerationwebui">
+                                                <input type="checkbox" id="include_reasoning_textgenerationwebui" />
+                                                <small data-i18n="Request Model Reasoning">Request Model Reasoning</small>
+                                            </label>
                                             <label data-tg-type="ooba, aphrodite, tabby" class="checkbox_label  flexGrow flexShrink" for="temperature_last_textgenerationwebui">
                                                 <input type="checkbox" id="temperature_last_textgenerationwebui" />
                                                 <label>

                                     </div>
                                     <div data-tg-type-mode="except" data-tg-type="generic" id="banned_tokens_block_ooba" class="wide100p">
                                         <hr class="width100p">
-                                        <h4 class="range-block-title justifyCenter">
+                                        <div class="range-block-title title_restorable">
-                                            <span data-i18n="Banned Tokens">Banned Tokens/Strings</span>
+                                            <div>
+                                                <strong data-i18n="Banned Tokens">Banned Tokens/Strings</strong>
                                                 <div class="margin5 fa-solid fa-circle-info opacity50p " data-i18n="[title]LLaMA / Mistral / Yi models only" title="Enter sequences you don't want to appear in the output.&#13;Unquoted text will be tokenized in the back end and banned as tokens.&#13;[token ids] will be banned as-is.&#13;Most tokens have a leading space. Use token counter (with the correct tokenizer selected first!) if you are unsure.&#13;Enclose text in double quotes to ban the entire string as a set.&#13;Quoted Strings and [Token ids] must be on their own line."></div>
-                                        </h4>
+                                            </div>
+                                            <label id="send_banned_tokens_label" for="send_banned_tokens_textgenerationwebui" class="checkbox_label">
+                                                <input id="send_banned_tokens_textgenerationwebui" type="checkbox" style="display:none;" />
+                                                <small><i class="fa-solid fa-power-off menu_button togglable margin0"></i></small>
+                                            </label>
+                                        </div>
+                                        <div id="banned_tokens_controls_ooba">
+                                            <div class="textAlignCenter">
+                                                <small data-i18n="Global list">Global list</small>
+                                            </div>
+                                            <div class="wide100p marginBot10">
+                                                <textarea id="global_banned_tokens_textgenerationwebui" class="text_pole textarea_compact" name="global_banned_tokens_textgenerationwebui" rows="3" data-i18n="[placeholder]Example: some text [42, 69, 1337]" placeholder='some text as tokens&#10;[420, 69, 1337]&#10;"Some verbatim string"'></textarea>
+                                            </div>
+                                            <div class="textAlignCenter">
+                                                <small data-i18n="Preset-specific list">Preset-specific list</small>
+                                            </div>
                                             <div class="wide100p">
                                                 <textarea id="banned_tokens_textgenerationwebui" class="text_pole textarea_compact" name="banned_tokens_textgenerationwebui" rows="3" data-i18n="[placeholder]Example: some text [42, 69, 1337]" placeholder='some text as tokens&#10;[420, 69, 1337]&#10;"Some verbatim string"'></textarea>
                                             </div>
                                         </div>
+                                    </div>
                                     <div class="range-block wide100p">
                                         <div id="logit_bias_textgenerationwebui" class="range-block-title title_restorable">
-                                            <span data-i18n="Logit Bias">Logit Bias</span>
+                                            <strong data-i18n="Logit Bias">Logit Bias</strong>
                                             <div id="textgen_logit_bias_new_entry" class="menu_button menu_button_icon">
                                                 <i class="fa-xs fa-solid fa-plus"></i>
                                                 <small data-i18n="Add">Add</small>

                                             </span>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="openai,cohere,mistralai,custom,claude,openrouter,groq">
+                                    <div class="range-block" data-source="openai,cohere,mistralai,custom,claude,openrouter,groq,deepseek">
                                         <label for="openai_function_calling" class="checkbox_label flexWrap widthFreeExpand">
                                             <input id="openai_function_calling" type="checkbox" />
                                             <span data-i18n="Enable function calling">Enable function calling</span>

                                             <span data-i18n="image_inlining_hint_3">menu to attach an image file to the chat.</span>
                                         </div>
                                         <div class="flex-container flexFlowColumn wide100p textAlignCenter marginTop10" data-source="openai,custom">
+                                            <div class="flex-container oneline-dropdown">
                                                 <label for="openai_inline_image_quality" data-i18n="Inline Image Quality">
                                                     Inline Image Quality
                                                 </label>

                                                 </select>
                                             </div>
                                         </div>
+                                    </div>
                                     <div class="range-block" data-source="makersuite">
                                         <label for="use_makersuite_sysprompt" class="checkbox_label widthFreeExpand">
                                             <input id="use_makersuite_sysprompt" type="checkbox" />

                                             </span>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="makersuite,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>
-                                                <span data-i18n="Show model reasoning">Show model reasoning</span>
+                                                <span data-i18n="Request model reasoning">Request model reasoning</span>
-                                                <i class="opacity50p fa-solid fa-circle-info" title="Gemini 2.0 Thinking / DeepSeek Reasoner"></i>
+                                                <i class="opacity50p fa-solid fa-circle-info" title="DeepSeek Reasoner"></i>
                                             </span>
                                         </label>
                                         <div class="toggle-description justifyLeft marginBot5">
-                                            <span data-i18n="Display the model's internal thoughts in the response.">
+                                            <span data-i18n="Allows the model to return its thinking process.">
-                                                Display the model's internal thoughts in the response.
+                                                Allows the model to return its thinking process.
                                             </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." data-i18n="[title]Constrains effort on reasoning for reasoning models.">
+                                            <label for="openai_reasoning_effort" data-i18n="Reasoning Effort">
+                                                Reasoning Effort
+                                            </label>
+                                            <select id="openai_reasoning_effort">
+                                                <option data-i18n="openai_reasoning_effort_low" value="low">Low</option>
+                                                <option data-i18n="openai_reasoning_effort_medium" value="medium">Medium</option>
+                                                <option data-i18n="openai_reasoning_effort_high" value="high">High</option>
+                                            </select>
+                                        </div>
+                                    </div>
                                     <div class="range-block" data-source="claude">
                                         <div class="wide100p">
                                             <div class="flex-container alignItemsCenter">

                             <div>
                                 <h4 data-i18n="OpenAI Model">OpenAI Model</h4>
                                 <select id="model_openai_select">
-                                    <optgroup label="GPT-3.5 Turbo">
-                                        <option value="gpt-3.5-turbo">gpt-3.5-turbo</option>
-                                        <option value="gpt-3.5-turbo-0125">gpt-3.5-turbo-0125 (2024)</option>
-                                        <option value="gpt-3.5-turbo-1106">gpt-3.5-turbo-1106 (2023)</option>
-                                        <option value="gpt-3.5-turbo-0613">gpt-3.5-turbo-0613 (2023)</option>
-                                        <option value="gpt-3.5-turbo-0301">gpt-3.5-turbo-0301 (2023)</option>
-                                        <option value="gpt-3.5-turbo-16k">gpt-3.5-turbo-16k</option>
-                                        <option value="gpt-3.5-turbo-16k-0613">gpt-3.5-turbo-16k-0613 (2023)</option>
-                                    </optgroup>
-                                    <optgroup label="GPT-3.5 Turbo Instruct">
-                                        <option value="gpt-3.5-turbo-instruct">gpt-3.5-turbo-instruct</option>
-                                        <option value="gpt-3.5-turbo-instruct-0914">gpt-3.5-turbo-instruct-0914</option>
-                                    </optgroup>
-                                    <optgroup label="GPT-4">
-                                        <option value="gpt-4">gpt-4</option>
-                                        <option value="gpt-4-0613">gpt-4-0613 (2023)</option>
-                                        <option value="gpt-4-0314">gpt-4-0314 (2023)</option>
-                                        <option value="gpt-4-32k">gpt-4-32k</option>
-                                        <option value="gpt-4-32k-0613">gpt-4-32k-0613 (2023)</option>
-                                        <option value="gpt-4-32k-0314">gpt-4-32k-0314 (2023)</option>
-                                    </optgroup>
                                     <optgroup label="GPT-4o">
                                         <option value="gpt-4o">gpt-4o</option>
                                         <option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option>

                                         <option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>
                                         <option value="chatgpt-4o-latest">chatgpt-4o-latest</option>
                                     </optgroup>
-                                    <optgroup label="gpt-4o-mini">
+                                    <optgroup label="GPT-4o mini">
                                         <option value="gpt-4o-mini">gpt-4o-mini</option>
-                                        <option value="gpt-4o-mini-2024-07-18">gpt-4o-mini-2024-07-18</option>
+                                        <option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option>
+                                        <option value="gpt-4o-2024-08-06">gpt-4o-2024-08-06</option>
+                                        <option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>
+                                        <option value="chatgpt-4o-latest">chatgpt-4o-latest</option>
                                     </optgroup>
-                                    <optgroup label="GPT-4 Turbo">
+                                    <optgroup label="o1 and o1-mini">
+                                        <option value="o1">o1</option>
+                                        <option value="o1-2024-12-17">o1-2024-12-17</option>
+                                        <option value="o1-mini">o1-mini</option>
+                                        <option value="o1-mini-2024-09-12">o1-mini-2024-09-12</option>
+                                        <option value="o1-preview">o1-preview</option>
+                                        <option value="o1-preview-2024-09-12">o1-preview-2024-09-12</option>
+                                    </optgroup>
+                                    <optgroup label="o3">
+                                        <option value="o3-mini">o3-mini</option>
+                                        <option value="o3-mini-2025-01-31">o3-mini-2025-01-31</option>
+                                    </optgroup>
+                                    <optgroup label="GPT-4 Turbo and GPT-4">
                                         <option value="gpt-4-turbo">gpt-4-turbo</option>
                                         <option value="gpt-4-turbo-2024-04-09">gpt-4-turbo-2024-04-09</option>
                                         <option value="gpt-4-turbo-preview">gpt-4-turbo-preview</option>
-                                        <option value="gpt-4-vision-preview">gpt-4-vision-preview</option>
                                         <option value="gpt-4-0125-preview">gpt-4-0125-preview (2024)</option>
                                         <option value="gpt-4-1106-preview">gpt-4-1106-preview (2023)</option>
+                                        <option value="gpt-4">gpt-4</option>
+                                        <option value="gpt-4-0613">gpt-4-0613 (2023)</option>
+                                        <option value="gpt-4-0314">gpt-4-0314 (2023)</option>
                                     </optgroup>
-                                    <optgroup label="o1">
+                                    <optgroup label="GPT-3.5 Turbo">
-                                        <option value="o1-preview">o1-preview</option>
+                                        <option value="gpt-3.5-turbo">gpt-3.5-turbo</option>
-                                        <option value="o1-mini">o1-mini</option>
+                                        <option value="gpt-3.5-turbo-0125">gpt-3.5-turbo-0125 (2024)</option>
+                                        <option value="gpt-3.5-turbo-1106">gpt-3.5-turbo-1106 (2023)</option>
+                                        <option value="gpt-3.5-turbo-instruct">gpt-3.5-turbo-instruct</option>
                                     </optgroup>
                                     <optgroup label="Other">
-                                        <option value="text-davinci-003">text-davinci-003</option>
+                                        <option value="babbage-002">babbage-002</option>
-                                        <option value="text-davinci-002">text-davinci-002</option>
+                                        <option value="davinci-002">davinci-002</option>
-                                        <option value="text-curie-001">text-curie-001</option>
-                                        <option value="text-babbage-001">text-babbage-001</option>
-                                        <option value="text-ada-001">text-ada-001</option>
-                                        <option value="code-davinci-002">code-davinci-002</option>
                                     </optgroup>
                                     <optgroup id="openai_external_category" label="External">
                                     </optgroup>

                                 <h4 data-i18n="Google Model">Google Model</h4>
                                 <select id="model_google_select">
                                     <optgroup label="Primary">
+                                        <option value="gemini-2.0-flash">Gemini 2.0 Flash</option>
                                         <option value="gemini-1.5-pro">Gemini 1.5 Pro</option>
                                         <option value="gemini-1.5-flash">Gemini 1.5 Flash</option>
                                         <option value="gemini-1.0-pro">Gemini 1.0 Pro (Deprecated)</option>

                                         <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>
                                     </optgroup>
                                     <optgroup label="Subversions">
+                                        <option value="gemini-2.0-pro-exp">Gemini 2.0 Pro Experimental</option>
+                                        <option value="gemini-2.0-pro-exp-02-05">Gemini 2.0 Pro Experimental 2025-02-05</option>
+                                        <option value="gemini-2.0-flash-lite-preview">Gemini 2.0 Flash-Lite Preview</option>
+                                        <option value="gemini-2.0-flash-lite-preview-02-05">Gemini 2.0 Flash-Lite Preview 2025-02-05</option>
+                                        <option value="gemini-2.0-flash-001">Gemini 2.0 Flash [001]</option>
                                         <option value="gemini-2.0-flash-thinking-exp">Gemini 2.0 Flash Thinking Experimental</option>
                                         <option value="gemini-2.0-flash-thinking-exp-01-21">Gemini 2.0 Flash Thinking Experimental 2025-01-21</option>
                                         <option value="gemini-2.0-flash-thinking-exp-1219">Gemini 2.0 Flash Thinking Experimental 2024-12-19</option>

                             </div>
                             <h4 data-i18n="Groq Model">Groq Model</h4>
                             <select id="model_groq_select">
-                                <optgroup label="Llama 3.3">
+                                <optgroup label="Alibaba Cloud">
-                                    <option value="llama-3.3-70b-versatile">llama-3.3-70b-versatile</option>
+                                    <option value="qwen-2.5-32b">qwen-2.5-32b</option>
+                                    <option value="qwen-2.5-coder-32b">qwen-2.5-coder-32b</option>
+                                </optgroup>
+                                <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>
+                                </optgroup>
+                                <optgroup label="Google">
+                                    <option value="gemma2-9b-it">gemma2-9b-it</option>
                                 </optgroup>
-                                <optgroup label="Llama 3.2">
+                                <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>
-                                </optgroup>
+                                    <option value="llama-3.3-70b-specdec">llama-3.3-70b-specdec </option>
-                                <optgroup label="Llama 3.1">
+                                    <option value="llama-3.3-70b-versatile">llama-3.3-70b-versatile </option>
-                                    <option value="llama-3.1-8b-instant">llama-3.1-8b-instant</option>
+                                    <option value="llama-guard-3-8b">llama-guard-3-8b </option>
-                                    <option value="llama-3.1-70b-versatile">llama-3.1-70b-versatile</option>
-                                    <option value="llama-3.1-405b-reasoning">llama-3.1-405b-reasoning</option>
-                                </optgroup>
-                                <optgroup label="Llama 3">
-                                    <option value="llama3-groq-8b-8192-tool-use-preview">llama3-groq-8b-8192-tool-use-preview</option>
-                                    <option value="llama3-groq-70b-8192-tool-use-preview">llama3-groq-70b-8192-tool-use-preview</option>
-                                    <option value="llama3-8b-8192">llama3-8b-8192</option>
                                     <option value="llama3-70b-8192">llama3-70b-8192 </option>
+                                    <option value="llama3-8b-8192">llama3-8b-8192 </option>
                                 </optgroup>
-                                <optgroup label="Gemma">
+                                <optgroup label="Mistral AI">
-                                    <option value="gemma-7b-it">gemma-7b-it</option>
-                                    <option value="gemma2-9b-it">gemma2-9b-it</option>
-                                </optgroup>
-                                <optgroup label="Other">
                                     <option value="mixtral-8x7b-32768">mixtral-8x7b-32768</option>
-                                    <option value="llava-v1.5-7b-4096-preview">llava-v1.5-7b-4096-preview</option>
                                 </optgroup>
                             </select>
                         </div>

                             <h4 data-i18n="Perplexity Model">Perplexity Model</h4>
                             <select id="model_perplexity_select">
                                 <optgroup label="Perplexity Sonar Models">
+                                    <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 -->
                                     <option value="llama-3.1-sonar-small-128k-online">llama-3.1-sonar-small-128k-online</option>
                                     <option value="llama-3.1-sonar-large-128k-online">llama-3.1-sonar-large-128k-online</option>
                                     <option value="llama-3.1-sonar-huge-128k-online">llama-3.1-sonar-huge-128k-online</option>
-                                </optgroup>
+                                    <!-- These are not listed on the site anymore -->
-                                <optgroup label="Perplexity Chat Models">
                                     <option value="llama-3.1-sonar-small-128k-chat">llama-3.1-sonar-small-128k-chat</option>
                                     <option value="llama-3.1-sonar-large-128k-chat">llama-3.1-sonar-large-128k-chat</option>
                                 </optgroup>
-                                <optgroup label="Open-Source Models">
-                                    <option value="llama-3.1-8b-instruct">llama-3.1-8b-instruct</option>
-                                    <option value="llama-3.1-70b-instruct">llama-3.1-70b-instruct</option>
-                                </optgroup>
-                                <optgroup label="Deprecated Models">
-                                    <option value="llama-3-sonar-small-32k-chat">llama-3-sonar-small-32k-chat</option>
-                                    <option value="llama-3-sonar-small-32k-online">llama-3-sonar-small-32k-online</option>
-                                    <option value="llama-3-sonar-large-32k-chat">llama-3-sonar-large-32k-chat</option>
-                                    <option value="llama-3-sonar-large-32k-online">llama-3-sonar-large-32k-online</option>
-                                    <option value="sonar-small-chat">sonar-small-chat</option>
-                                    <option value="sonar-small-online">sonar-small-online</option>
-                                    <option value="sonar-medium-chat">sonar-medium-chat</option>
-                                    <option value="sonar-medium-online">sonar-medium-online</option>
-                                    <option value="llama-3-8b-instruct">llama-3-8b-instruct</option>
-                                    <option value="llama-3-70b-instruct">llama-3-70b-instruct</option>
-                                    <option value="mistral-7b-instruct">mistral-7b-instruct (v0.2)</option>
-                                    <option value="mixtral-8x7b-instruct">mixtral-8x7b-instruct</option>
-                                </optgroup>
                             </select>
                         </div>
                         <form id="cohere_form" data-source="cohere" action="javascript:void(null);" method="post" enctype="multipart/form-data">

                                 </label>
                                 <label id="instruct_enabled_label"for="instruct_enabled" class="checkbox_label flex1" title="Enable Instruct Mode" data-i18n="[title]instruct_enabled">
                                     <input id="instruct_enabled" type="checkbox" style="display:none;" />
-                                    <small><i class="fa-solid fa-power-off menu_button margin0"></i></small>
+                                    <small><i class="fa-solid fa-power-off menu_button togglable margin0"></i></small>
                                 </label>
                             </div>
                         </h4>

                             <div class="flex-container">
                                 <label id="sysprompt_enabled_label" for="sysprompt_enabled" class="checkbox_label flex1" title="Enable System Prompt" data-i18n="[title]sysprompt_enabled">
                                     <input id="sysprompt_enabled" type="checkbox" style="display:none;" />
-                                    <small><i class="fa-solid fa-power-off menu_button margin0"></i></small>
+                                    <small><i class="fa-solid fa-power-off menu_button togglable margin0"></i></small>
                                 </label>
                             </div>
                         </h4>

                             </div>
                             <label class="checkbox_label" for="custom_stopping_strings_macro">
                                 <input id="custom_stopping_strings_macro" type="checkbox" checked>
-                                <small data-i18n="Replace Macro in Custom Stopping Strings">
+                                <small data-i18n="Replace Macro in Stop Strings">
-                                    Replace Macro in Custom Stopping Strings
+                                    Replace Macro in Stop Strings
                                 </small>
                             </label>
                         </div>

                                 <span data-i18n="Reasoning">Reasoning</span>
                             </h4>
                             <div>
-                                <label class="checkbox_label" for="reasoning_add_to_prompts" title="Add existing reasoning blocks to prompts. To add a new reasoning block, use the message edit menu." data-i18n="[title]reasoning_add_to_prompts">
+                                <div class="flex-container alignItemsBaseline">
+                                    <label class="checkbox_label flex1" for="reasoning_auto_parse" title="Automatically parse reasoning blocks from main content between the reasoning prefix/suffix. Both fields must be defined and non-empty." data-i18n="[title]reasoning_auto_parse">
+                                        <input id="reasoning_auto_parse" type="checkbox" />
+                                        <small data-i18n="Auto-Parse">
+                                            Auto-Parse
+                                        </small>
+                                    </label>
+                                    <label class="checkbox_label flex1" for="reasoning_auto_expand" title="Automatically expand reasoning blocks." data-i18n="[title]reasoning_auto_expand">
+                                        <input id="reasoning_auto_expand" type="checkbox" />
+                                        <small data-i18n="Auto-Expand">
+                                            Auto-Expand
+                                        </small>
+                                    </label>
+                                    <label class="checkbox_label flex1" for="reasoning_show_hidden" title="Show reasoning time for models with hidden reasoning." data-i18n="[title]reasoning_show_hidden">
+                                        <input id="reasoning_show_hidden" type="checkbox" />
+                                        <small data-i18n="Show Hidden">
+                                            Show Hidden
+                                        </small>
+                                    </label>
+                                </div>
+                                <div class="flex-container alignItemsBaseline">
+                                    <label class="checkbox_label flex1" for="reasoning_add_to_prompts" title="Add existing reasoning blocks to prompts. To add a new reasoning block, use the message edit menu." data-i18n="[title]reasoning_add_to_prompts">
                                         <input id="reasoning_add_to_prompts" type="checkbox" />
-                                    <small data-i18n="Add Reasoning to Prompts">
+                                        <small data-i18n="Add to Prompts">
-                                        Add Reasoning to Prompts
+                                            Add to Prompts
                                         </small>
                                     </label>
+                                    <div class="flex1 flex-container alignItemsBaseline" title="Maximum number of reasoning blocks to be added per prompt, counting from the last message." data-i18n="[title]reasoning_max_additions">
+                                        <input id="reasoning_max_additions" class="text_pole textarea_compact widthUnset" type="number" min="0" max="999"></textarea>
+                                        <small data-i18n="Max">Max</small>
+                                    </div>
+                                </div>
+                                <details>
+                                    <summary data-i18n="Reasoning Formatting">
+                                        Reasoning Formatting
+                                    </summary>
                                     <div class="flex-container">
                                         <div class="flex1" title="Inserted before the reasoning content." data-i18n="[title]reasoning_prefix">
                                             <small data-i18n="Prefix">Prefix</small>

                                             <small data-i18n="Separator">Separator</small>
                                             <textarea id="reasoning_separator" class="text_pole textarea_compact autoSetHeight"></textarea>
                                         </div>
-                                    <div class="flex1" title="Maximum number of reasoning blocks to be added per prompt, counting from the last message." data-i18n="[title]reasoning_max_additions">
-                                        <small data-i18n="Max Additions">Max Additions</small>
-                                        <input id="reasoning_max_additions" class="text_pole textarea_compact" type="number" min="0" max="999"></textarea>
-                                    </div>
                                     </div>
+                                </details>
                             </div>
                         </div>
                         <div>

                                             <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">

                                             <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="extensions_settings" class="flex1 wide50p">
                         <div id="assets_container" class="extension_container"></div>
+                        <div id="typing_indicator_container" class="extension_container"></div>
                         <div id="expressions_container" class="extension_container"></div>
                         <div id="sd_container" class="extension_container"></div>
                         <div id="tts_container" class="extension_container"></div>

                         <div class="inline-drawer-content flex-container paddingBottom5px wide100p">
                             <div class="flex-container wide100p alignitemscenter">
                                 <div name="keywordsAndLogicBlock" class="flex-container wide100p alignitemscenter">
-                                    <div class="world_entry_form_control flex1">
+                                    <div class="world_entry_form_control keyprimary flex1">
                                         <small class="displayNone">
                                             <span data-i18n="Comma separated (required)">
                                                 Comma separated (required)

                         </div>
                     </div>
                     <details class="mes_reasoning_details">
-                        <summary class="mes_reasoning_summary">
+                        <summary class="mes_reasoning_summary flex-container">
-                            <span data-i18n="Reasoning">Reasoning</span>
+                            <div class="mes_reasoning_header_block flex-container">
-                            <div class="mes_reasoning_actions">
+                                <div class="mes_reasoning_header flex-container">
-                                <div class="mes_reasoning_edit_done mes_button fa-solid fa-check" title="Confirm" data-i18n="[title]Confirmedit"></div>
+                                    <span class="mes_reasoning_header_title" data-i18n="Thought for some time">Thought for some time</span>
-                                <div class="mes_reasoning_edit_cancel mes_button fa-solid fa-xmark" title="Cancel edit" data-i18n="[title]Cancel edit"></div>
+                                    <div class="mes_reasoning_arrow fa-solid fa-chevron-up"></div>
-                                <div class="mes_reasoning_edit mes_button fa-solid fa-pencil" title="Edit reasoning" data-i18n="[title]Edit reasoning"></div>
+                                </div>
+                            </div>
+                            <div class="mes_reasoning_actions flex-container">
+                                <div class="mes_reasoning_edit_done menu_button edit_button fa-solid fa-check" title="Confirm" data-i18n="[title]Confirmedit"></div>
+                                <div class="mes_reasoning_delete menu_button edit_button fa-solid fa-trash-can" title="Remove reasoning" data-i18n="[title]Remove reasoning"></div>
+                                <div class="mes_reasoning_edit_cancel menu_button edit_button fa-solid fa-xmark" title="Cancel edit" data-i18n="[title]Cancel edit"></div>
                                 <div class="mes_reasoning_copy mes_button fa-solid fa-copy" title="Copy reasoning" data-i18n="[title]Copy reasoning"></div>
-                                <div class="mes_reasoning_delete mes_button fa-solid fa-trash-can" title="Remove reasoning" data-i18n="[title]Remove reasoning"></div>
+                                <div class="mes_reasoning_edit mes_button fa-solid fa-pencil" title="Edit reasoning" data-i18n="[title]Edit reasoning"></div>
                             </div>
                         </summary>
                         <div class="mes_reasoning"></div>

         </div>
         <!-- chat and input bar -->
-        <div id="typing_indicator_template" class="template_element">
-            <div class="typing_indicator"><span class="typing_indicator_name">CHAR</span> is typing</div>
-        </div>
         <div id="message_file_template" class="template_element">
             <div class="mes_file_container">
                 <div class="fa-lg fa-solid fa-file-alt mes_file_icon"></div>

         </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

     "separate with commas w/o space between": "فصل بفواصل دون مسافة بينها",
     "Custom Stopping Strings": "سلاسل توقف مخصصة",
     "JSON serialized array of strings": "مصفوفة سلسلة JSON متسلسلة",
-    "Replace Macro in Custom Stopping Strings": "استبدال الماكرو في سلاسل التوقف المخصصة",
+    "Replace Macro in Stop Strings": "استبدال الماكرو في سلاسل التوقف المخصصة",
     "Auto-Continue": "المتابعة التلقائية",
     "Allow for Chat Completion APIs": "السماح بواجهات برمجة التطبيقات لإكمال الدردشة",
     "Target length (tokens)": "الطول المستهدف (رموز)",

     "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

     "separate with commas w/o space between": "getrennt durch Kommas ohne Leerzeichen dazwischen",
     "Custom Stopping Strings": "Benutzerdefinierte Stoppzeichenfolgen",
     "JSON serialized array of strings": "JSON serialisierte Reihe von Zeichenfolgen",
-    "Replace Macro in Custom Stopping Strings": "Makro in benutzerdefinierten Stoppzeichenfolgen ersetzen",
+    "Replace Macro in Stop Strings": "Makro in benutzerdefinierten Stoppzeichenfolgen ersetzen",
     "Auto-Continue": "Automatisch fortsetzen",
     "Allow for Chat Completion APIs": "Erlaube Chat-Vervollständigungs-APIs",
     "Target length (tokens)": "Ziel-Länge (Tokens)",

     "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

     "separate with commas w/o space between": "separe con comas sin espacio entre ellas",
     "Custom Stopping Strings": "Cadenas de Detención Personalizadas",
     "JSON serialized array of strings": "Arreglo de cadenas serializado en JSON",
-    "Replace Macro in Custom Stopping Strings": "Reemplazar macro en Cadenas de Detención Personalizadas",
+    "Replace Macro in Stop Strings": "Reemplazar macro en Cadenas de Detención Personalizadas",
     "Auto-Continue": "Autocontinuar",
     "Allow for Chat Completion APIs": "Permitir para APIs de Completado de Chat",
     "Target length (tokens)": "Longitud objetivo (tokens)",

     "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+5 -6 Viewed

     "Non-markdown strings": "Chaînes non Markdown",
     "Custom Stopping Strings": "Chaînes d'arrêt personnalisées",
     "JSON serialized array of strings": "Tableau de chaînes sérialisé JSON",
-    "Replace Macro in Custom Stopping Strings": "Remplacer les macro dans les chaînes d'arrêt personnalisées",
+    "Replace Macro in Stop Strings": "Remplacer les macro dans les chaînes d'arrêt personnalisées",
     "Auto-Continue": "Auto-Continue",
     "Allow for Chat Completion APIs": "Autoriser les APIs de complétion de chat",
     "Target length (tokens)": "Longueur cible (tokens)",

     "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",

     "enable_functions_desc_1": "Autorise l'utilisation",
     "enable_functions_desc_2": "outils de fonction",
     "enable_functions_desc_3": "Peut être utilisé par diverses extensions pour fournir des fonctionnalités supplémentaires.",
-    "Show model reasoning": "Afficher les pensées du modèle",
+    "Request model reasoning": "Demander les pensées du modèle",
-    "Display the model's internal thoughts in the response.": "Afficher les pensées internes du modèle dans la réponse.",
+    "Allows the model to return its thinking process.": "Permet au modèle de retourner son processus de réflexion.",
     "Confirm token parsing with": "Confirmer l'analyse des tokens avec",
     "openai_logit_bias_no_items": "Aucun élément",
     "api_no_connection": "Pas de connection...",

     "(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

     "separate with commas w/o space between": "aðskilið með kommum án bila milli",
     "Custom Stopping Strings": "Eigin stopp-strengir",
     "JSON serialized array of strings": "JSON raðað fylki af strengjum",
-    "Replace Macro in Custom Stopping Strings": "Skiptu út í macro í sérsniðnum stoppa strengjum",
+    "Replace Macro in Stop Strings": "Skiptu út í macro í sérsniðnum stoppa strengjum",
     "Auto-Continue": "Sjálfvirk Forná",
     "Allow for Chat Completion APIs": "Leyfa fyrir spjall Loka APIs",
     "Target length (tokens)": "Markaðarlengd (texti)",

     "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

     "separate with commas w/o space between": "separati con virgole senza spazio tra loro",
     "Custom Stopping Strings": "Stringhe di Stop Personalizzate",
     "JSON serialized array of strings": "Matrice serializzata JSON di stringhe",
-    "Replace Macro in Custom Stopping Strings": "Sostituisci Macro in Stringhe di Arresto Personalizzate",
+    "Replace Macro in Stop Strings": "Sostituisci Macro in Stringhe di Arresto Personalizzate",
     "Auto-Continue": "Auto-continua",
     "Allow for Chat Completion APIs": "Consenti per API di completamento chat",
     "Target length (tokens)": "Lunghezza obiettivo (token)",

     "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

     "separate with commas w/o space between": "間にスペースのないカンマで区切ります",
     "Custom Stopping Strings": "カスタム停止文字列",
     "JSON serialized array of strings": "文字列のJSONシリアル化配列",
-    "Replace Macro in Custom Stopping Strings": "カスタム停止文字列内のマクロを置換する",
+    "Replace Macro in Stop Strings": "カスタム停止文字列内のマクロを置換する",
     "Auto-Continue": "自動継続",
     "Allow for Chat Completion APIs": "チャット補完APIを許可",
     "Target length (tokens)": "ターゲット長さ（トークン）",

     "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+11 -12 Viewed

     "Sampler Priority": "샘플러 우선 순위",
     "Ooba only. Determines the order of samplers.": "Ooba 전용. 샘플러의 순서를 결정합니다.",
     "Character Names Behavior": "캐릭터 이름 동작",
-    "[title]character_names_none": "캐릭터 이름 접두사를 추가하지 않습니다. 그룹 채팅에서는 좋지 않을 수 있으므로, 이 설정을 선택할 때는 주의해야 합니다.",
+    "character_names_none": "캐릭터 이름 접두사를 추가하지 않습니다. 그룹 채팅에서는 좋지 않을 수 있으므로, 이 설정을 선택할 때는 주의해야 합니다.",
     "Helps the model to associate messages with characters.": "모델이 메시지를 캐릭터와 연관시키는 데 도움이 됩니다.",
     "None": "없음",
     "None (not injected)": "없음 (삽입되지 않음)",

     "Custom API Key": "커스텀 API 키",
     "Available Models": "사용 가능한 모델",
     "Prompt Post-Processing": "신속한 후처리",
-    "[title]API Connections;[no_connection_text]api_no_connection": "연결이 되지 않았습니다...",
+    "api_no_connection": "연결이 되지 않았습니다...",
     "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": "테스트 메시지",

     "separate with commas w/o space between": "쉼표로 구분 (공백 없이)",
     "Custom Stopping Strings": "사용자 정의 중지 문자열",
     "JSON serialized array of strings": "문자열의 JSON 직렬화된 배열",
-    "Replace Macro in Custom Stopping Strings": "사용자 정의 중단 문자열에서 매크로 교체",
+    "Replace Macro in Stop Strings": "사용자 정의 중단 문자열에서 매크로 교체",
     "Auto-Continue": "자동 계속하기",
     "Allow for Chat Completion APIs": "채팅 완성 API 허용",
     "Target length (tokens)": "대상 길이 (토큰)",

     "Single-row message input area. Mobile only, no effect on PC": "한 줄짜리 메시지 입력 영역. 모바일 전용, PC에는 영향 없음",
     "Compact Input Area (Mobile)": "조그마한 입력 영역 (모바일)",
     "Swipe # for All Messages": "모든 스와이프 메시지에 대해 번호 매기기",
-    "[title]Display swipe numbers for all messages, not just the last.": "마지막 메시지만이 아니라 모든 메시지에 대한 스와이프 번호를 표시합니다.",
+    "Display swipe numbers for all messages, not just the last.": "마지막 메시지만이 아니라 모든 메시지에 대한 스와이프 번호를 표시합니다.",
     "In the Character Management panel, show quick selection buttons for favorited characters": "캐릭터 관리 패널에서 즐겨찾는 캐릭터에 대한 빠른 선택 버튼을 표시합니다",
     "Characters Hotswap": "캐릭터 핫스왑",
     "Enable magnification for zoomed avatar display.": "마우스 포인터를 아바타 위에 올려두면 아바타가 확대 됩니다.",

     "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": "로컬",

     "Only apply color as accent": "색상은 오직 강조로써만 적용됩니다",
     "qr--colorClear": "색상 지우기",
     "Color": "색상",
-    "[title]world_button_title": "캐릭터 로어. 클릭하여 로드하세요. Shift를 클릭하면 '월드 인포 링크' 팝업이 열립니다.",
+    "world_button_title": "캐릭터 로어. 클릭하여 로드하세요. Shift를 클릭하면 '월드 인포 링크' 팝업이 열립니다.",
     "Select TTS Provider": "TTS 공급자 선택",
     "tts_enabled": "활성화",
     "Narrate user messages": "사용자 메시지 나레이션",

     "Prompt Content": "프롬프트 내용",
     "Instruct Sequences": "지시 시퀀스",
     "Prefer Character Card Instructions": "캐릭터 카드의 지시사항을 선호",
-    "[title]If checked and the character card contains a Post-History Instructions override, use that instead": "활성화 된 경우, 캐릭터 카드에 Post-History 지시 무시 항목이 포함되어 있으면, 카드 지시사항의 내용으로 대신 사용합니다.",
+    "If checked and the character card contains a Post-History Instructions override, use that instead": "활성화 된 경우, 캐릭터 카드에 Post-History 지시 무시 항목이 포함되어 있으면, 카드 지시사항의 내용으로 대신 사용합니다.",
     "Auto-select Input Text": "입력 텍스트 자동 선택",
-    "[title]Enable auto-select of input text in some text fields when clicking/selecting them. Applies to popup input textboxes, and possible other custom input fields.": "일부 텍스트 필드를 클릭하거나 선택할 때 자동으로 입력된 텍스트가 선택되도록 설정합니다. 팝업 입력창과 기타 커스텀 입력 필드에 적용됩니다.",
+    "Enable auto-select of input text in some text fields when clicking/selecting them. Applies to popup input textboxes, and possible other custom input fields.": "일부 텍스트 필드를 클릭하거나 선택할 때 자동으로 입력된 텍스트가 선택되도록 설정합니다. 팝업 입력창과 기타 커스텀 입력 필드에 적용됩니다.",
     "Markdown Hotkeys": "마크다운 입력 단축키",
-    "[title]markdown_hotkeys_desc": "특정 텍스트 입력창에서 마크다운 형식 문자를 입력하기 위한 단축키를 활성화합니다. '/help hotkeys'를 참고하세요.",
+    "markdown_hotkeys_desc": "특정 텍스트 입력창에서 마크다운 형식 문자를 입력하기 위한 단축키를 활성화합니다. '/help hotkeys'를 참고하세요.",
     "Show group chat queue": "그룹 채팅 대기열 표시",
-    "[title]In group chat, highlight the character(s) that are currently queued to generate responses and the order in which they will respond.": "그룹 채팅에서 응답을 생성하기 위해 현재 대기 중인 캐릭터와 응답할 순서를 강조 표시합니다.",
+    "In group chat, highlight the character(s) that are currently queued to generate responses and the order in which they will respond.": "그룹 채팅에서 응답을 생성하기 위해 현재 대기 중인 캐릭터와 응답할 순서를 강조 표시합니다.",
     "Quick 'Impersonate' button": "빠른 '사칭' 버튼",
-    "[title]Show a button in the input area to ask the AI to impersonate your character for a single message": "입력 영역에 AI에게 한 메시지 동안 당신의 캐릭터 연기를 사칭하도록 요청하는 버튼을 표시합니다.",
+    "Show a button in the input area to ask the AI to impersonate your character for a single message": "입력 영역에 AI에게 한 메시지 동안 당신의 캐릭터 연기를 사칭하도록 요청하는 버튼을 표시합니다.",
     "Injection Template": "삽입 템플릿",
     "Query messages": "쿼리 메시지 수",
     "Score threshold": "점수 임계값",

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

     "separate with commas w/o space between": "gescheiden met komma's zonder spatie ertussen",
     "Custom Stopping Strings": "Aangepaste Stopreeksen",
     "JSON serialized array of strings": "JSON geserialiseerde reeks van strings",
-    "Replace Macro in Custom Stopping Strings": "Macro vervangen in aangepaste stopreeksen",
+    "Replace Macro in Stop Strings": "Macro vervangen in aangepaste stopreeksen",
     "Auto-Continue": "Automatisch doorgaan",
     "Allow for Chat Completion APIs": "Chatvervolledigings-API's toestaan",
     "Target length (tokens)": "Doellengte (tokens)",

     "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

     "separate with commas w/o space between": "separe com vírgulas sem espaço entre",
     "Custom Stopping Strings": "Cadeias de parada personalizadas",
     "JSON serialized array of strings": "Matriz de strings serializada em JSON",
-    "Replace Macro in Custom Stopping Strings": "Substituir Macro em Strings de Parada Personalizadas",
+    "Replace Macro in Stop Strings": "Substituir Macro em Strings de Parada Personalizadas",
     "Auto-Continue": "Auto-Continuar",
     "Allow for Chat Completion APIs": "Permitir APIs de Completar Chat",
     "Target length (tokens)": "Comprimento alvo (tokens)",

     "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

     "View hidden API keys": "Посмотреть скрытые API-ключи",
     "Advanced Formatting": "Расширенное форматирование",
     "Context Template": "Шаблон контекста",
-    "Replace Macro in Custom Stopping Strings": "Заменять макросы в пользовательских стоп-строках",
+    "Replace Macro in Stop Strings": "Заменять макросы в пользовательских стоп-строках",
     "Story String": "Строка истории",
     "Example Separator": "Разделитель примеров сообщений",
     "Chat Start": "Начало чата",

     "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": "Токенов",

     "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

     "separate with commas w/o space between": "розділяйте комами без пропусків між ними",
     "Custom Stopping Strings": "Власні рядки зупинки",
     "JSON serialized array of strings": "JSON-серіалізований масив рядків",
-    "Replace Macro in Custom Stopping Strings": "Замінювати макроси у власних рядках зупинки",
+    "Replace Macro in Stop Strings": "Замінювати макроси у власних рядках зупинки",
     "Auto-Continue": "Автоматичне продовження",
     "Allow for Chat Completion APIs": "Дозволити для Chat Completion API",
     "Target length (tokens)": "Цільова довжина (токени)",

     "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

     "separate with commas w/o space between": "phân tách bằng dấu phẩy không có khoảng trắng giữa",
     "Custom Stopping Strings": "Chuỗi dừng tùy chỉnh",
     "JSON serialized array of strings": "Mảng chuỗi được tuần tự hóa JSON",
-    "Replace Macro in Custom Stopping Strings": "Thay thế Macro trong Chuỗi Dừng Tùy chỉnh",
+    "Replace Macro in Stop Strings": "Thay thế Macro trong Chuỗi Dừng Tùy chỉnh",
     "Auto-Continue": "Tự động Tiếp tục",
     "Allow for Chat Completion APIs": "Cho phép các API hoàn thành Trò chuyện",
     "Target length (tokens)": "Độ dài mục tiêu (token)",

     "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+15 -16 Viewed

     "Classifier Free Guidance. More helpful tip coming soon": "无分类器指导（CFG）。更多有用的提示敬请期待。",
     "Scale": "缩放比例",
     "Negative Prompt": "负面提示词",
-    "Used if CFG Scale is unset globally, per chat or character": "如果无分类器指导（CFG）缩放比例未在全局设置，它将作用于每个聊天或每个角色",
+    "Used if CFG Scale is unset globally, per chat or character": "如果CFG缩放比例未被全局设置，它将作用于所有聊天或角色",
     "Add text here that would make the AI generate things you don't want in your outputs.": "请在此处添加文本，以避免生成您不希望出现在输出中的内容。",
     "Grammar String": "语法字符串",
     "GBNF or EBNF, depends on the backend in use. If you're using this you should know which.": "GBNF 或 EBNF，取决于使用的后端。如果您使用这个，您应该知道该用哪一个。",

     "Use system prompt": "使用系统提示词",
     "Merges_all_system_messages_desc_1": "合并所有系统消息，直到第一条具有非系统角色的消息，然后通过",
     "Merges_all_system_messages_desc_2": "字段发送。",
-    "Show model reasoning": "展示思维链",
+    "Request model reasoning": "请求思维链",
-    "Display the model's internal thoughts in the response.": "展示模型在回复时的内部思维链。",
+    "Allows the model to return its thinking process.": "允许模型返回其思维过程。",
     "Assistant Prefill": "AI预填",
     "Expand the editor": "展开编辑器",
     "Start Claude's answer with...": "以如下内容开始Claude的回答...",

     "Prompt Content": "提示词内容",
     "Custom Stopping Strings": "自定义停止字符串",
     "JSON serialized array of strings": "JSON序列化的字符串数组",
-    "Replace Macro in Custom Stopping Strings": "替换自定义停止字符串中的宏",
+    "Replace Macro in Stop Strings": "替换自定义停止字符串中的宏",
     "Token Padding": "词符填充",
     "Miscellaneous": "杂项",
     "Non-markdown strings": "非 Markdown 字符串",

     "(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": "角色世界书优先",

     "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": "触发滑动的黑名单词语数量",

     "View contents": "查看内容",
     "Remove the file": "删除文件",
     "Author's Note": "作者注释",
-    "Unique to this chat": "此聊天独有",
+    "Unique to this chat": "仅对此聊天生效",
     "Checkpoints inherit the Note from their parent, and can be changed individually after that.": "检查点从其父级继承注释，之后可以单独更改。",
     "Include in World Info Scanning": "纳入世界信息扫描",
     "Before Main Prompt / Story String": "主提示词/故事线之前",

     "Replace Author's Note": "替换作者注",
     "Default Author's Note": "默认作者注",
     "Will be automatically added as the Author's Note for all new chats.": "将自动添加为所有新聊天的作者注释。",
-    "Chat CFG": "聊天CFG",
+    "Chat CFG": "本聊天的CFG缩放",
-    "1 = disabled": "“1”为已禁用",
+    "1 = disabled": "“1”为禁用",
     "write short replies, write replies using past tense": "写简短的回复，用过去时写回复",
     "Positive Prompt": "正面提示词",
     "Use character CFG scales": "单独为各个角色设置CFG缩放",
     "Character CFG": "角色CFG配置",
-    "Will be automatically added as the CFG for this character.": "将自动添加为该角色的 CFG。",
+    "Will be automatically added as the CFG for this character.": "将自动添加到该角色的CFG设置中。",
     "Global CFG": "全局CFG",
     "Will be used as the default CFG options for every chat unless overridden.": "除非被覆盖，否则将用作每次聊天的默认 CFG 选项。",
     "CFG Prompt Cascading": "CFG 提示词级联",

     "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",

     "ext_regex_replace_string_placeholder": "使用 {{match}} 包含来自“查找正则表达式”或“$1”、“$2”等的匹配文本作为捕获组。",
     "Trim Out": "修剪掉",
     "ext_regex_trim_placeholder": "在替换之前全局修剪正则表达式匹配中任何不需要的部分。用回车键分隔每个元素。",
-    "ext_regex_affects": "影响",
+    "ext_regex_affects": "作用范围",
     "ext_regex_user_input_desc": "用户发送的消息",
     "ext_regex_user_input": "用户输入",
     "ext_regex_ai_input_desc": "从生成式API中获取的信息。",

     "Chat Lorebook for": "聊天知识书",
     "chat_world_template_txt": "选定的世界信息将绑定到此聊天。生成 AI 回复时，\n它将与全球和角色传说书中的条目相结合。",
     "chat_rename_1": "输入聊天的新名称：",
-    "chat_rename_2": "注意！！使用已有文件名会导致错误！！",
+    "chat_rename_2": "注意！！与其他文件重名会导致错误！！",
-    "chat_rename_3": "此举会将次聊天与标记为“检查点”的聊天解绑。",
+    "chat_rename_3": "此举会将此聊天与标记为“检查点”的聊天解绑。",
-    "chat_rename_4": "不需要在结尾添加 '.JSONL'",
+    "chat_rename_4": "（不需要在结尾添加 '.JSONL' 后缀）",
     "Enter Checkpoint Name:": "输入检查点名称：",
     "(Leave empty to auto-generate)": "（留空以自动生成）",
     "The currently existing checkpoint will be unlinked and replaced with the new checkpoint, but can still be found in the Chat Management.": "当前检查点将会被解绑并替换为新的检查点，但仍可在聊天管理中找到。",

     "Enter your password below to confirm:": "输入您的密码以确认：",
     "Chat Scenario Override": "聊天场景覆盖",
     "Remove": "移除",
-    "Unique to this chat.": "Unique to this chat.",
+    "Unique to this chat.": "仅对此聊天生效。",
     "All group members will use the following scenario text instead of what is specified in their character cards.": "All group members will use the following scenario text instead of what is specified in their character cards.",
     "The following scenario text will be used instead of the value set in the character card.": "The following scenario text will be used instead of the value set in the character card.",
     "Checkpoints inherit the scenario override from their parent, and can be changed individually after that.": "Checkpoints inherit the scenario override from their parent, and can be changed individually after that.",

public/locales/zh-tw.json+6 -7 Viewed

     "separate with commas w/o space between": "用逗號分隔，之間無空格",
     "Custom Stopping Strings": "自訂停止字串",
     "JSON serialized array of strings": "JSON 序列化字串數組",
-    "Replace Macro in Custom Stopping Strings": "取代自訂停止字串中的巨集",
+    "Replace Macro in Stop Strings": "取代自訂停止字串中的巨集",
     "Auto-Continue": "自動繼續",
     "Allow for Chat Completion APIs": "允許聊天補全 API",
     "Target length (tokens)": "目標長度（符元）",

     "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": "滑動的黑名單詞語數量",

     "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（使用最小啟動設定時將停用）",
+    "0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc": "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": "插入範本",

     "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）",

     "Forbid": "禁止",
     "Aphrodite only. Determines the order of samplers. Skew is always applied post-softmax, so it's not included here.": "僅限 Aphrodite 使用。決定採樣器的順序。偏移總是在 softmax 後應用，因此不包括在此。",
     "Aphrodite only. Determines the order of samplers.": "僅限 Aphrodite 使用。決定採樣器的順序。",
-    "Show model reasoning": "顯示模型思維鏈",
+    "Request model reasoning": "請求模型思維鏈",
-    "Display the model's internal thoughts in the response.": "在回應中顯示模型的思維鏈（內部思考過程）。",
+    "Allows the model to return its thinking process.": "讓模型回傳其思考過程。",
     "Generic (OpenAI-compatible) [LM Studio, LiteLLM, etc.]": "通用（兼容 OpenAI）[LM Studio, LiteLLM 等]",
     "Model ID (optional)": "模型 ID（可選）",
     "DeepSeek API Key": "DeepSeek API 金鑰",

public/script.js+267 -205 Viewed

     resetMovableStyles,
     forceCharacterEditorTokenize,
     applyPowerUserSettings,
+    generatedTextFiltered,
 } from './scripts/power-user.js';
 import {

     toggleDrawer,
     isElementInViewport,
     copyText,
+    escapeHtml,
 } from './scripts/utils.js';
 import { debounce_timeout } from './scripts/constants.js';

 import { initBulkEdit } from './scripts/bulk-edit.js';
 import { deriveTemplatesFromChatTemplate } from './scripts/chat-templates.js';
 import { getContext } from './scripts/st-context.js';
-import { initReasoning, PromptReasoning } from './scripts/reasoning.js';
+import { extractReasoningFromData, initReasoning, PromptReasoning, ReasoningHandler, removeReasoningFromString, updateReasoningUI } from './scripts/reasoning.js';
+import { accountStorage } from './scripts/util/AccountStorage.js';
 // API OBJECT FOR EXTERNAL WIRING
 globalThis.SillyTavern = {

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

         const entityId = getCurrentEntityId();
         const warningShownKey = `mediaWarningShown:${entityId}`;
-        if (localStorage.getItem(warningShownKey) === null) {
+        if (accountStorage.getItem(warningShownKey) === null) {
             const warningToast = toastr.warning(
                 t`Use the 'Ext. Media' button to allow it. Click on this message to dismiss.`,
                 t`External media has been blocked`,

@@ -433,7 +440,7 @@ DOMPurify.addHook('uponSanitizeElement', (node, _, config) => {
433	},	440	},
434	);	441	);
435		442
436	localStorage.setItem(warningShownKey, 'true');	443	accountStorage.setItem(warningShownKey, 'true');
437	}	444	}
438	}	445	}
439	});	446	});

     // 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',
+    STREAM_REASONING_DONE: 'stream_reasoning_done',
     FILE_ATTACHMENT_DELETED: 'file_attachment_deleted',
     WORLDINFO_FORCE_ACTIVATE: 'worldinfo_force_activate',
     OPEN_CHARACTER_LIBRARY: 'open_character_library',

     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;
+}
 /**

     $('#rm_print_characters_pagination').pagination({
         dataSource: entities,
-        pageSize: Number(localStorage.getItem(storageKey)) || per_page_default,
+        pageSize: Number(accountStorage.getItem(storageKey)) || per_page_default,
         sizeChangerOptions: [10, 25, 50, 100, 250, 500, 1000],
         pageRange: 1,
         pageNumber: saveCharactersPage || 1,

             eventSource.emit(event_types.CHARACTER_PAGE_LOADED);
         },
         afterSizeSelectorChange: function (e) {
-            localStorage.setItem(storageKey, e.target.value);
+            accountStorage.setItem(storageKey, e.target.value);
         },
         afterPaging: function (e) {
             saveCharactersPage = e;

  * @param {boolean} isUser If the message was sent by the user
  * @param {number} messageId Message index in chat array
  * @param {object} [sanitizerOverrides] DOMPurify sanitizer option overrides
+ * @param {boolean} [isReasoning] If the message is reasoning output
  * @returns {string} HTML string
  */
-export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, sanitizerOverrides = {}) {
+export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, sanitizerOverrides = {}, isReasoning = false) {
     if (!mes) {
         return '';
+    }
-    if (Number(messageId) === 0 && !isSystem && !isUser) {
+    if (Number(messageId) === 0 && !isSystem && !isUser && !isReasoning) {
         const mesBeforeReplace = mes;
         const chatMessage = chat[messageId];
         mes = substituteParams(mes, undefined, ch_name);

     if (!isSystem) {
         function getRegexPlacement() {
             try {
+                if (isReasoning) {
+                    return regex_placement.REASONING;
+                }
                 if (isUser) {
                     return regex_placement.USER_INPUT;
                 } else if (chat[messageId]?.extra?.type === 'narrator') {

         mes = mes.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+    }
+    // Make sure reasoning strings are always shown, even if they include "<" or ">"
+    [power_user.reasoning.prefix, power_user.reasoning.suffix].forEach((reasoningString) => {
+        if (!reasoningString || !reasoningString.trim().length) {
+            return;
+        }
+        // Only replace the first occurrence of the reasoning string
+        if (mes.includes(reasoningString)) {
+            mes = mes.replace(reasoningString, escapeHtml(reasoningString));
+        }
+    });
     if (!isSystem) {
         // Save double quotes in tags as a special character to prevent them from being encoded
         if (!power_user.encode_tags) {

         modelName = extra.api;
+    }
-    const image = new Image();
+    const insertOrReplaceSVG = (image, className, targetSelector, insertBefore) => {
-    // Add classes for styling and identification
-    image.classList.add('icon-svg', 'timestamp-icon');
-    image.src = `/img/${modelName}.svg`;
-    image.title = `${extra?.api ? extra.api + ' - ' : ''}${extra?.model ?? ''}`;
         image.onload = async function () {
-        // Check if an SVG already exists adjacent to the timestamp
+            let existingSVG = insertBefore ? mes.find(targetSelector).prev(`.${className}`) : mes.find(targetSelector).next(`.${className}`);
-        let existingSVG = mes.find('.timestamp').next('.timestamp-icon');
             if (existingSVG.length) {
-            // Replace existing SVG
                 existingSVG.replaceWith(image);
             } else {
-            // Append the new SVG if none exists
+                if (insertBefore) mes.find(targetSelector).before(image);
-            mes.find('.timestamp').after(image);
+                else mes.find(targetSelector).after(image);
+            }
             await SVGInject(image);
         };
+    };
+    const createModelImage = (className, targetSelector, insertBefore) => {
+        const image = new Image();
+        image.classList.add('icon-svg', className);
+        image.src = `/img/${modelName}.svg`;
+        image.title = `${extra?.api ? extra.api + ' - ' : ''}${extra?.model ?? ''}`;
+        insertOrReplaceSVG(image, className, targetSelector, insertBefore);
+    };
+    createModelImage('timestamp-icon', '.timestamp');
+    createModelImage('thinking-icon', '.mes_reasoning_header_title', true);
+}

     isUser,
     avatarImg,
     bias,
-    reasoning,
     isSystem,
     title,
     timerValue,

     mes.find('.avatar img').attr('src', avatarImg);
     mes.find('.ch_name .name_text').text(characterName);
     mes.find('.mes_bias').html(bias);
-    mes.find('.mes_reasoning').html(reasoning);
     mes.find('.timestamp').text(timestamp).attr('title', `${extra?.api ? extra.api + ' - ' : ''}${extra?.model ?? ''}`);
     mes.find('.mesIDDisplay').text(`#${mesId}`);
     tokenCount && mes.find('.tokenCounterDisplay').text(`${tokenCount}t`);

     timerValue && mes.find('.mes_timer').attr('title', timerTitle).text(timerValue);
     bookmarkLink && updateBookmarkDisplay(mes);
+    updateReasoningUI(mes);
     if (power_user.timestamp_model_icon && extra?.api) {
         insertSVGIcon(mes, extra);
+    }

  * Re-renders a message block with updated content.
  * @param {number} messageId Message ID
  * @param {object} message Message object
+ * @param {object} [options={}] Optional arguments
+ * @param {boolean} [options.rerenderMessage=true] Whether to re-render the message content (inside <c>.mes_text</c>)
  */
-export function updateMessageBlock(messageId, message) {
+export function updateMessageBlock(messageId, message, { rerenderMessage = true } = {}) {
     const messageElement = $(`#chat [mesid="${messageId}"]`);
+    if (rerenderMessage) {
         const text = message?.extra?.display_text ?? message.mes;
-    messageElement.find('.mes_text').html(messageFormatting(text, message.name, message.is_system, message.is_user, messageId));
+        messageElement.find('.mes_text').html(messageFormatting(text, message.name, message.is_system, message.is_user, messageId, {}, false));
-    messageElement.find('.mes_reasoning').html(messageFormatting(message.extra?.reasoning ?? '', '', false, false, -1));
+    }
+    updateReasoningUI(messageElement);
     addCopyToCodeBlocks(messageElement);
     appendMediaToMessage(message, messageElement);
+}

         mes.is_user,
         chat.indexOf(mes),
         sanitizerOverrides,
+        false,
     );
-    const bias = messageFormatting(mes.extra?.bias ?? '', '', false, false, -1);
+    const bias = messageFormatting(mes.extra?.bias ?? '', '', false, false, -1, {}, false);
-    const reasoning = messageFormatting(mes.extra?.reasoning ?? '', '', false, false, -1);
     let bookmarkLink = mes?.extra?.bookmark_link ?? '';
     let params = {

         isUser: mes.is_user,
         avatarImg: avatarImg,
         bias: bias,
-        reasoning: reasoning,
         isSystem: isSystem,
         title: title,
         bookmarkLink: bookmarkLink,

         timestamp: timestamp,
         extra: mes.extra,
         tokenCount: mes.extra?.token_count ?? 0,
-        ...formatGenerationTimer(mes.gen_started, mes.gen_finished, mes.extra?.token_count),
+        ...formatGenerationTimer(mes.gen_started, mes.gen_finished, mes.extra?.token_count, mes.extra?.reasoning_duration),
     };
     const renderedMessage = getMessageFromTemplate(params);

         const swipeMessage = chatElement.find(`[mesid="${chat.length - 1}"]`);
         swipeMessage.attr('swipeid', params.swipeId);
         swipeMessage.find('.mes_text').html(messageText).attr('title', title);
-        swipeMessage.find('.mes_reasoning').html(reasoning);
         swipeMessage.find('.timestamp').text(timestamp).attr('title', `${params.extra.api} - ${params.extra.model}`);
+        updateReasoningUI(swipeMessage);
         appendMediaToMessage(mes, swipeMessage);
         if (power_user.timestamp_model_icon && params.extra?.api) {
             insertSVGIcon(swipeMessage, params.extra);

  * @param {Date} gen_started Date when generation was started
  * @param {Date} gen_finished Date when generation was finished
  * @param {number} tokenCount Number of tokens generated (0 if not available)
+ * @param {number?} [reasoningDuration=null] Reasoning duration (null if no reasoning was done)
  * @returns {Object} Object containing the formatted timer value and title
  * @example
  * const { timerValue, timerTitle } = formatGenerationTimer(gen_started, gen_finished, tokenCount);
  * console.log(timerValue); // 1.2s
  * console.log(timerTitle); // Generation queued: 12:34:56 7 Jan 2021\nReply received: 12:34:57 7 Jan 2021\nTime to generate: 1.2 seconds\nToken rate: 5 t/s
  */
-function formatGenerationTimer(gen_started, gen_finished, tokenCount) {
+function formatGenerationTimer(gen_started, gen_finished, tokenCount, reasoningDuration = null) {
     if (!gen_started || !gen_finished) {
         return {};
+    }

         `Generation queued: ${start.format(dateFormat)}`,
         `Reply received: ${finish.format(dateFormat)}`,
         `Time to generate: ${seconds} seconds`,
+        reasoningDuration > 0 ? `Time to think: ${reasoningDuration / 1000} seconds` : '',
         tokenCount > 0 ? `Token rate: ${Number(tokenCount / seconds).toFixed(1)} t/s` : '',
-    ].join('\n');
+    ].filter(x => x).join('\n').trim();
     if (isNaN(seconds) || seconds < 0) {
         return { timerValue: '', timerTitle };

             TempResponseLength.save(main_api, responseLength);
             eventHook = TempResponseLength.setupEventHook(main_api);
+        }
-        return await Generate('quiet', options);
+        const result = await Generate('quiet', options);
+        return removeReasoningFromString(result);
     } finally {
         if (responseLengthCustomized && TempResponseLength.isCustomized()) {
             TempResponseLength.restore(main_api);

         (main_api == 'openai' &&
             oai_settings.stream_openai &&
             !noStreamSources.includes(oai_settings.chat_completion_source) &&
-            !(oai_settings.chat_completion_source == chat_completion_sources.OPENAI && oai_settings.openai_model.startsWith('o1-')) &&
+            !(oai_settings.chat_completion_source == chat_completion_sources.OPENAI && ['o1-2024-12-17', 'o1'].includes(oai_settings.openai_model))
-            !(oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE && oai_settings.google_model.includes('bison')))
+        )
         || (main_api == 'kobold' && kai_settings.streaming_kobold && kai_flags.can_use_streaming)
         || (main_api == 'novel' && nai_settings.streaming_novel)
         || (main_api == 'textgenerationwebui' && textgen_settings.streaming));

     constructor(type, forceName2, timeStarted, continueMessage) {
         this.result = '';
         this.messageId = -1;
+        /** @type {HTMLElement} */
         this.messageDom = null;
+        /** @type {HTMLElement} */
         this.messageTextDom = null;
+        /** @type {HTMLElement} */
         this.messageTimerDom = null;
+        /** @type {HTMLElement} */
         this.messageTokenCounterDom = null;
-        this.messageReasoningDom = null;
         /** @type {HTMLTextAreaElement} */
         this.sendTextarea = document.querySelector('#send_textarea');
         this.type = type;

         /** @type {import('./scripts/logprobs.js').TokenLogprobs[]} */
         this.messageLogprobs = [];
         this.toolCalls = [];
-        this.reasoning = '';
+        // Initialize reasoning in its own handler
+        this.reasoningHandler = new ReasoningHandler(timeStarted);
+    }
     #checkDomElements(messageId) {

@@ -3130,8 +3179,8 @@ class StreamingProcessor {
3130	this.messageTextDom = this.messageDom?.querySelector('.mes_text');	3179	this.messageTextDom = this.messageDom?.querySelector('.mes_text');
3131	this.messageTimerDom = this.messageDom?.querySelector('.mes_timer');	3180	this.messageTimerDom = this.messageDom?.querySelector('.mes_timer');
3132	this.messageTokenCounterDom = this.messageDom?.querySelector('.tokenCounterDisplay');	3181	this.messageTokenCounterDom = this.messageDom?.querySelector('.tokenCounterDisplay');
3133	this.messageReasoningDom = this.messageDom?.querySelector('.mes_reasoning');
3134	}	3182	}
		3183	this.reasoningHandler.updateDom(messageId);
3135	}	3184	}
3136		3185
3137	#updateMessageBlockVisibility() {	3186	#updateMessageBlockVisibility() {

@@ -3141,22 +3190,12 @@ class StreamingProcessor {
3141	}	3190	}
3142	}	3191	}
3143		3192
3144	showMessageButtons(messageId) {	3193	markUIGenStarted() {
3145	if (messageId == -1) {	3194	deactivateSendButtons();
3146	return;
3147	}
3148
3149	showStopButton();
3150	$(`#chat .mes[mesid="${messageId}"] .mes_buttons`).css({ 'display': 'none' });
3151	}
3152
3153	hideMessageButtons(messageId) {
3154	if (messageId == -1) {
3155	return;
3156	}	3195	}
3157		3196
3158	hideStopButton();	3197	markUIGenStopped() {
3159	$(`#chat .mes[mesid="${messageId}"] .mes_buttons`).css({ 'display': 'flex' });	3198	activateSendButtons();
3160	}	3199	}
3161		3200
3162	async onStartStreaming(text) {	3201	async onStartStreaming(text) {

         if (this.type == 'impersonate') {
             this.sendTextarea.value = '';
             this.sendTextarea.dispatchEvent(new Event('input', { bubbles: true }));
-        }
+        } else {
-        else {
+            await saveReply(this.type, text, true, '', [], '');
-            await saveReply(this.type, text, true);
             messageId = chat.length - 1;
             this.#checkDomElements(messageId);
-            this.showMessageButtons(messageId);
+            this.markUIGenStarted();
+        }
         hideSwipeButtons();
         scrollChatToBottom();
         return messageId;
+    }
-    onProgressStreaming(messageId, text, isFinal) {
+    async onProgressStreaming(messageId, text, isFinal) {
         const isImpersonate = this.type == 'impersonate';
         const isContinue = this.type == 'continue';

         let processedText = cleanUpMessage(text, isImpersonate, isContinue, !isFinal, this.stoppingStrings);
-        // Predict unbalanced asterisks / quotes during streaming
         const charsToBalance = ['*', '"', '```'];
         for (const char of charsToBalance) {
             if (!isFinal && isOdd(countOccurrences(processedText, char))) {
-                // Add character at the end to balance it
                 const separator = char.length > 1 ? '\n' : '';
                 processedText = processedText.trimEnd() + separator + char;
+            }

         if (isImpersonate) {
             this.sendTextarea.value = processedText;
             this.sendTextarea.dispatchEvent(new Event('input', { bubbles: true }));
-        }
+        } else {
-        else {
+            const mesChanged = chat[messageId]['mes'] !== processedText;
             this.#checkDomElements(messageId);
             this.#updateMessageBlockVisibility();
             const currentTime = new Date();
             chat[messageId]['mes'] = processedText;
             chat[messageId]['gen_started'] = this.timeStarted;
             chat[messageId]['gen_finished'] = currentTime;
             if (!chat[messageId]['extra']) {
                 chat[messageId]['extra'] = {};
+            }
-            if (this.reasoning) {
+            // Update reasoning
-                chat[messageId]['extra']['reasoning'] = this.reasoning;
+            await this.reasoningHandler.process(messageId, mesChanged);
-                if (this.messageReasoningDom instanceof HTMLElement) {
+            processedText = chat[messageId]['mes'];
-                    const formattedReasoning = messageFormatting(this.reasoning, '', false, false, -1);
-                    this.messageReasoningDom.innerHTML = formattedReasoning;
-                }
-            }
-            // Don't waste time calculating token count for streaming
+            // Token count update.
-            const tokenCountText = (this.reasoning || '') + processedText;
+            const tokenCountText = this.reasoningHandler.reasoning + processedText;
             const currentTokenCount = isFinal && power_user.message_token_count_enabled ? getTokenCount(tokenCountText, 0) : 0;
             if (currentTokenCount) {
                 chat[messageId]['extra']['token_count'] = currentTokenCount;
                 if (this.messageTokenCounterDom instanceof HTMLElement) {

                 chat[messageId].is_system,
                 chat[messageId].is_user,
                 messageId,
+                {},
+                false,
             );
             if (this.messageTextDom instanceof HTMLElement) {
                 this.messageTextDom.innerHTML = formattedText;
+            }
-            const timePassed = formatGenerationTimer(this.timeStarted, currentTime, currentTokenCount);
+            const timePassed = formatGenerationTimer(this.timeStarted, currentTime, currentTokenCount, this.reasoningHandler.getDuration());
             if (this.messageTimerDom instanceof HTMLElement) {
                 this.messageTimerDom.textContent = timePassed.timerValue;
                 this.messageTimerDom.title = timePassed.timerTitle;

+    }
     async onFinishStreaming(messageId, text) {
-        this.hideMessageButtons(this.messageId);
+        this.markUIGenStopped();
-        this.onProgressStreaming(messageId, text, true);
+        await this.onProgressStreaming(messageId, text, true);
         addCopyToCodeBlocks($(`#chat .mes[mesid="${messageId}"]`));
+        await this.reasoningHandler.finish(messageId);
         if (Array.isArray(this.swipes) && this.swipes.length > 0) {
             const message = chat[messageId];
             const swipeInfo = {

         unblockGeneration();
         generatedPromptCache = '';
-        //console.log("Generated text size:", text.length, text)
         const isAborted = this.abortController.signal.aborted;
-        if (power_user.auto_swipe && !isAborted) {
+        if (!isAborted && power_user.auto_swipe && generatedTextFiltered(text)) {
-            function containsBlacklistedWords(str, blacklist, threshold) {
+            return swipe_right();
-                const regex = new RegExp(`\\b(${blacklist.join('|')})\\b`, 'gi');
-                const matches = str.match(regex) || [];
-                return matches.length >= threshold;
-            }
-            const generatedTextFiltered = (text) => {
-                if (text) {
-                    if (power_user.auto_swipe_minimum_length) {
-                        if (text.length < power_user.auto_swipe_minimum_length && text.length !== 0) {
-                            console.log('Generated text size too small');
-                            return true;
-                        }
-                    }
-                    if (power_user.auto_swipe_blacklist_threshold) {
-                        if (containsBlacklistedWords(text, power_user.auto_swipe_blacklist, power_user.auto_swipe_blacklist_threshold)) {
-                            console.log('Generated text has blacklisted words');
-                            return true;
+        }
-                    }
-                }
-                return false;
-            };
-            if (generatedTextFiltered(text)) {
-                swipe_right();
-                return;
-            }
-        }
         playMessageSound();
+    }

         this.abortController.abort();
         this.isStopped = true;
-        this.hideMessageButtons(this.messageId);
+        this.markUIGenStopped();
         generatedPromptCache = '';
         unblockGeneration();

             const timestamps = [];
             for await (const { text, swipes, logprobs, toolCalls, state } of this.generator()) {
                 timestamps.push(Date.now());
-                if (this.isStopped) {
+                if (this.isStopped || this.abortController.signal.aborted) {
-                    return;
+                    return this.result;
+                }
                 this.toolCalls = toolCalls;

                 if (logprobs) {
                     this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));
+                }
-                this.reasoning = state?.reasoning ?? '';
+                // Get the updated reasoning string into the handler
+                this.reasoningHandler.updateReasoning(this.messageId, state?.reasoning);
                 await eventSource.emit(event_types.STREAM_TOKEN_RECEIVED, text);
-                await sw.tick(() => this.onProgressStreaming(this.messageId, this.continueMessage + text));
+                await sw.tick(async () => await this.onProgressStreaming(this.messageId, this.continueMessage + text));
+            }
             const seconds = (timestamps[timestamps.length - 1] - timestamps[0]) / 1000;
             console.warn(`Stream stats: ${timestamps.length} tokens, ${seconds.toFixed(2)} seconds, rate: ${Number(timestamps.length / seconds).toFixed(2)} TPS`);

                 break;
+            }
             case 'textgenerationwebui':
-                generateData = getTextGenGenerationData(prompt, amount_gen, false, false, null, 'quiet');
+                generateData = await getTextGenGenerationData(prompt, amount_gen, false, false, null, 'quiet');
                 TempResponseLength.restore(api);
                 break;
             case 'openai': {

         coreChat.pop();
+    }
-    const reasoning = new PromptReasoning();
-    for (let i = coreChat.length - 1; i >= 0; i--) {
-        if (reasoning.isLimitReached()) {
-            break;
-        }
-        coreChat[i] = { ...coreChat[i], mes: reasoning.addToMessage(coreChat[i].mes, coreChat[i].extra?.reasoning) };
-    }
     coreChat = await Promise.all(coreChat.map(async (chatItem, index) => {
         let message = chatItem.mes;
         let regexType = chatItem.is_user ? regex_placement.USER_INPUT : regex_placement.AI_OUTPUT;

         };
     }));
+    const reasoning = new PromptReasoning();
+    for (let i = coreChat.length - 1; i >= 0; i--) {
+        const depth = coreChat.length - i - 1;
+        const isPrefix = isContinue && i === coreChat.length - 1;
+        coreChat[i] = {
+            ...coreChat[i],
+            mes: reasoning.addToMessage(
+                coreChat[i].mes,
+                getRegexedString(
+                    String(coreChat[i].extra?.reasoning ?? ''),
+                    regex_placement.REASONING,
+                    { isPrompt: true, depth: depth },
+                ),
+                isPrefix,
+            ),
+        };
+        if (reasoning.isLimitReached()) {
+            break;
+        }
+    }
     // Determine token limit
     let this_max_context = getMaxContextSize();

     // For prompt bit itemization
     let mesSendString = '';
-    function getCombinedPrompt(isNegative) {
+    async function getCombinedPrompt(isNegative) {
         // Only return if the guidance scale doesn't exist or the value is 1
         // Also don't return if constructing the neutral prompt
         if (isNegative && !useCfgPrompt) {

                     // TODO: Make all extension prompts use an array/splice method
                     const lengthDiff = mesSend.length - cfgPrompt.depth;
                     const cfgDepth = lengthDiff >= 0 ? lengthDiff : 0;
+                    const cfgMessage = finalMesSend[cfgDepth];
+                    if (cfgMessage) {
+                        if (!Array.isArray(finalMesSend[cfgDepth].extensionPrompts)) {
+                            finalMesSend[cfgDepth].extensionPrompts = [];
+                        }
                         finalMesSend[cfgDepth].extensionPrompts.push(`${cfgPrompt.value}\n`);
+                    }
+                }
+            }
+        }
         // Add prompt bias after everything else
         // Always run with continue

         };
         // Before returning the combined prompt, give available context related information to all subscribers.
-        eventSource.emitAndWait(event_types.GENERATE_BEFORE_COMBINE_PROMPTS, data);
+        await eventSource.emit(event_types.GENERATE_BEFORE_COMBINE_PROMPTS, data);
         // If one or multiple subscribers return a value, forfeit the responsibillity of flattening the context.
         return !data.combinedPrompt ? combine() : data.combinedPrompt;
+    }
-    let finalPrompt = getCombinedPrompt(false);
+    let finalPrompt = await getCombinedPrompt(false);
     const eventData = { prompt: finalPrompt, dryRun: dryRun };
     await eventSource.emit(event_types.GENERATE_AFTER_COMBINE_PROMPTS, eventData);

@@ -4592,8 +4617,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4592	}	4617	}
4593	break;	4618	break;
4594	case 'textgenerationwebui': {	4619	case 'textgenerationwebui': {
4595	const cfgValues = useCfgPrompt ? { guidanceScale: cfgGuidanceScale, negativePrompt: getCombinedPrompt(true) } : null;	4620	const cfgValues = useCfgPrompt ? { guidanceScale: cfgGuidanceScale, negativePrompt: await getCombinedPrompt(true) } : null;
4596	generate_data = getTextGenGenerationData(finalPrompt, maxLength, isImpersonate, isContinue, cfgValues, type);	4621	generate_data = await getTextGenGenerationData(finalPrompt, maxLength, isImpersonate, isContinue, cfgValues, type);
4597	break;	4622	break;
4598	}	4623	}
4599	case 'novel': {	4624	case 'novel': {

         const swipes = extractMultiSwipes(data, type);
         messageChunk = cleanUpMessage(getMessage, isImpersonate, isContinue, false);
+        reasoning = getRegexedString(reasoning, regex_placement.REASONING);
+        if (power_user.trim_spaces) {
+            reasoning = reasoning.trim();
+        }
         if (isContinue) {
             getMessage = continue_mag + getMessage;

+        }
         const isAborted = abortController && abortController.signal.aborted;
-        if (power_user.auto_swipe && !isAborted) {
+        if (!isAborted && power_user.auto_swipe && generatedTextFiltered(getMessage)) {
-            console.debug('checking for autoswipeblacklist on non-streaming message');
-            function containsBlacklistedWords(getMessage, blacklist, threshold) {
-                console.debug('checking blacklisted words');
-                const regex = new RegExp(`\\b(${blacklist.join('|')})\\b`, 'gi');
-                const matches = getMessage.match(regex) || [];
-                return matches.length >= threshold;
-            }
-            const generatedTextFiltered = (getMessage) => {
-                if (power_user.auto_swipe_blacklist_threshold) {
-                    if (containsBlacklistedWords(getMessage, power_user.auto_swipe_blacklist, power_user.auto_swipe_blacklist_threshold)) {
-                        console.debug('Generated text has blacklisted words');
-                        return true;
-                    }
-                }
-                return false;
-            };
-            if (generatedTextFiltered(getMessage)) {
-                console.debug('swiping right automatically');
             is_send_press = false;
-                swipe_right();
+            return swipe_right();
-                // TODO: do we want to resolve after an auto-swipe?
-                return;
-            }
+        }
         console.debug('/api/chats/save called by /Generate');

         toastr.info(t`Copied!`);
     });
-    popup.dlg.querySelector('#showRawPrompt').addEventListener('click', function () {
+    popup.dlg.querySelector('#showRawPrompt').addEventListener('click', async function () {
         //console.log(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
         console.log(PromptArrayItemForRawPromptDisplay);
         console.log(itemizedPrompts);

         const rawPrompt = flatten(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
+        // Mobile needs special handholding. The side-view on the popup wouldn't work,
+        // so we just show an additional popup for this.
+        if (isMobile()) {
+            const content = document.createElement('div');
+            content.classList.add('tokenItemizingMaintext');
+            content.innerText = rawPrompt;
+            const popup = new Popup(content, POPUP_TYPE.TEXT, null, { allowVerticalScrolling: true, leftAlign: true });
+            await popup.show();
+            return;
+        }
         //let DisplayStringifiedPrompt = JSON.stringify(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt).replace(/\n+/g, '<br>');
         const rawPromptWrapper = document.getElementById('rawPromptWrapper');
         rawPromptWrapper.innerText = rawPrompt;

+}
 /**
- * Extracts the reasoning from the response data.
- * @param {object} data Response data
- * @returns {string} Extracted reasoning
- */
-function extractReasoningFromData(data) {
-    if (main_api === 'openai' && oai_settings.show_thoughts) {
-        switch (oai_settings.chat_completion_source) {
-            case chat_completion_sources.DEEPSEEK:
-                return data?.choices?.[0]?.message?.reasoning_content ?? '';
-            case chat_completion_sources.OPENROUTER:
-                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') ?? '';
-        }
-    }
-    return '';
-}
-/**
  * Extracts multiswipe swipes from the response data.
  * @param {Object} data Response data
  * @param {string} type Type of generation

         chat[chat.length - 1]['extra'] = {};
+    }
+    // Coerce null/undefined to empty string
+    if (chat.length && !chat[chat.length - 1]['extra']['reasoning']) {
+        chat[chat.length - 1]['extra']['reasoning'] = '';
+    }
+    if (!reasoning) {
+        reasoning = '';
+    }
     let oldMessage = '';
     const generationFinished = new Date();
     const img = extractImageFromMessage(getMessage);

             chat[chat.length - 1]['extra']['api'] = getGeneratingApi();
             chat[chat.length - 1]['extra']['model'] = getGeneratingModel();
             chat[chat.length - 1]['extra']['reasoning'] = reasoning;
+            chat[chat.length - 1]['extra']['reasoning_duration'] = null;
             if (power_user.message_token_count_enabled) {
                 const tokenCountText = (reasoning || '') + chat[chat.length - 1]['mes'];
                 chat[chat.length - 1]['extra']['token_count'] = await getTokenCountAsync(tokenCountText, 0);

         chat[chat.length - 1]['send_date'] = getMessageTimeStamp();
         chat[chat.length - 1]['extra']['api'] = getGeneratingApi();
         chat[chat.length - 1]['extra']['model'] = getGeneratingModel();
-        chat[chat.length - 1]['extra']['reasoning'] += reasoning;
+        chat[chat.length - 1]['extra']['reasoning'] = reasoning;
+        chat[chat.length - 1]['extra']['reasoning_duration'] = null;
         if (power_user.message_token_count_enabled) {
             const tokenCountText = (reasoning || '') + chat[chat.length - 1]['mes'];
             chat[chat.length - 1]['extra']['token_count'] = await getTokenCountAsync(tokenCountText, 0);

         chat[chat.length - 1]['extra']['api'] = getGeneratingApi();
         chat[chat.length - 1]['extra']['model'] = getGeneratingModel();
         chat[chat.length - 1]['extra']['reasoning'] += reasoning;
+        // We don't know if the reasoning duration extended, so we don't update it here on purpose.
         if (power_user.message_token_count_enabled) {
             const tokenCountText = (reasoning || '') + chat[chat.length - 1]['mes'];
             chat[chat.length - 1]['extra']['token_count'] = await getTokenCountAsync(tokenCountText, 0);

         chat[chat.length - 1]['extra']['api'] = getGeneratingApi();
         chat[chat.length - 1]['extra']['model'] = getGeneratingModel();
         chat[chat.length - 1]['extra']['reasoning'] = reasoning;
+        chat[chat.length - 1]['extra']['reasoning_duration'] = null;
         if (power_user.trim_spaces) {
             getMessage = getMessage.trim();
+        }

     return { getMessage, image, title };
+}
+/**
+ * A function mainly used to switch 'generating' state - setting it to false and activating the buttons again
+ */
 export function activateSendButtons() {
     is_send_press = false;
-    $('#send_but').removeClass('displayNone');
-    $('#mes_continue').removeClass('displayNone');
-    $('#mes_impersonate').removeClass('displayNone');
-    $('.mes_buttons:last').show();
     hideStopButton();
+    delete document.body.dataset.generating;
+}
+/**
+ * A function mainly used to switch 'generating' state - setting it to true and deactivating the buttons
+ */
 export function deactivateSendButtons() {
-    $('#send_but').addClass('displayNone');
-    $('#mes_continue').addClass('displayNone');
-    $('#mes_impersonate').addClass('displayNone');
     showStopButton();
+    document.body.dataset.generating = 'true';
+}
 export function resetChatState() {

             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();

             $('#your_name').text(name1);
+        }
+        accountStorage.init(settings?.accountStorage);
         await setUserControls(data.enable_accounts);
         // Allow subscribers to mutate settings
-        eventSource.emit(event_types.SETTINGS_LOADED_BEFORE, settings);
+        await eventSource.emit(event_types.SETTINGS_LOADED_BEFORE, settings);
         //Load KoboldAI settings
         koboldai_setting_names = data.koboldai_setting_names;

         loadProxyPresets(settings);
         // Allow subscribers to mutate settings
-        eventSource.emit(event_types.SETTINGS_LOADED_AFTER, settings);
+        await eventSource.emit(event_types.SETTINGS_LOADED_AFTER, settings);
         // Set context size after loading power user (may override the max value)
         $('#max_context').val(max_context);

@@ -7028,7 +7067,7 @@ export async function getSettings() {
7028	}	7067	}
7029	await validateDisabledSamplers();	7068	await validateDisabledSamplers();
7030	settingsReady = true;	7069	settingsReady = true;
7031	eventSource.emit(event_types.SETTINGS_LOADED);	7070	await eventSource.emit(event_types.SETTINGS_LOADED);
7032	}	7071	}
7033		7072
7034	function selectKoboldGuiPreset() {	7073	function selectKoboldGuiPreset() {

 export async function saveSettings(loopCounter = 0) {
     if (!settingsReady) {
-        console.warn('Settings not ready, aborting save');
+        console.warn('Settings not ready, scheduling another save');
+        saveSettingsDebounced();
         return;
+    }

         url: '/api/settings/save',
         data: JSON.stringify({
             firstRun: firstRun,
+            accountStorage: accountStorage.getState(),
             currentVersion: currentVersion,
             username: name1,
             active_character: active_character,

 // Common code for message editor done and auto-save
 function updateMessage(div) {
     const mesBlock = div.closest('.mes_block');
-    let text = mesBlock.find('.edit_textarea').val();
+    let text = mesBlock.find('.edit_textarea').val()
-    const mes = chat[this_edit_mes_id];
+        ?? mesBlock.find('.mes_text').text();
+    const mesElement = div.closest('.mes');
+    const mes = chat[mesElement.attr('mesid')];
     let regexPlacement;
     if (mes.is_user) {

         mes.is_system,
         mes.is_user,
         this_edit_mes_id,
+        {},
+        false,
     ));
     mesBlock.find('.mes_bias').empty();
-    mesBlock.find('.mes_bias').append(messageFormatting(bias, '', false, false, -1));
+    mesBlock.find('.mes_bias').append(messageFormatting(bias, '', false, false, -1, {}, false));
     saveChatDebounced();
+}

             mes.is_system,
             mes.is_user,
             this_edit_mes_id,
+            {},
+            false,
         ),
     );
     mesBlock.find('.mes_bias').empty();
-    mesBlock.find('.mes_bias').append(messageFormatting(bias, '', false, false, -1));
+    mesBlock.find('.mes_bias').append(messageFormatting(bias, '', false, false, -1, {}, false));
     appendMediaToMessage(mes, div.closest('.mes'));
     addCopyToCodeBlocks(div.closest('.mes'));
+    const reasoningEditDone = mesBlock.find('.mes_reasoning_edit_done:visible');
+    if (reasoningEditDone.length > 0) {
+        reasoningEditDone.trigger('click');
+    }
     await eventSource.emit(event_types.MESSAGE_UPDATED, this_edit_mes_id);
     this_edit_mes_id = undefined;
     await saveChatConditional();

+            }
             try {
-                const perPage = Number(localStorage.getItem('Characters_PerPage')) || per_page_default;
+                const perPage = Number(accountStorage.getItem('Characters_PerPage')) || per_page_default;
                 const page = Math.floor(charIndex / perPage) + 1;
                 const selector = `#rm_print_characters_block [title*="${avatarFileName}"]`;
                 $('#rm_print_characters_pagination').pagination('go', page);

                 return;
+            }
-            const perPage = Number(localStorage.getItem('Characters_PerPage')) || per_page_default;
+            const perPage = Number(accountStorage.getItem('Characters_PerPage')) || per_page_default;
             const page = Math.floor(charIndex / perPage) + 1;
             $('#rm_print_characters_pagination').pagination('go', page);
             const selector = `#rm_print_characters_block [grid="${charId}"]`;

             easing: animation_easing,
             queue: false,
             complete: async function () {
-                /*if (!selected_group) {
-                    var typingIndicator = $("#typing_indicator_template .typing_indicator").clone();
-                    typingIndicator.find(".typing_indicator_name").text(characters[this_chid].name);
-                } */
-                /* $("#chat").append(typingIndicator); */
                 const is_animation_scroll = ($('#chat').scrollTop() >= ($('#chat').prop('scrollHeight') - $('#chat').outerHeight()) - 10);
                 //console.log(parseInt(chat[chat.length-1]['swipe_id']));
                 //console.log(chat[chat.length-1]['swipes'].length);

                     // resets the timer
                     swipeMessage.find('.mes_timer').html('');
                     swipeMessage.find('.tokenCounterDisplay').text('');
-                    swipeMessage.find('.mes_reasoning').html('');
+                    updateReasoningUI(swipeMessage, { reset: true });
                 } else {
                     //console.log('showing previously generated swipe candidate, or "..."');
                     //console.log('onclick right swipe calling addOneMessage');

                                 if (run_generate && !is_send_press && parseInt(chat[chat.length - 1]['swipe_id']) === chat[chat.length - 1]['swipes'].length) {
                                     console.debug('caught here 2');
                                     is_send_press = true;
-                                    $('.mes_buttons:last').hide();
                                     await Generate('swipe');
                                 } else {
                                     if (parseInt(chat[chat.length - 1]['swipe_id']) !== chat[chat.length - 1]['swipes'].length) {

             continue;
+        }
+        accountStorage.removeItem(`AlertWI_${character.avatar}`);
+        accountStorage.removeItem(`AlertRegex_${character.avatar}`);
+        accountStorage.removeItem(`mediaWarningShown:${character.avatar}`);
         delete tag_map[character.avatar];
         select_rm_info('char_delete', character.name);

     });
     registerDebugFunction('toggleRegenerateWarning', 'Toggle Ctrl+Enter regeneration confirmation', 'Toggle the warning when regenerating a message with a Ctrl+Enter hotkey.', () => {
-        localStorage.setItem('RegenerateWithCtrlEnter', localStorage.getItem('RegenerateWithCtrlEnter') === 'true' ? 'false' : 'true');
+        accountStorage.setItem('RegenerateWithCtrlEnter', accountStorage.getItem('RegenerateWithCtrlEnter') === 'true' ? 'false' : 'true');
-        toastr.info('Regenerate warning is now ' + (localStorage.getItem('RegenerateWithCtrlEnter') === 'true' ? 'disabled' : 'enabled'));
+        toastr.info('Regenerate warning is now ' + (accountStorage.getItem('RegenerateWithCtrlEnter') === 'true' ? 'disabled' : 'enabled'));
     });
     registerDebugFunction('copySetup', 'Copy ST setup to clipboard [WIP]', 'Useful data when reporting bugs', async () => {

             var edit_mes_id = $(this).closest('.mes').attr('mesid');
             this_edit_mes_id = edit_mes_id;
+            // Also edit reasoning, if it exists
+            const reasoningEdit = $(this).closest('.mes_block').find('.mes_reasoning_edit:visible');
+            if (reasoningEdit.length > 0) {
+                reasoningEdit.trigger('click');
+            }
             var text = chat[edit_mes_id]['mes'];
             if (chat[edit_mes_id]['is_user']) {
                 this_edit_mes_chname = name1;

                 chat[this_edit_mes_id].is_system,
                 chat[this_edit_mes_id].is_user,
                 this_edit_mes_id,
+                {},
+                false,
             ));
         appendMediaToMessage(chat[this_edit_mes_id], $(this).closest('.mes'));
         addCopyToCodeBlocks($(this).closest('.mes'));
+        const reasoningEditDone = $(this).closest('.mes_block').find('.mes_reasoning_edit_cancel:visible');
+        if (reasoningEditDone.length > 0) {
+            reasoningEditDone.trigger('click');
+        }
         await eventSource.emit(event_types.MESSAGE_UPDATED, this_edit_mes_id);
         this_edit_mes_id = undefined;
     });

     });
     $(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;
+        }

                 );
                 break;*/
             default:
-                eventSource.emit('charManagementDropdown', target);
+                await eventSource.emit('charManagementDropdown', target);
+        }
         $('#char-management-dropdown').prop('selectedIndex', 0);
     });

     $(document).on('click', '.open_characters_library', async function () {
         await getCharacters();
-        eventSource.emit(event_types.OPEN_CHARACTER_LIBRARY);
+        await eventSource.emit(event_types.OPEN_CHARACTER_LIBRARY);
     });
     // Added here to prevent execution before script.js is loaded and get rid of quirky timeouts

public/scripts/RossAscends-mods.js+58 -30 Viewed

     send_on_enter_options,
 } from './power-user.js';
-import { LoadLocal, SaveLocal, LoadLocalBool } from './f-localStorage.js';
 import { selected_group, is_group_generating, openGroupById } from './group-chats.js';
 import { getTagKeyForEntity, applyTagsOnCharacterSelect } from './tags.js';
 import {

 import { debounce_timeout } from './constants.js';
 import { Popup } from './popup.js';
+import { accountStorage } from './util/AccountStorage.js';
+import { getCurrentUserHandle } from './user.js';
 var RPanelPin = document.getElementById('rm_button_panel_pin');
 var LPanelPin = document.getElementById('lm_button_panel_pin');

         // 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(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.

@@ -409,32 +425,34 @@ function RA_autoconnect(PrevApi) {
409	function OpenNavPanels() {	425	function OpenNavPanels() {
410	if (!isMobile()) {	426	if (!isMobile()) {
411	//auto-open R nav if locked and previously open	427	//auto-open R nav if locked and previously open
412	if (LoadLocalBool('NavLockOn') == true && LoadLocalBool('NavOpened') == true) {	428	if (accountStorage.getItem('NavLockOn') == 'true' && accountStorage.getItem('NavOpened') == 'true') {
413	//console.log("RA -- clicking right nav to open");	429	//console.log("RA -- clicking right nav to open");
414	$('#rightNavDrawerIcon').click();	430	$('#rightNavDrawerIcon').click();
415	}	431	}
416		432
417	//auto-open L nav if locked and previously open	433	//auto-open L nav if locked and previously open
418	if (LoadLocalBool('LNavLockOn') == true && LoadLocalBool('LNavOpened') == true) {	434	if (accountStorage.getItem('LNavLockOn') == 'true' && accountStorage.getItem('LNavOpened') == 'true') {
419	console.debug('RA -- clicking left nav to open');	435	console.debug('RA -- clicking left nav to open');
420	$('#leftNavDrawerIcon').click();	436	$('#leftNavDrawerIcon').click();
421	}	437	}
422		438
423	//auto-open WI if locked and previously open	439	//auto-open WI if locked and previously open
424	if (LoadLocalBool('WINavLockOn') == true && LoadLocalBool('WINavOpened') == true) {	440	if (accountStorage.getItem('WINavLockOn') == 'true' && accountStorage.getItem('WINavOpened') == 'true') {
425	console.debug('RA -- clicking WI to open');	441	console.debug('RA -- clicking WI to open');
426	$('#WIDrawerIcon').click();	442	$('#WIDrawerIcon').click();
427	}	443	}
428	}	444	}
429	}	445	}
430		446
		447	const getUserInputKey = () => getCurrentUserHandle() + '_userInput';
		448
431	function restoreUserInput() {	449	function restoreUserInput() {
432	if (!power_user.restore_user_input) {	450	if (!power_user.restore_user_input) {
433	console.debug('restoreUserInput disabled');	451	console.debug('restoreUserInput disabled');
434	return;	452	return;
435	}	453	}
436		454
437	const userInput = LoadLocal('userInput');	455	const userInput = localStorage.getItem(getUserInputKey());
438	if (userInput) {	456	if (userInput) {
439	$('#send_textarea').val(userInput)[0].dispatchEvent(new Event('input', { bubbles: true }));	457	$('#send_textarea').val(userInput)[0].dispatchEvent(new Event('input', { bubbles: true }));
440	}	458	}

 function saveUserInput() {
     const userInput = String($('#send_textarea').val());
-    SaveLocal('userInput', userInput);
+    localStorage.setItem(getUserInputKey(), userInput);
+    console.debug('User Input -- ', userInput);
+}
 const saveUserInputDebounced = debounce(saveUserInput);

     //toggle pin class when lock toggle clicked
     $(RPanelPin).on('click', function () {
-        SaveLocal('NavLockOn', $(RPanelPin).prop('checked'));
+        accountStorage.setItem('NavLockOn', $(RPanelPin).prop('checked'));
         if ($(RPanelPin).prop('checked') == true) {
             //console.log('adding pin class to right nav');
             $(RightNavPanel).addClass('pinnedOpen');

+        }
     });
     $(LPanelPin).on('click', function () {
-        SaveLocal('LNavLockOn', $(LPanelPin).prop('checked'));
+        accountStorage.setItem('LNavLockOn', $(LPanelPin).prop('checked'));
         if ($(LPanelPin).prop('checked') == true) {
             //console.log('adding pin class to Left nav');
             $(LeftNavPanel).addClass('pinnedOpen');

     });
     $(WIPanelPin).on('click', function () {
-        SaveLocal('WINavLockOn', $(WIPanelPin).prop('checked'));
+        accountStorage.setItem('WINavLockOn', $(WIPanelPin).prop('checked'));
         if ($(WIPanelPin).prop('checked') == true) {
             console.debug('adding pin class to WI');
             $(WorldInfo).addClass('pinnedOpen');

     });
     // read the state of right Nav Lock and apply to rightnav classlist
-    $(RPanelPin).prop('checked', LoadLocalBool('NavLockOn'));
+    $(RPanelPin).prop('checked', accountStorage.getItem('NavLockOn') == 'true');
-    if (LoadLocalBool('NavLockOn') == true) {
+    if (accountStorage.getItem('NavLockOn') == 'true') {
         //console.log('setting pin class via local var');
         $(RightNavPanel).addClass('pinnedOpen');
         $(RightNavDrawerIcon).addClass('drawerPinnedOpen');

         $(RightNavDrawerIcon).addClass('drawerPinnedOpen');
+    }
     // read the state of left Nav Lock and apply to leftnav classlist
-    $(LPanelPin).prop('checked', LoadLocalBool('LNavLockOn'));
+    $(LPanelPin).prop('checked', accountStorage.getItem('LNavLockOn') === 'true');
-    if (LoadLocalBool('LNavLockOn') == true) {
+    if (accountStorage.getItem('LNavLockOn') == 'true') {
         //console.log('setting pin class via local var');
         $(LeftNavPanel).addClass('pinnedOpen');
         $(LeftNavDrawerIcon).addClass('drawerPinnedOpen');

+    }
     // read the state of left Nav Lock and apply to leftnav classlist
-    $(WIPanelPin).prop('checked', LoadLocalBool('WINavLockOn'));
+    $(WIPanelPin).prop('checked', accountStorage.getItem('WINavLockOn') === 'true');
-    if (LoadLocalBool('WINavLockOn') == true) {
+    if (accountStorage.getItem('WINavLockOn') == 'true') {
         //console.log('setting pin class via local var');
         $(WorldInfo).addClass('pinnedOpen');
         $(WIDrawerIcon).addClass('drawerPinnedOpen');

     //save state of Right nav being open or closed
     $('#rightNavDrawerIcon').on('click', function () {
         if (!$('#rightNavDrawerIcon').hasClass('openIcon')) {
-            SaveLocal('NavOpened', 'true');
+            accountStorage.setItem('NavOpened', 'true');
-        } else { SaveLocal('NavOpened', 'false'); }
+        } else { accountStorage.setItem('NavOpened', 'false'); }
     });
     //save state of Left nav being open or closed
     $('#leftNavDrawerIcon').on('click', function () {
         if (!$('#leftNavDrawerIcon').hasClass('openIcon')) {
-            SaveLocal('LNavOpened', 'true');
+            accountStorage.setItem('LNavOpened', 'true');
-        } else { SaveLocal('LNavOpened', 'false'); }
+        } else { accountStorage.setItem('LNavOpened', 'false'); }
     });
     //save state of Left nav being open or closed
     $('#WorldInfo').on('click', function () {
         if (!$('#WorldInfo').hasClass('openIcon')) {
-            SaveLocal('WINavOpened', 'true');
+            accountStorage.setItem('WINavOpened', 'true');
-        } else { SaveLocal('WINavOpened', 'false'); }
+        } else { accountStorage.setItem('WINavOpened', 'false'); }
     });
     var chatbarInFocus = false;

         OpenNavPanels();
     }, 300);
-    $(SelectedCharacterTab).click(function () { SaveLocal('SelectedNavTab', 'rm_button_selected_ch'); });
+    $(SelectedCharacterTab).click(function () { accountStorage.setItem('SelectedNavTab', 'rm_button_selected_ch'); });
-    $('#rm_button_characters').click(function () { SaveLocal('SelectedNavTab', 'rm_button_characters'); });
+    $('#rm_button_characters').click(function () { accountStorage.setItem('SelectedNavTab', 'rm_button_characters'); });
     // when a char is selected from the list, save them as the auto-load character for next page load

         // Ctrl+Enter for Regeneration Last Response. If editing, accept the edits instead
         if (event.ctrlKey && event.key == 'Enter') {
             const editMesDone = $('.mes_edit_done:visible');
+            const reasoningMesDone = $('.mes_reasoning_edit_done:visible');
             if (editMesDone.length > 0) {
                 console.debug('Accepting edits with Ctrl+Enter');
-                $('#send_textarea').focus();
+                $('#send_textarea').trigger('focus');
                 editMesDone.trigger('click');
                 return;
-            } else if (is_send_press == false) {
+            } else if (reasoningMesDone.length > 0) {
+                console.debug('Accepting edits with Ctrl+Enter');
+                $('#send_textarea').trigger('focus');
+                reasoningMesDone.trigger('click');
+                return;
+            }
+            else if (is_send_press == false) {
                 const skipConfirmKey = 'RegenerateWithCtrlEnter';
-                const skipConfirm = LoadLocalBool(skipConfirmKey);
+                const skipConfirm = accountStorage.getItem(skipConfirmKey) === 'true';
                 function doRegenerate() {
                     console.debug('Regenerating with Ctrl+Enter');
                     $('#option_regenerate').trigger('click');

                     let regenerateWithCtrlEnter = false;
                     const result = await Popup.show.confirm('Regenerate Message', 'Are you sure you want to regenerate the latest message?', {
                         customInputs: [{ id: 'regenerateWithCtrlEnter', label: 'Don\'t ask again' }],
-                        onClose: (popup) => regenerateWithCtrlEnter = popup.inputResults.get('regenerateWithCtrlEnter') ?? false,
+                        onClose: (popup) => {
+                            regenerateWithCtrlEnter = popup.inputResults.get('regenerateWithCtrlEnter') ?? false;
+                        },
                     });
                     if (!result) {
                         return;
+                    }
-                    SaveLocal(skipConfirmKey, regenerateWithCtrlEnter);
+                    accountStorage.setItem(skipConfirmKey, String(regenerateWithCtrlEnter));
                     doRegenerate();
+                }
                 return;

public/scripts/authors-note.js+1 -1 Viewed

         namedArgumentList: [],
         unnamedArgumentList: [
             new SlashCommandArgument(
-                'position', [ARGUMENT_TYPE.STRING], false, false, null, ['system', 'user', 'assistant'],
+                'role', [ARGUMENT_TYPE.STRING], false, false, null, ['system', 'user', 'assistant'],
             ),
         ],
         helpString: `

public/scripts/backgrounds.js+15 -5 Viewed

     });
+}
+/**
+ * Locks the background for the current chat
+ * @param {Event} e Click event
+ * @returns {string} Empty string
+ */
 function onLockBackgroundClick(e) {
-    e.stopPropagation();
+    e?.stopPropagation();
     const chatName = getCurrentChatId();

         return '';
+    }
-    const relativeBgImage = getUrlParameter(this);
+    const relativeBgImage = getUrlParameter(this) ?? background_settings.url;
     saveBackgroundMetadata(relativeBgImage);
     setCustomBackground();

     return '';
+}
+/**
+ * Locks the background for the current chat
+ * @param {Event} e Click event
+ * @returns {string} Empty string
+ */
 function onUnlockBackgroundClick(e) {
-    e.stopPropagation();
+    e?.stopPropagation();
     removeBackgroundMetadata();
     unsetCustomBackground();
     highlightLockedBackground();

     $('#add_bg_button').on('change', onBackgroundUploadSelected);
     $('#bg-filter').on('input', onBackgroundFilterInput);
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'lockbg',
-        callback: onLockBackgroundClick,
+        callback: () => onLockBackgroundClick(new CustomEvent('click')),
         aliases: ['bglock'],
         helpString: 'Locks a background for the currently selected chat',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'unlockbg',
-        callback: onUnlockBackgroundClick,
+        callback: () => onUnlockBackgroundClick(new CustomEvent('click')),
         aliases: ['bgunlock'],
         helpString: 'Unlocks a background for the currently selected chat',
     }));

public/scripts/chat-templates.js+2 -1 Viewed

     // DeepSeek R1
     'b6835114b7303ddd78919a82e4d9f7d8c26ed0d7dfc36beeb12d524f6144eab1':
         'DeepSeek-V2.5'
+    ,
 };
 const substr_derivations = {

@@ -97,6 +98,6 @@ export async function deriveTemplatesFromChatTemplate(chat_template, hash) {
97	}	98	}
98	}	99	}
99		100
100	console.log(`Unknown chat template hash: ${hash} for [${chat_template}]`);	101	console.warn(`Unknown chat template hash: ${hash} for [${chat_template}]`);
101	return null;	102	return null;
102	}	103	}

public/scripts/chats.js+43 -7 Viewed

 import { renderTemplateAsync } from './templates.js';
 import { t } from './i18n.js';
 import { humanizedDateTime } from './RossAscends-mods.js';
+import { accountStorage } from './util/AccountStorage.js';
 /**
  * @typedef {Object} FileAttachment

+}
 async function deleteMessageImage() {
-    const value = await callGenericPopup('<h3>Delete image from message?<br>This action can\'t be undone.</h3>', POPUP_TYPE.CONFIRM);
+    const value = await callGenericPopup('<h3>Delete image from message?<br>This action can\'t be undone.</h3>', POPUP_TYPE.TEXT, '', {
+        okButton: t`Delete one`,
+        customButtons: [
+            {
+                text: t`Delete all`,
+                appendAtEnd: true,
+                result: POPUP_RESULT.CUSTOM1,
+            },
+            {
+                text: t`Cancel`,
+                appendAtEnd: true,
+                result: POPUP_RESULT.CANCELLED,
+            },
+        ],
+    });
-    if (value !== POPUP_RESULT.AFFIRMATIVE) {
+    if (!value) {
         return;
+    }
     const mesBlock = $(this).closest('.mes');
     const mesId = mesBlock.attr('mesid');
     const message = chat[mesId];
+    let isLastImage = true;
+    if (Array.isArray(message.extra.image_swipes)) {
+        const indexOf = message.extra.image_swipes.indexOf(message.extra.image);
+        if (indexOf > -1) {
+            message.extra.image_swipes.splice(indexOf, 1);
+            isLastImage = message.extra.image_swipes.length === 0;
+            if (!isLastImage) {
+                const newIndex = Math.min(indexOf, message.extra.image_swipes.length - 1);
+                message.extra.image = message.extra.image_swipes[newIndex];
+            }
+        }
+    }
+    if (isLastImage || value === POPUP_RESULT.CUSTOM1) {
         delete message.extra.image;
         delete message.extra.inline_image;
         delete message.extra.title;
         delete message.extra.append_title;
+        delete message.extra.image_swipes;
         mesBlock.find('.mes_img_container').removeClass('img_extra');
         mesBlock.find('.mes_img').attr('src', '');
+    } else {
+        appendMediaToMessage(message, mesBlock);
+    }
     await saveChatConditional();
+}

         renderAttachments();
     });
-    let sortField = localStorage.getItem('DataBank_sortField') || 'created';
+    let sortField = accountStorage.getItem('DataBank_sortField') || 'created';
-    let sortOrder = localStorage.getItem('DataBank_sortOrder') || 'desc';
+    let sortOrder = accountStorage.getItem('DataBank_sortOrder') || 'desc';
     let filterString = '';
     const template = $(await renderExtensionTemplateAsync('attachments', 'manager', {}));

         sortField = this.selectedOptions[0].dataset.sortField;
         sortOrder = this.selectedOptions[0].dataset.sortOrder;
-        localStorage.setItem('DataBank_sortField', sortField);
+        accountStorage.setItem('DataBank_sortField', sortField);
-        localStorage.setItem('DataBank_sortOrder', sortOrder);
+        accountStorage.setItem('DataBank_sortOrder', sortOrder);
         renderAttachments();
     });
     function handleBulkAction(action) {

             ...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+19 -8 Viewed

 import { isAdmin } from './user.js';
 import { t } from './i18n.js';
 import { debounce_timeout } from './constants.js';
+import { accountStorage } from './util/AccountStorage.js';
 export {
     getContext,

         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);

         htmlExternal.append(htmlLoading);
         const sortOrderKey = 'extensions_sortByName';
-        const sortByName = localStorage.getItem(sortOrderKey) === 'true';
+        const sortByName = accountStorage.getItem(sortOrderKey) === 'true';
         const sortFn = sortByName ? sortManifestsByName : sortManifestsByOrder;
         const extensions = Object.entries(manifests).sort((a, b) => sortFn(a[1], b[1])).map(getExtensionData);

             text: sortByName ? t`Sort: Display Name` : t`Sort: Loading Order`,
             action: async () => {
                 abortController.abort();
-                localStorage.setItem(sortOrderKey, sortByName ? 'false' : 'true');
+                accountStorage.setItem(sortOrderKey, sortByName ? 'false' : 'true');
                 await showExtensionsDetails();
             },
         };

@@ -1153,11 +1164,11 @@ async function checkForExtensionUpdates(force) {
1153	const currentDate = new Date().toDateString();	1164	const currentDate = new Date().toDateString();
1154		1165
1155	// Don't nag more than once a day	1166	// Don't nag more than once a day
1156	if (localStorage.getItem(STORAGE_NAG_KEY) === currentDate) {	1167	if (accountStorage.getItem(STORAGE_NAG_KEY) === currentDate) {
1157	return;	1168	return;
1158	}	1169	}
1159		1170
1160	localStorage.setItem(STORAGE_NAG_KEY, currentDate);	1171	accountStorage.setItem(STORAGE_NAG_KEY, currentDate);
1161	}	1172	}
1162		1173
1163	const isCurrentUserAdmin = isAdmin();	1174	const isCurrentUserAdmin = isAdmin();

public/scripts/extensions/assets/index.js+16 -17 Viewed

 import { deleteExtension, extensionNames, getContext, installExtension, renderExtensionTemplateAsync } from '../../extensions.js';
 import { POPUP_TYPE, Popup, callGenericPopup } from '../../popup.js';
 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>

     connectButton.on('click', async function () {
         const url = DOMPurify.sanitize(String(assetsJsonUrl.val()));
         const rememberKey = `Assets_SkipConfirm_${getStringHash(url)}`;
-        const skipConfirm = localStorage.getItem(rememberKey) === 'true';
+        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) {
                     const rememberValue = popup.inputResults.get('assets-remember');
-                    localStorage.setItem(rememberKey, String(rememberValue));
+                    accountStorage.setItem(rememberKey, String(rememberValue));
+                }
             },
         });

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/caption/settings.html+7 -1 Viewed

             <select id="caption_source" class="text_pole">
                 <option value="local" data-i18n="Local">Local</option>
                 <option value="multimodal" data-i18n="Multimodal (OpenAI / Anthropic / llama / Google)">Multimodal (OpenAI / Anthropic / llama / Google)</option>
-                <option value="extras" data-i18n="Extras">Extras</option>
+                <option value="extras" data-i18n="Extras">Extras (deprecated)</option>
                 <option value="horde" data-i18n="Horde">Horde</option>
             </select>
             <div id="caption_multimodal_block" class="flex-container wide100p">

                         <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
                         <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
                         <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
+                        <option data-type="google" value="gemini-2.0-pro-exp">gemini-2.0-pro-exp</option>
+                        <option data-type="google" value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05</option>
+                        <option data-type="google" value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
+                        <option data-type="google" value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
+                        <option data-type="google" value="gemini-2.0-flash">gemini-2.0-flash</option>
+                        <option data-type="google" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
                         <option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
                         <option data-type="google" value="gemini-2.0-flash-thinking-exp">gemini-2.0-flash-thinking-exp</option>
                         <option data-type="google" value="gemini-2.0-flash-thinking-exp-01-21">gemini-2.0-flash-thinking-exp-01-21</option>

public/scripts/extensions/connection-manager/index.js+4 -0 Viewed

     'api-url',
     'model',
     'proxy',
+    'stop-strings',
 ];
 const TC_COMMANDS = [

     'context',
     'instruct-state',
     'tokenizer',
+    'stop-strings',
 ];
 const FANCY_NAMES = {

     'instruct': 'Instruct Template',
     'context': 'Context Template',
     'tokenizer': 'Tokenizer',
+    'stop-strings': 'Custom Stopping Strings',
 };
 /**

  * @property {string} [context] Context Template
  * @property {string} [instruct-state] Instruct Mode
  * @property {string} [tokenizer] Tokenizer
+ * @property {string} [stop-strings] Custom Stopping Strings
  * @property {string[]} [exclude] Commands to exclude
  */

public/scripts/extensions/expressions/index.js+788 -708 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 }),
-                });
+        }
-        }
+        console.debug('Expression unset - No sprite found', { expression: expression });
-        catch (error) {
-            // `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'),
-                forceEnum: true,
             }),
         ],
-        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+22 -10 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>
                 <small data-i18n="Select the API for classifying expressions.">Select the API for classifying expressions.</small>
                 <select id="expression_api" class="flex1 margin0">
                     <option value="0" data-i18n="Local">Local</option>
-                    <option value="1" data-i18n="Extras">Extras</option>
+                    <option value="1" data-i18n="Extras">Extras (deprecated)</option>
                     <option value="2" data-i18n="Main API">Main API</option>
                     <option value="3" data-i18n="WebLLM Extension">WebLLM Extension</option>
                 </select>

                         <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/gallery/index.js+0 -1 Viewed

             description: 'character name',
             typeList: [ARGUMENT_TYPE.STRING],
             enumProvider: commonEnumProviders.characters('character'),
-            forceEnum: true,
         }),
         SlashCommandNamedArgument.fromProps({
             name: 'group',

public/scripts/extensions/memory/settings.html+1 -1 Viewed

                 <label for="summary_source" data-i18n="ext_sum_with">Summarize with:</label>
                 <select id="summary_source">
                     <option value="main" data-i18n="ext_sum_main_api">Main API</option>
-                    <option value="extras">Extras API</option>
+                    <option value="extras">Extras API (deprecated)</option>
                     <option value="webllm" data-i18n="ext_sum_webllm">WebLLM Extension</option>
                 </select><br>

public/scripts/extensions/quick-reply/src/QuickReply.js+9 -8 Viewed

 import { SlashCommandParser } from '../../../slash-commands/SlashCommandParser.js';
 import { SlashCommandParserError } from '../../../slash-commands/SlashCommandParserError.js';
 import { SlashCommandScope } from '../../../slash-commands/SlashCommandScope.js';
+import { accountStorage } from '../../../util/AccountStorage.js';
 import { debounce, delay, getSortableDelay, showFontAwesomePicker } from '../../../utils.js';
 import { log, quickReplyApi, warn } from '../index.js';
 import { QuickReplyContextLink } from './QuickReplyContextLink.js';

             this.editorSyntax = messageSyntaxInner;
             /**@type {HTMLInputElement}*/
             const wrap = dom.querySelector('#qr--modal-wrap');
-            wrap.checked = JSON.parse(localStorage.getItem('qr--wrap') ?? 'false');
+            wrap.checked = JSON.parse(accountStorage.getItem('qr--wrap') ?? 'false');
             wrap.addEventListener('click', () => {
-                localStorage.setItem('qr--wrap', JSON.stringify(wrap.checked));
+                accountStorage.setItem('qr--wrap', JSON.stringify(wrap.checked));
                 updateWrap();
             });
             const updateWrap = () => {

             };
             /**@type {HTMLInputElement}*/
             const tabSize = dom.querySelector('#qr--modal-tabSize');
-            tabSize.value = JSON.parse(localStorage.getItem('qr--tabSize') ?? '4');
+            tabSize.value = JSON.parse(accountStorage.getItem('qr--tabSize') ?? '4');
             const updateTabSize = () => {
                 message.style.tabSize = tabSize.value;
                 messageSyntaxInner.style.tabSize = tabSize.value;
                 updateScrollDebounced();
             };
             tabSize.addEventListener('change', () => {
-                localStorage.setItem('qr--tabSize', JSON.stringify(Number(tabSize.value)));
+                accountStorage.setItem('qr--tabSize', JSON.stringify(Number(tabSize.value)));
                 updateTabSize();
             });
             /**@type {HTMLInputElement}*/
             const executeShortcut = dom.querySelector('#qr--modal-executeShortcut');
-            executeShortcut.checked = JSON.parse(localStorage.getItem('qr--executeShortcut') ?? 'true');
+            executeShortcut.checked = JSON.parse(accountStorage.getItem('qr--executeShortcut') ?? 'true');
             executeShortcut.addEventListener('click', () => {
-                localStorage.setItem('qr--executeShortcut', JSON.stringify(executeShortcut.checked));
+                accountStorage.setItem('qr--executeShortcut', JSON.stringify(executeShortcut.checked));
             });
             /**@type {HTMLInputElement}*/
             const syntax = dom.querySelector('#qr--modal-syntax');
-            syntax.checked = JSON.parse(localStorage.getItem('qr--syntax') ?? 'true');
+            syntax.checked = JSON.parse(accountStorage.getItem('qr--syntax') ?? 'true');
             syntax.addEventListener('click', () => {
-                localStorage.setItem('qr--syntax', JSON.stringify(syntax.checked));
+                accountStorage.setItem('qr--syntax', JSON.stringify(syntax.checked));
                 updateSyntaxEnabled();
             });
             if (navigator.keyboard) {

public/scripts/extensions/quick-reply/src/QuickReplySet.js+6 -28 Viewed

 import { getRequestHeaders, substituteParams } from '../../../../script.js';
 import { Popup, POPUP_RESULT, POPUP_TYPE } from '../../../popup.js';
-import { executeSlashCommands, executeSlashCommandsOnChatInput, executeSlashCommandsWithOptions } from '../../../slash-commands.js';
+import { executeSlashCommandsOnChatInput, executeSlashCommandsWithOptions } from '../../../slash-commands.js';
-import { SlashCommandParser } from '../../../slash-commands/SlashCommandParser.js';
 import { SlashCommandScope } from '../../../slash-commands/SlashCommandScope.js';
-import { debounceAsync, log, warn } from '../index.js';
+import { SlashCommandParser } from '../../../slash-commands/SlashCommandParser.js';
+import { debounceAsync, warn } from '../index.js';
 import { QuickReply } from './QuickReply.js';
 export class QuickReplySet {
     /**@type {QuickReplySet[]}*/ static list = [];
     static from(props) {
         props.qrList = []; //props.qrList?.map(it=>QuickReply.from(it));
         const instance = Object.assign(new this(), props);

         return this.list.find(it=>it.name == name);
+    }
     /**@type {string}*/ name;
     /**@type {boolean}*/ disableSend = false;
     /**@type {boolean}*/ placeBeforeInput = false;

     /**@type {string}*/ color = 'transparent';
     /**@type {boolean}*/ onlyBorderColor = false;
     /**@type {QuickReply[]}*/ qrList = [];
     /**@type {number}*/ idIndex = 0;
     /**@type {boolean}*/ isDeleted = false;
     /**@type {function}*/ save;
     /**@type {HTMLElement}*/ dom;
     /**@type {HTMLElement}*/ settingsDom;
     constructor() {
         this.save = debounceAsync(()=>this.performSave(), 200);
+    }

         this.qrList.forEach(qr=>this.hookQuickReply(qr));
+    }
     unrender() {
         this.dom?.remove();
         this.dom = null;

@@ -100,9 +86,6 @@ export class QuickReplySet {
100	}	86	}
101	}	87	}
102		88
103
104
105
106	renderSettings() {	89	renderSettings() {
107	if (!this.settingsDom) {	90	if (!this.settingsDom) {
108	this.settingsDom = document.createElement('div'); {	91	this.settingsDom = document.createElement('div'); {

@@ -123,9 +106,6 @@ export class QuickReplySet {
123	this.settingsDom.append(qr.renderSettings(idx));	106	this.settingsDom.append(qr.renderSettings(idx));
124	}	107	}
125		108
126
127
128
129	/**	109	/**
130	*	110	*
131	* @param {QuickReply} qr	111	* @param {QuickReply} qr

@@ -138,6 +118,7 @@ export class QuickReplySet {
138	closure.scope.setMacro('arg::*', '');	118	closure.scope.setMacro('arg::*', '');
139	return (await closure.execute())?.pipe;	119	return (await closure.execute())?.pipe;
140	}	120	}
		121
141	/**	122	/**
142	*	123	*
143	* @param {QuickReply} qr The QR to execute.	124	* @param {QuickReply} qr The QR to execute.

@@ -207,6 +188,7 @@ export class QuickReplySet {
207	document.querySelector('#send_but').click();	188	document.querySelector('#send_but').click();
208	}	189	}
209	}	190	}
		191
210	/**	192	/**
211	* @param {QuickReply} qr	193	* @param {QuickReply} qr
212	* @param {string} [message] - optional altered message to be used	194	* @param {string} [message] - optional altered message to be used

         });
+    }
     addQuickReply(data = {}) {
         const id = Math.max(this.idIndex, this.qrList.reduce((max,qr)=>Math.max(max,qr.id),0)) + 1;
         data.id =

         this.save();
         return qr;
+    }
     addQuickReplyFromText(qrJson) {
         let data;
         if (qrJson) {

         this.save();
+    }
     toJSON() {
         return {
             version: 2,

         };
+    }
     async performSave() {
         const response = await fetch('/api/quick-replies/save', {
             method: 'POST',

public/scripts/extensions/quick-reply/src/SlashCommandHandler.js+4 -0 Viewed

+        }
+    }
     getQuickReply(args) {
+        if (!args.id && !args.label) {
+            toastr.error('Please provide a valid id or label.');
+            return '';
+        }
         try {
             return JSON.stringify(this.api.getQrByLabel(args.set, args.id !== undefined ? Number(args.id) : args.label));
         } catch (ex) {

public/scripts/extensions/quick-reply/src/ui/SettingsUi.js+1 -1 Viewed

+    }
     async addQrSet() {
-        const name = await Popup.show.input('Create a new World Info', 'Enter a name for the new Quick Reply Set:');
+        const name = await Popup.show.input('Create a new Quick Reply Set', 'Enter a name for the new Quick Reply Set:');
         if (name && name.length > 0) {
             const oldQrs = QuickReplySet.get(name);
             if (oldQrs) {

public/scripts/extensions/regex/editor.html+6 -0 Viewed

                         <span data-i18n="World Info">World Info</span>
                     </label>
                 </div>
+                <div data-i18n="[title]ext_regex_reasoning_desc" title="Reasoning block contents. When 'Only Format Prompt' is checked, it will also affect the reasoning contents added to the prompt.">
+                    <label class="checkbox flex-container">
+                        <input type="checkbox" name="replace_position" value="6">
+                        <span data-i18n="Reasoning">Reasoning</span>
+                    </label>
+                </div>
                 <div class="flex-container wide100p marginTop5">
                     <div class="flex1 flex-container flexNoGap">
                         <small data-i18n="[title]ext_regex_min_depth_desc" title="When applied to prompts or display, only affect messages that are at least N levels deep. 0 = last message, 1 = penultimate message, etc. Only counts WI entries @Depth and usable messages, i.e. not hidden or system.">

public/scripts/extensions/regex/engine.js+2 -1 Viewed

     SLASH_COMMAND: 3,
     // 4 - sendAs (legacy)
     WORLD_INFO: 5,
+    REASONING: 6,
 };
 export const substitute_find_regex = {

             // Script applies to Generate and input is Generate
             (script.promptOnly && isPrompt) ||
             // Script applies to all cases when neither "only"s are true, but there's no need to do it when `isMarkdown`, the as source (chat history) should already be changed beforehand
-            (!script.markdownOnly && !script.promptOnly && !isMarkdown)
+            (!script.markdownOnly && !script.promptOnly && !isMarkdown && !isPrompt)
         ) {
             if (isEdit && !script.runOnEdit) {
                 console.debug(`getRegexedString: Skipping script ${script.scriptName} because it does not run on edit`);

public/scripts/extensions/regex/index.js+4 -3 Viewed

 import { download, getFileText, getSortableDelay, uuidv4 } from '../../utils.js';
 import { regex_placement, runRegexScript, substitute_find_regex } from './engine.js';
 import { t } from '../../i18n.js';
+import { accountStorage } from '../../util/AccountStorage.js';
 /**
  * @typedef {object} RegexScript

  * @property {string} replaceString - The replace string
  * @property {string[]} trimStrings - The trim strings
  * @property {string?} findRegex - The find regex
- * @property {string?} substituteRegex - The substitute regex
+ * @property {number?} substituteRegex - The substitute regex
  */
 /**

             if (avatar && !extension_settings.character_allowed_regex.includes(avatar)) {
                 const checkKey = `AlertRegex_${characters[chid].avatar}`;
-                if (!localStorage.getItem(checkKey)) {
+                if (!accountStorage.getItem(checkKey)) {
-                    localStorage.setItem(checkKey, 'true');
+                    accountStorage.setItem(checkKey, 'true');
                     const template = await renderExtensionTemplateAsync('regex', 'embeddedScripts', {});
                     const result = await callGenericPopup(template, POPUP_TYPE.CONFIRM, '', { okButton: 'Yes' });

public/scripts/extensions/stable-diffusion/index.js+67 -0 Viewed

     huggingface: 'huggingface',
     nanogpt: 'nanogpt',
     bfl: 'bfl',
+    falai: 'falai',
 };
 const initiators = {

     return onApiKeyClick('BFL API Key:', SECRET_KEYS.BFL);
+}
+async function onFalaiKeyClick() {
+    return onApiKeyClick('FALAI API Key:', SECRET_KEYS.FALAI);
+}
 function onBflUpsamplingInput() {
     extension_settings.sd.bfl_upsampling = !!$('#sd_bfl_upsampling').prop('checked');
     saveSettingsDebounced();

         sources.huggingface,
         sources.nanogpt,
         sources.bfl,
+        sources.falai,
     ];
     if (cloudSources.includes(extension_settings.sd.source)) {

         case sources.bfl:
             models = await loadBflModels();
             break;
+        case sources.falai:
+            models = await loadFalaiModels();
+            break;
+    }
     for (const model of models) {

     ];
+}
+async function loadFalaiModels() {
+    $('#sd_falai_key').toggleClass('success', !!secret_state[SECRET_KEYS.FALAI]);
+    const result = await fetch('/api/sd/falai/models', {
+        method: 'POST',
+        headers: getRequestHeaders(),
+    });
+    if (result.ok) {
+        return await result.json();
+    }
+    return [];
+}
 async function loadPollinationsModels() {
     const result = await fetch('/api/sd/pollinations/models', {
         method: 'POST',

         case sources.bfl:
             schedulers = ['N/A'];
             break;
+        case sources.falai:
+            schedulers = ['N/A'];
+            break;
+    }
     for (const scheduler of schedulers) {

             case sources.bfl:
                 result = await generateBflImage(prefixedPrompt, signal);
                 break;
+            case sources.falai:
+                result = await generateFalaiImage(prefixedPrompt, negativePrompt, signal);
+                break;
+        }
         if (!result.data) {

+    }
+}
+/**
+ * Generates an image using the FAL.AI API.
+ * @param {string} prompt - The main instruction used to guide the image generation.
+ * @param {string} negativePrompt - The negative prompt used to guide the image generation.
+ * @param {AbortSignal} signal - An AbortSignal object that can be used to cancel the request.
+ * @returns {Promise<{format: string, data: string}>} - A promise that resolves when the image generation and processing are complete.
+ */
+async function generateFalaiImage(prompt, negativePrompt, signal) {
+    const result = await fetch('/api/sd/falai/generate', {
+        method: 'POST',
+        headers: getRequestHeaders(),
+        signal: signal,
+        body: JSON.stringify({
+            prompt: prompt,
+            negative_prompt: negativePrompt,
+            model: extension_settings.sd.model,
+            steps: clamp(extension_settings.sd.steps, 1, 50),
+            guidance: clamp(extension_settings.sd.scale, 1.5, 5),
+            width: clamp(extension_settings.sd.width, 256, 1440),
+            height: clamp(extension_settings.sd.height, 256, 1440),
+            seed: extension_settings.sd.seed >= 0 ? extension_settings.sd.seed : undefined,
+        }),
+    });
+    if (result.ok) {
+        const data = await result.json();
+        return { format: 'jpg', data: data.image };
+    } else {
+        const text = await result.text();
+        console.log(text);
+        throw new Error(text);
+    }
+}
 async function onComfyOpenWorkflowEditorClick() {
     let workflow = await (await fetch('/api/sd/comfy/workflow', {
         method: 'POST',

@@ -3782,6 +3846,8 @@ function isValidState() {
3782	return secret_state[SECRET_KEYS.NANOGPT];	3846	return secret_state[SECRET_KEYS.NANOGPT];
3783	case sources.bfl:	3847	case sources.bfl:
3784	return secret_state[SECRET_KEYS.BFL];	3848	return secret_state[SECRET_KEYS.BFL];
		3849	case sources.falai:
		3850	return secret_state[SECRET_KEYS.FALAI];
3785	}	3851	}
3786	}	3852	}
3787		3853

     $('#sd_function_tool').on('input', onFunctionToolInput);
     $('#sd_bfl_key').on('click', onBflKeyClick);
     $('#sd_bfl_upsampling').on('input', onBflUpsamplingInput);
+    $('#sd_falai_key').on('click', onFalaiKeyClick);
     if (!CSS.supports('field-sizing', 'content')) {
         $('.sd_settings .inline-drawer-toggle').on('click', function () {

public/scripts/extensions/stable-diffusion/settings.html+16 -1 Viewed

                 <option value="blockentropy">Block Entropy</option>
                 <option value="comfy">ComfyUI</option>
                 <option value="drawthings">DrawThings HTTP API</option>
-                <option value="extras">Extras API (local / remote)</option>
+                <option value="extras">Extras API (deprecated)</option>
+                <option value="falai">FAL.AI</option>
                 <option value="huggingface">HuggingFace Inference API (serverless)</option>
                 <option value="nanogpt">NanoGPT</option>
                 <option value="novel">NovelAI Diffusion</option>

                 </label>
             </div>
+            <div data-sd-source="falai">
+                <div class="flex-container flexnowrap alignItemsBaseline marginBot5">
+                    <a href="https://fal.ai/dashboard" target="_blank" rel="noopener noreferrer">
+                        <strong data-i18n="API Key">API Key</strong>
+                        <i class="fa-solid fa-share-from-square"></i>
+                    </a>
+                    <span class="expander"></span>
+                    <div id="sd_falai_key" class="menu_button menu_button_icon">
+                        <i class="fa-fw fa-solid fa-key"></i>
+                        <span data-i18n="Click to set">Click to set</span>
+                    </div>
+                </div>
+            </div>
             <div class="flex-container">
                 <div class="flex1">
                     <label for="sd_model" data-i18n="Model">Model</label>

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/alltalk.js+10 -6 Viewed

@@ -388,7 +388,7 @@ class AllTalkTtsProvider {
388	}	388	}
389		389
390	async fetchRvcVoiceObjects() {	390	async fetchRvcVoiceObjects() {
391	if (this.settings.server_version == 'v2') {	391	if (this.settings.server_version == 'v1') {
392	console.log('Skipping RVC voices fetch for V1 server');	392	console.log('Skipping RVC voices fetch for V1 server');
393	return [];	393	return [];
394	}	394	}

                 console.error('fetchTtsGeneration Error Response Text:', errorText);
                 throw new Error(`HTTP ${response.status}: ${errorText}`);
+            }
             const data = await response.json();
-            // Handle V1/V2 URL differences
+            // V1 returns a complete URL, V2 returns a relative path
-            const outputUrl = this.settings.server_version === 'v1'
+            if (this.settings.server_version === 'v1') {
-                ? data.output_file_url  // V1 returns full URL
+                // V1: Use the complete URL directly from the response
-                : `${this.settings.provider_endpoint}${data.output_file_url}`; // V2 returns relative path
+                return data.output_file_url;
+            } else {
+                // V2: Combine the endpoint with the relative path
+                return `${this.settings.provider_endpoint}${data.output_file_url}`;
+            }
-            return outputUrl;
         } catch (error) {
             console.error('[fetchTtsGeneration] Exception caught:', error);
             throw error;

public/scripts/extensions/tts/index.js+47 -30 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;

@@ -120,7 +119,7 @@ async function onNarrateOneMessage() {
120	}	119	}
121		120
122	resetTtsPlayback();	121	resetTtsPlayback();
123	ttsJobQueue.push(message);	122	processAndQueueTtsMessage(message);
124	moduleWorker();	123	moduleWorker();
125	}	124	}
126		125

+    }
     resetTtsPlayback();
-    ttsJobQueue.push({ mes: text, name: name });
+    processAndQueueTtsMessage({ mes: text, name: name });
     await moduleWorker();
     // Return back to the chat voices

     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();

     return processing;
+}
+/**
+ * Splits a message into lines and adds each non-empty line to the TTS job queue.
+ * @param {Object} message - The message object to be processed.
+ * @param {string} message.mes - The text of the message to be split into lines.
+ * @param {string} message.name - The name associated with the message.
+ * @returns {void}
+ */
+function processAndQueueTtsMessage(message) {
+    if (!extension_settings.tts.narrate_by_paragraphs) {
+        ttsJobQueue.push(message);
+        return;
+    }
+    const lines = message.mes.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.length === 0) {
+            continue;
+        }
+        ttsJobQueue.push(
+            Object.assign({}, message, {
+                mes: line,
+            }),
+        );
+    }
+}
 function debugTtsPlayback() {
     console.log(JSON.stringify(
+        {

     // 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.
-        ttsJobQueue.push(context.chat[context.chat.length - 1]);
+        processAndQueueTtsMessage(context.chat[context.chat.length - 1]);
+    }
     updateUiAudioPlayState();
+}

 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);

     $('#tts_narrate_quoted').prop('checked', extension_settings.tts.narrate_quoted_only);
     $('#tts_auto_generation').prop('checked', extension_settings.tts.auto_generation);
     $('#tts_periodic_auto_generation').prop('checked', extension_settings.tts.periodic_auto_generation);
+    $('#tts_narrate_by_paragraphs').prop('checked', extension_settings.tts.narrate_by_paragraphs);
     $('#tts_narrate_translated_only').prop('checked', extension_settings.tts.narrate_translated_only);
     $('#tts_narrate_user').prop('checked', extension_settings.tts.narrate_user);
     $('#tts_pass_asterisks').prop('checked', extension_settings.tts.pass_asterisks);

     saveSettingsDebounced();
+}
+function onNarrateByParagraphsClick() {
+    extension_settings.tts.narrate_by_paragraphs = !!$('#tts_narrate_by_paragraphs').prop('checked');
+    saveSettingsDebounced();
+}
 function onNarrateDialoguesClick() {
     extension_settings.tts.narrate_dialogues_only = !!$('#tts_narrate_dialogues').prop('checked');

     lastChatId = context.chatId;
     console.debug(`Adding message from ${message.name} for TTS processing: "${message.mes}"`);
+    if (extension_settings.tts.periodic_auto_generation) {
         ttsJobQueue.push(message);
+    } else {
+        processAndQueueTtsMessage(message);
+    }
+}
 async function onMessageDeleted() {

         $('#tts_pass_asterisks').on('click', onPassAsterisksClick);
         $('#tts_auto_generation').on('click', onAutoGenerationClick);
         $('#tts_periodic_auto_generation').on('click', onPeriodicAutoGenerationClick);
+        $('#tts_narrate_by_paragraphs').on('click', onNarrateByParagraphsClick);
         $('#tts_narrate_user').on('click', onNarrateUserClick);
         $('#playback_rate').on('input', function () {

     loadSettings(); // Depends on Extension Controls and loadTtsProvider
     loadTtsProvider(extension_settings.tts.currentProvider); // No dependencies
     addAudioControl(); // Depends on Extension Controls
-    const wrapper = new ModuleWorkerWrapper(moduleWorker);
     setInterval(wrapper.update.bind(wrapper), UPDATE_INTERVAL); // Init depends on all the things
     eventSource.on(event_types.MESSAGE_SWIPED, resetTtsPlayback);
     eventSource.on(event_types.CHAT_CHANGED, onChatChanged);

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/settings.html+4 -0 Viewed

                     <input type="checkbox" id="tts_periodic_auto_generation">
                     <small data-i18n="Narrate by paragraphs (when streaming)">Narrate by paragraphs (when streaming)</small>
                 </label>
+                <label class="checkbox_label" for="tts_narrate_by_paragraphs">
+                    <input type="checkbox" id="tts_narrate_by_paragraphs">
+                    <small data-i18n="Narrate by paragraphs (when not streaming)">Narrate by paragraphs (when not streaming)</small>
+                </label>
                 <label class="checkbox_label" for="tts_narrate_quoted">
                     <input type="checkbox" id="tts_narrate_quoted">
                     <small data-i18n="Only narrate quotes">Only narrate "quotes"</small>

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+60 -68 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) {

+                }
                 return textResult;
             };
             if (args.return === 'chunks') {
                 return getChunksText();
+            }
             // @ts-ignore
             return slashCommandReturnHelper.doReturn(args.return ?? 'object', urls, { objectToStringFunc: list => list.join('\n') });
         },
         aliases: ['databank-search', 'data-bank-search'],
         helpString: 'Search the Data Bank for a specific query using vector similarity. Returns a list of file URLs with the most relevant content.',

                 defaultValue: 'object',
                 enumList: [
                     new SlashCommandEnumValue('chunks', 'Return the actual content chunks', enumTypes.enum, '{}'),
-                    ...slashCommandReturnHelper.enumList({ allowObject: true })
+                    ...slashCommandReturnHelper.enumList({ allowObject: true }),
                 ],
                 forceEnum: true,
-            })
+            }),
         ],
         unnamedArgumentList: [
             new SlashCommandArgument('Query to search by.', ARGUMENT_TYPE.STRING, true, false),

public/scripts/extensions/vectors/settings.html+1 -1 Viewed

                 </label>
                 <select id="vectors_source" class="text_pole">
                     <option value="cohere">Cohere</option>
-                    <option value="extras">Extras</option>
+                    <option value="extras">Extras (deprecated)</option>
                     <option value="palm">Google AI Studio</option>
                     <option value="llamacpp">llama.cpp</option>
                     <option value="transformers" data-i18n="Local (Transformers)">Local (Transformers)</option>

public/scripts/f-localStorage.js+15 -0 Viewed

 ////////////////// LOCAL STORAGE HANDLING /////////////////////
+/**
+ * @deprecated THIS FUNCTION IS OBSOLETE. DO NOT USE
+ */
 export function SaveLocal(target, val) {
     localStorage.setItem(target, val);
     console.debug('SaveLocal -- ' + target + ' : ' + val);
+}
+/**
+ * @deprecated THIS FUNCTION IS OBSOLETE. DO NOT USE
+ */
 export function LoadLocal(target) {
     console.debug('LoadLocal -- ' + target);
     return localStorage.getItem(target);
+}
+/**
+ * @deprecated THIS FUNCTION IS OBSOLETE. DO NOT USE
+ */
 export function LoadLocalBool(target) {
     let result = localStorage.getItem(target) === 'true';
     return result;
+}
+/**
+ * @deprecated THIS FUNCTION IS OBSOLETE. DO NOT USE
+ */
 export function CheckLocal() {
     console.log('----------local storage---------');
     var i;

     console.log('------------------------------');
+}
+/**
+ * @deprecated THIS FUNCTION IS OBSOLETE. DO NOT USE
+ */
 export function ClearLocal() { localStorage.clear(); console.log('Removed All Local Storage'); }
 /////////////////////////////////////////////////////////////////////////

public/scripts/group-chats.js+37 -39 Viewed

 import { isExternalMediaAllowed } from './chats.js';
 import { POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
 import { t } from './i18n.js';
+import { accountStorage } from './util/AccountStorage.js';
 export {
     selected_group,

 /**
  * Finds the character ID for a group member.
- * @param {string} arg 0-based member index or character name
+ * @param {number|string} arg 0-based member index or character name
- * @returns {number} 0-based character ID
+ * @param {Boolean} full Whether to return a key-value object containing extra data
+ * @returns {number|Object} 0-based character ID or key-value object if full is true
  */
-export function findGroupMemberId(arg) {
+export function findGroupMemberId(arg, full = false) {
     arg = arg?.trim();
     if (!arg) {

+    }
     const index = parseInt(arg);
-    const searchByName = isNaN(index);
+    const searchByString = isNaN(index);
-    if (searchByName) {
+    if (searchByString) {
-        const memberNames = group.members.map(x => ({ name: characters.find(y => y.avatar === x)?.name, index: characters.findIndex(y => y.avatar === x) }));
+        const memberNames = group.members.map(x => ({
-        const fuse = new Fuse(memberNames, { keys: ['name'] });
+            avatar: x,
+            name: characters.find(y => y.avatar === x)?.name,
+            index: characters.findIndex(y => y.avatar === x),
+        }));
+        const fuse = new Fuse(memberNames, { keys: ['avatar', 'name'] });
         const result = fuse.search(arg);
         if (!result.length) {
-            console.warn(`WARN: No group member found with name ${arg}`);
+            console.warn(`WARN: No group member found using string ${arg}`);
             return;
+        }

             return;
+        }
-        console.log(`Triggering group member ${chid} (${arg}) from search result`, result[0]);
+        console.log(`Targeting group member ${chid} (${arg}) from search result`, result[0]);
-        return chid;
-    } else {
+        return !full ? chid : { ...{ id: chid }, ...result[0].item };
+    }
+    else {
         const memberAvatar = group.members[index];
         if (memberAvatar === undefined) {

@@ -347,8 +355,14 @@ export function findGroupMemberId(arg) {
347	return;	355	return;
348	}	356	}
349		357
350	console.log(`Triggering group member ${memberAvatar} at index ${index}`);	358	console.log(`Targeting group member ${memberAvatar} at index ${index}`);
351	return chid;	359
		360	return !full ? chid : {
		361	id: chid,
		362	avatar: memberAvatar,
		363	name: characters.find(y => y.avatar === memberAvatar)?.name,
		364	index: index,
		365	};
352	}	366	}
353	}	367	}
354		368

     /** @type {any} Caution: JS war crimes ahead */
     let textResult = '';
-    let typingIndicator = $('#chat .typing_indicator');
     const group = groups.find((x) => x.id === selected_group);
     if (!group || !Array.isArray(group.members) || !group.members.length) {

         setCharacterId(undefined);
         const userInput = String($('#send_textarea').val());
-        if (typingIndicator.length === 0 && !isStreamingEnabled()) {
-            typingIndicator = $(
-                '#typing_indicator_template .typing_indicator',
-            ).clone();
-            typingIndicator.hide();
-            $('#chat').append(typingIndicator);
-        }
         // id of this specific batch for regeneration purposes
         group_generation_id = Date.now();
         const lastMessage = chat[chat.length - 1];

+            }
             await eventSource.emit(event_types.GROUP_MEMBER_DRAFTED, chId);
-            if (type !== 'swipe' && type !== 'impersonate' && !isStreamingEnabled()) {
-                // update indicator and scroll down
-                typingIndicator
-                    .find('.typing_indicator_name')
-                    .text(characters[chId].name);
-                typingIndicator.show();
-            }
             // Wait for generation to finish
             textResult = await Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
             let messageChunk = textResult?.messageChunk;

@@ -930,8 +927,6 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
930	}	927	}
931	}	928	}
932	} finally {	929	} finally {
933	typingIndicator.hide();
934
935	is_group_generating = false;	930	is_group_generating = false;
936	setSendButtonState(false);	931	setSendButtonState(false);
937	setCharacterId(undefined);	932	setCharacterId(undefined);

         formatNavigator: PAGINATION_TEMPLATE,
         showNavigator: true,
         showSizeChanger: true,
-        pageSize: Number(localStorage.getItem(storageKey)) || 5,
+        pageSize: Number(accountStorage.getItem(storageKey)) || 5,
         sizeChangerOptions: [5, 10, 25, 50, 100, 200, 500, 1000],
         afterSizeSelectorChange: function (e) {
-            localStorage.setItem(storageKey, e.target.value);
+            accountStorage.setItem(storageKey, e.target.value);
         },
         callback: function (data) {
             $('#rm_group_add_members').empty();

             formatNavigator: PAGINATION_TEMPLATE,
             showNavigator: true,
             showSizeChanger: true,
-            pageSize: Number(localStorage.getItem(storageKey)) || 5,
+            pageSize: Number(accountStorage.getItem(storageKey)) || 5,
             sizeChangerOptions: [5, 10, 25, 50, 100, 200, 500, 1000],
             afterSizeSelectorChange: function (e) {
-                localStorage.setItem(storageKey, e.target.value);
+                accountStorage.setItem(storageKey, e.target.value);
             },
             callback: function (data) {
                 $('.rm_group_members').empty();

 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) {

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

public/scripts/loader.js+27 -6 Viewed

+    }
     return new Promise((resolve) => {
-        // Spinner blurs/fades out
+        const spinner = $('#load-spinner');
-        $('#load-spinner').on('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function () {
+        if (!spinner.length) {
+            console.warn('Spinner element not found, skipping animation');
+            cleanup();
+            return;
+        }
+        // Check if transitions are enabled
+        const transitionDuration = spinner[0] ? getComputedStyle(spinner[0]).transitionDuration : '0s';
+        const hasTransitions = parseFloat(transitionDuration) > 0;
+        if (hasTransitions) {
+            Promise.race([
+                new Promise((r) => setTimeout(r, 500)), // Fallback timeout
+                new Promise((r) => spinner.one('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', r)),
+            ]).finally(cleanup);
+        } else {
+            cleanup();
+        }
+        function cleanup() {
             $('#loader').remove();
             // Yoink preloader entirely; it only exists to cover up unstyled content while loading JS
             // If it's present, we remove it once and then it's gone.
             yoinkPreloader();
-            loaderPopup.complete(POPUP_RESULT.AFFIRMATIVE).then(() => {
+            loaderPopup.complete(POPUP_RESULT.AFFIRMATIVE)
+                .catch((err) => console.error('Error completing loaderPopup:', err))
+                .finally(() => {
                     loaderPopup = null;
                     resolve();
                 });
-        });
+        }
-        $('#load-spinner')
+        // Apply the styles
-            .css({
+        spinner.css({
             'filter': 'blur(15px)',
             'opacity': '0',
         });

public/scripts/openai.js+96 -62 Viewed

 import { Popup, POPUP_RESULT } from './popup.js';
 import { t } from './i18n.js';
 import { ToolManager } from './tool-calling.js';
+import { accountStorage } from './util/AccountStorage.js';
 export {
     openai_messages_count,

     setOpenAIMessageExamples,
     setupChatCompletionPromptManager,
     sendOpenAIRequest,
-    getChatCompletionModel,
     TokenHandler,
     IdentifierNotFoundError,
     Message,

     ai21_model: 'jamba-1.5-large',
     mistralai_model: 'mistral-large-latest',
     cohere_model: 'command-r-plus',
-    perplexity_model: 'llama-3.1-70b-instruct',
+    perplexity_model: 'sonar-pro',
-    groq_model: 'llama-3.1-70b-versatile',
+    groq_model: 'llama-3.3-70b-versatile',
     nanogpt_model: 'gpt-4o-mini',
     zerooneai_model: 'yi-large',
     blockentropy_model: 'be-70b-base-llama3.1',

     names_behavior: character_names_behavior.DEFAULT,
     continue_postfix: continue_postfix_types.SPACE,
     custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
-    show_thoughts: false,
+    show_thoughts: true,
+    reasoning_effort: 'medium',
     seed: -1,
     n: 1,
 };

     ai21_model: 'jamba-1.5-large',
     mistralai_model: 'mistral-large-latest',
     cohere_model: 'command-r-plus',
-    perplexity_model: 'llama-3.1-70b-instruct',
+    perplexity_model: 'sonar-pro',
     groq_model: 'llama-3.1-70b-versatile',
     nanogpt_model: 'gpt-4o-mini',
     zerooneai_model: 'yi-large',

     names_behavior: character_names_behavior.DEFAULT,
     continue_postfix: continue_postfix_types.SPACE,
     custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
-    show_thoughts: false,
+    show_thoughts: true,
+    reasoning_effort: 'medium',
     seed: -1,
     n: 1,
 };

         throw err;
+    }
     const rememberKey = `Proxy_SkipConfirm_${getStringHash(oai_settings.reverse_proxy)}`;
-    const skipConfirm = localStorage.getItem(rememberKey) === 'true';
+    const skipConfirm = accountStorage.getItem(rememberKey) === 'true';
     const confirmation = skipConfirm || await Popup.show.confirm(t`Connecting To Proxy`, await renderTemplateAsync('proxyConnectionWarning', { proxyURL: DOMPurify.sanitize(oai_settings.reverse_proxy) }));

@@ -423,7 +425,7 @@ async function validateReverseProxy() {
423	throw new Error('Proxy connection denied.');	425	throw new Error('Proxy connection denied.');
424	}	426	}
425		427
426	localStorage.setItem(rememberKey, String(true));	428	accountStorage.setItem(rememberKey, String(true));
427	}	429	}
428		430
429	/**	431	/**

+    }
     const onStreamResult = (res, err) => {
-        if (err) {
+        if (err) return;
-            return;
-        }
         const thisContent = res?.message?.content;

@@ -1497,7 +1497,7 @@ async function sendWindowAIRequest(messages, signal, stream) {
1497	}	1497	}
1498	}	1498	}
1499		1499
1500	function getChatCompletionModel() {	1500	export function getChatCompletionModel() {
1501	switch (oai_settings.chat_completion_source) {	1501	switch (oai_settings.chat_completion_source) {
1502	case chat_completion_sources.CLAUDE:	1502	case chat_completion_sources.CLAUDE:
1503	return oai_settings.claude_model;	1503	return oai_settings.claude_model;

     const isQuiet = type === 'quiet';
     const isImpersonate = type === 'impersonate';
     const isContinue = type === 'continue';
-    const stream = oai_settings.stream_openai && !isQuiet && !isScale && !(isGoogle && oai_settings.google_model.includes('bison')) && !(isOAI && oai_settings.openai_model.startsWith('o1-'));
+    const stream = oai_settings.stream_openai && !isQuiet && !isScale && !(isOAI && ['o1-2024-12-17', 'o1'].includes(oai_settings.openai_model));
     const useLogprobs = !!power_user.request_token_probabilities;
     const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom);

         'user_name': name1,
         'char_name': name2,
         'group_names': getGroupNames(),
-        'show_thoughts': Boolean(oai_settings.show_thoughts),
+        'include_reasoning': Boolean(oai_settings.show_thoughts),
+        'reasoning_effort': String(oai_settings.reasoning_effort),
     };
+    if (!canMultiSwipe && ToolManager.canPerformToolCalls(type)) {
+        await ToolManager.registerFunctionToolsOpenAI(generate_data);
+    }
     // Empty array will produce a validation error
     if (!Array.isArray(generate_data.stop) || !generate_data.stop.length) {
         delete generate_data.stop;

@@ -2039,6 +2044,8 @@ async function sendOpenAIRequest(type, messages, signal) {
2039	delete generate_data.top_logprobs;	2044	delete generate_data.top_logprobs;
2040	delete generate_data.logprobs;	2045	delete generate_data.logprobs;
2041	delete generate_data.logit_bias;	2046	delete generate_data.logit_bias;
		2047	delete generate_data.tools;
		2048	delete generate_data.tool_choice;
2042	}	2049	}
2043	}	2050	}
2044		2051

         generate_data['seed'] = oai_settings.seed;
+    }
-    if (!canMultiSwipe && ToolManager.canPerformToolCalls(type)) {
+    if (isOAI && (oai_settings.openai_model.startsWith('o1') || oai_settings.openai_model.startsWith('o3'))) {
-        await ToolManager.registerFunctionToolsOpenAI(generate_data);
-    }
-    if (isOAI && oai_settings.openai_model.startsWith('o1-')) {
         generate_data.messages.forEach((msg) => {
             if (msg.role === 'system') {
                 msg.role = 'user';

         });
         generate_data.max_completion_tokens = generate_data.max_tokens;
         delete generate_data.max_tokens;
-        delete generate_data.stream;
         delete generate_data.logprobs;
         delete generate_data.top_logprobs;
         delete generate_data.n;

         delete generate_data.tools;
         delete generate_data.tool_choice;
         delete generate_data.stop;
-        // It does support logit_bias, but the tokenizer used and its effect is yet unknown.
+        delete generate_data.logit_bias;
-        // delete generate_data.logit_bias;
+    }
     await eventSource.emit(event_types.CHAT_COMPLETION_SETTINGS_READY, generate_data);

             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 ?? '';
+    }

     oai_settings.inline_image_quality = settings.inline_image_quality ?? default_settings.inline_image_quality;
     oai_settings.bypass_status_check = settings.bypass_status_check ?? default_settings.bypass_status_check;
     oai_settings.show_thoughts = settings.show_thoughts ?? default_settings.show_thoughts;
+    oai_settings.reasoning_effort = settings.reasoning_effort ?? default_settings.reasoning_effort;
     oai_settings.seed = settings.seed ?? default_settings.seed;
     oai_settings.n = settings.n ?? default_settings.n;

     $('#n_openai').val(oai_settings.n);
     $('#openai_show_thoughts').prop('checked', oai_settings.show_thoughts);
+    $('#openai_reasoning_effort').val(oai_settings.reasoning_effort);
+    $(`#openai_reasoning_effort option[value="${oai_settings.reasoning_effort}"]`).prop('selected', true);
     if (settings.reverse_proxy !== undefined) oai_settings.reverse_proxy = settings.reverse_proxy;
     $('#openai_reverse_proxy').val(oai_settings.reverse_proxy);

         continue_postfix: settings.continue_postfix,
         function_calling: settings.function_calling,
         show_thoughts: settings.show_thoughts,
+        reasoning_effort: settings.reasoning_effort,
         seed: settings.seed,
         n: settings.n,
     };

         continue_postfix: ['#continue_postfix', 'continue_postfix', false],
         function_calling: ['#openai_function_calling', 'function_calling', true],
         show_thoughts: ['#openai_show_thoughts', 'show_thoughts', true],
+        reasoning_effort: ['#openai_reasoning_effort', 'reasoning_effort', false],
         seed: ['#seed_openai', 'seed', false],
         n: ['#n_openai', 'n', false],
     };

@@ -4027,7 +4042,7 @@ function getMaxContextOpenAI(value) {
4027	if (oai_settings.max_context_unlocked) {	4042	if (oai_settings.max_context_unlocked) {
4028	return unlocked_max;	4043	return unlocked_max;
4029	}	4044	}
4030	else if (value.startsWith('o1-')) {	4045	else if (value.startsWith('o1') \|\| value.startsWith('o3')) {
4031	return max_128k;	4046	return max_128k;
4032	}	4047	}
4033	else if (value.includes('chatgpt-4o-latest') \|\| value.includes('gpt-4-turbo') \|\| value.includes('gpt-4o') \|\| value.includes('gpt-4-1106') \|\| value.includes('gpt-4-0125') \|\| value.includes('gpt-4-vision')) {	4048	else if (value.includes('chatgpt-4o-latest') \|\| value.includes('gpt-4-turbo') \|\| value.includes('gpt-4o') \|\| value.includes('gpt-4-1106') \|\| value.includes('gpt-4-0125') \|\| value.includes('gpt-4-vision')) {

+    }
+}
+/**
+ * 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() || '');

             $('#openai_max_context').attr('max', max_2mil);
         } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121') || value.includes('gemini-2.0-flash-thinking-exp-1219')) {
             $('#openai_max_context').attr('max', max_32k);
-        } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) {
+        } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206') || value.includes('gemini-2.0-pro')) {
             $('#openai_max_context').attr('max', max_2mil);
-        } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash-exp') || value.includes('gemini-2.0-flash-thinking-exp')) {
+        } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash')) {
             $('#openai_max_context').attr('max', max_1mil);
         } else if (value.includes('gemini-1.0-pro') || value === 'gemini-pro') {
             $('#openai_max_context').attr('max', max_32k);

         if (oai_settings.max_context_unlocked) {
             $('#openai_max_context').attr('max', unlocked_max);
+        }
+        else if (['sonar', 'sonar-reasoning', 'sonar-reasoning-pro', 'r1-1776'].includes(oai_settings.perplexity_model)) {
+            $('#openai_max_context').attr('max', 127000);
+        }
+        else if (['sonar-pro'].includes(oai_settings.perplexity_model)) {
+            $('#openai_max_context').attr('max', 200000);
+        }
         else if (oai_settings.perplexity_model.includes('llama-3.1')) {
             const isOnline = oai_settings.perplexity_model.includes('online');
             const contextSize = isOnline ? 128 * 1024 - 4000 : 128 * 1024;
             $('#openai_max_context').attr('max', contextSize);
+        }
-        else if (['llama-3-sonar-small-32k-chat', 'llama-3-sonar-large-32k-chat'].includes(oai_settings.perplexity_model)) {
-            $('#openai_max_context').attr('max', max_32k);
-        }
-        else if (['llama-3-sonar-small-32k-online', 'llama-3-sonar-large-32k-online'].includes(oai_settings.perplexity_model)) {
-            $('#openai_max_context').attr('max', 28000);
-        }
-        else if (['sonar-small-chat', 'sonar-medium-chat', 'codellama-70b-instruct', 'mistral-7b-instruct', 'mixtral-8x7b-instruct', 'mixtral-8x22b-instruct'].includes(oai_settings.perplexity_model)) {
-            $('#openai_max_context').attr('max', max_16k);
-        }
-        else if (['llama-3-8b-instruct', 'llama-3-70b-instruct'].includes(oai_settings.perplexity_model)) {
-            $('#openai_max_context').attr('max', max_8k);
-        }
-        else if (['sonar-small-online', 'sonar-medium-online'].includes(oai_settings.perplexity_model)) {
-            $('#openai_max_context').attr('max', 12000);
-        }
         else {
-            $('#openai_max_context').attr('max', max_4k);
+            $('#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');

+    }
     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('llama-3.2') && oai_settings.groq_model.includes('-preview')) {
-            $('#openai_max_context').attr('max', max_8k);
-        }
-        else if (oai_settings.groq_model.includes('llama-3.3') || oai_settings.groq_model.includes('llama-3.2') || oai_settings.groq_model.includes('llama-3.1')) {
-            $('#openai_max_context').attr('max', max_128k);
-        }
-        else if (oai_settings.groq_model.includes('llama3-groq')) {
-            $('#openai_max_context').attr('max', max_8k);
-        }
-        else if (['llama3-8b-8192', 'llama3-70b-8192', 'gemma-7b-it', 'gemma2-9b-it'].includes(oai_settings.groq_model)) {
-            $('#openai_max_context').attr('max', max_8k);
-        }
-        else if (['mixtral-8x7b-32768'].includes(oai_settings.groq_model)) {
-            $('#openai_max_context').attr('max', max_32k);
-        }
-        else {
-            $('#openai_max_context').attr('max', max_4k);
-        }
         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);

     // gultra just isn't being offered as multimodal, thanks google.
     const visionSupportedModels = [
         'gpt-4-vision',
+        'gemini-2.0-pro-exp',
+        'gemini-2.0-pro-exp-02-05',
+        'gemini-2.0-flash-lite-preview',
+        'gemini-2.0-flash-lite-preview-02-05',
+        'gemini-2.0-flash',
+        'gemini-2.0-flash-001',
         'gemini-2.0-flash-thinking-exp-1219',
         'gemini-2.0-flash-thinking-exp-01-21',
         'gemini-2.0-flash-thinking-exp',

         'gpt-4-turbo',
         'gpt-4o',
         'gpt-4o-mini',
+        'o1',
+        'o1-2024-12-17',
         'chatgpt-4o-latest',
         'yi-vision',
         'pixtral-latest',

         saveSettingsDebounced();
     });
+    $('#openai_reasoning_effort').on('input', function () {
+        oai_settings.reasoning_effort = String($(this).val());
+        saveSettingsDebounced();
+    });
     if (!CSS.supports('field-sizing', 'content')) {
         $(document).on('input', '#openai_settings .autoSetHeight', function () {
             resetScrollHeight($(this));

public/scripts/personas.js+6 -5 Viewed

 import { openWorldInfoEditor, world_names } from './world-info.js';
 import { renderTemplateAsync } from './templates.js';
 import { saveMetadataDebounced } from './extensions.js';
+import { accountStorage } from './util/AccountStorage.js';
 /**
  * @typedef {object} PersonaConnection A connection between a character and a character or group entity

@@ -67,7 +68,7 @@ export function isPersonaPanelOpen() {
67	}	68	}
68		69
69	function switchPersonaGridView() {	70	function switchPersonaGridView() {
70	const state = localStorage.getItem(GRID_STORAGE_KEY) === 'true';	71	const state = accountStorage.getItem(GRID_STORAGE_KEY) === 'true';
71	$('#user_avatar_block').toggleClass('gridView', state);	72	$('#user_avatar_block').toggleClass('gridView', state);
72	}	73	}
73		74

         const storageKey = 'Personas_PerPage';
         const listId = '#user_avatar_block';
-        const perPage = Number(localStorage.getItem(storageKey)) || 5;
+        const perPage = Number(accountStorage.getItem(storageKey)) || 5;
         $('#persona_pagination_container').pagination({
             dataSource: entities,

                 updatePersonaUIStates();
             },
             afterSizeSelectorChange: function (e) {
-                localStorage.setItem(storageKey, e.target.value);
+                accountStorage.setItem(storageKey, e.target.value);
             },
             afterPaging: function (e) {
                 savePersonasPage = e;

         saveSettingsDebounced();
     });
     $('#persona_grid_toggle').on('click', () => {
-        const state = localStorage.getItem(GRID_STORAGE_KEY) === 'true';
+        const state = accountStorage.getItem(GRID_STORAGE_KEY) === 'true';
-        localStorage.setItem(GRID_STORAGE_KEY, String(!state));
+        accountStorage.setItem(GRID_STORAGE_KEY, String(!state));
         switchPersonaGridView();
     });

public/scripts/popup.js+12 -1 Viewed

     AFFIRMATIVE: 1,
     NEGATIVE: 0,
     CANCELLED: null,
+    CUSTOM1: 1001,
+    CUSTOM2: 1002,
+    CUSTOM3: 1003,
+    CUSTOM4: 1004,
+    CUSTOM5: 1005,
+    CUSTOM6: 1006,
+    CUSTOM7: 1007,
+    CUSTOM8: 1008,
+    CUSTOM9: 1009,
 };
 /**

  * @property {boolean?} [transparent=false] - Whether to display the popup in transparent mode (no background, border, shadow or anything, only its content)
  * @property {boolean?} [allowHorizontalScrolling=false] - Whether to allow horizontal scrolling in the popup
  * @property {boolean?} [allowVerticalScrolling=false] - Whether to allow vertical scrolling in the popup
+ * @property {boolean?} [leftAlign=false] - Whether the popup content should be left-aligned by default
  * @property {'slow'|'fast'|'none'?} [animation='slow'] - Animation speed for the popup (opening, closing, ...)
  * @property {POPUP_RESULT|number?} [defaultResult=POPUP_RESULT.AFFIRMATIVE] - The default result of this popup when Enter is pressed. Can be changed from `POPUP_RESULT.AFFIRMATIVE`.
  * @property {CustomPopupButton[]|string[]?} [customButtons=null] - Custom buttons to add to the popup. If only strings are provided, the buttons will be added with default options, and their result will be in order from `2` onward.

      * @param {string} [inputValue=''] - The initial value of the input field
      * @param {PopupOptions} [options={}] - Additional options for the popup
      */
-    constructor(content, type, inputValue = '', { okButton = null, cancelButton = null, rows = 1, wide = false, wider = false, large = false, transparent = false, allowHorizontalScrolling = false, allowVerticalScrolling = false, animation = 'fast', defaultResult = POPUP_RESULT.AFFIRMATIVE, customButtons = null, customInputs = null, onClosing = null, onClose = null, cropAspect = null, cropImage = null } = {}) {
+    constructor(content, type, inputValue = '', { okButton = null, cancelButton = null, rows = 1, wide = false, wider = false, large = false, transparent = false, allowHorizontalScrolling = false, allowVerticalScrolling = false, leftAlign = false, animation = 'fast', defaultResult = POPUP_RESULT.AFFIRMATIVE, customButtons = null, customInputs = null, onClosing = null, onClose = null, cropAspect = null, cropImage = null } = {}) {
         Popup.util.popups.push(this);
         // Make this popup uniquely identifiable

         if (transparent) this.dlg.classList.add('transparent_dialogue_popup');
         if (allowHorizontalScrolling) this.dlg.classList.add('horizontal_scrolling_dialogue_popup');
         if (allowVerticalScrolling) this.dlg.classList.add('vertical_scrolling_dialogue_popup');
+        if (leftAlign) this.dlg.classList.add('left_aligned_dialogue_popup');
         if (animation) this.dlg.classList.add('popup--animation-' + animation);
         // If custom button captions are provided, we set them beforehand

public/scripts/power-user.js+95 -9 Viewed

 import { POPUP_TYPE, callGenericPopup } from './popup.js';
 import { loadSystemPrompts } from './sysprompt.js';
 import { fuzzySearchCategories } from './filters.js';
+import { accountStorage } from './util/AccountStorage.js';
 export {
     loadPowerUserSettings,

     },
     reasoning: {
+        auto_parse: false,
         add_to_prompts: false,
+        auto_expand: false,
+        show_hidden: false,
         prefix: '<think>\n',
         suffix: '\n</think>',
         separator: '\n\n',

 /**
  * 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];

  */
 function validateStoryString(storyString, params) {
     /** @type {{hashCache: {[hash: string]: {fieldsWarned: {[key: string]: boolean}}}}} */
-    const cache = JSON.parse(localStorage.getItem(storage_keys.storyStringValidationCache)) ?? { hashCache: {} };
+    const cache = JSON.parse(accountStorage.getItem(storage_keys.storyStringValidationCache)) ?? { hashCache: {} };
     const hash = getStringHash(storyString);

@@ -2056,7 +2061,7 @@ function validateStoryString(storyString, params) {
2056	toastr.warning(`The story string does not contain the following fields, but they would contain content: ${fieldsList}`, 'Story String Validation');	2061	toastr.warning(`The story string does not contain the following fields, but they would contain content: ${fieldsList}`, 'Story String Validation');
2057	}	2062	}
2058		2063
2059	localStorage.setItem(storage_keys.storyStringValidationCache, JSON.stringify(cache));	2064	accountStorage.setItem(storage_keys.storyStringValidationCache, JSON.stringify(cache));
2060	}	2065	}
2061		2066
2062		2067

+    }
     saveSettingsDebounced();
-    eventSource.emit(event_types.MOVABLE_PANELS_RESET);
+    await eventSource.emit(event_types.MOVABLE_PANELS_RESET);
     eventSource.once(event_types.SETTINGS_UPDATED, () => {
         $('.resizing').removeClass('resizing');

+}
 /**
+ * Checks if the generated text should be filtered based on the auto-swipe settings.
+ * @param {string} text The text to check
+ * @returns {boolean} If the generated text should be filtered
+ */
+export function generatedTextFiltered(text) {
+    /**
+     * Checks if the given text contains any of the blacklisted words.
+     * @param {string} text The text to check
+     * @param {string[]} blacklist The list of blacklisted words
+     * @param {number} threshold The number of blacklisted words that need to be present to trigger the check
+     * @returns {boolean} Whether the text contains blacklisted words
+     */
+    function containsBlacklistedWords(text, blacklist, threshold) {
+        const regex = new RegExp(`\\b(${blacklist.join('|')})\\b`, 'gi');
+        const matches = text.match(regex) || [];
+        return matches.length >= threshold;
+    }
+    // Make sure a generated text is non-empty
+    // Otherwise we might get in a loop with a broken API
+    text = text.trim();
+    if (text.length > 0) {
+        if (power_user.auto_swipe_minimum_length) {
+            if (text.length < power_user.auto_swipe_minimum_length) {
+                console.log('Generated text size too small');
+                return true;
+            }
+        }
+        if (power_user.auto_swipe_blacklist.length && power_user.auto_swipe_blacklist_threshold) {
+            if (containsBlacklistedWords(text, power_user.auto_swipe_blacklist, power_user.auto_swipe_blacklist_threshold)) {
+                console.log('Generated text has blacklisted words');
+                return true;
+            }
+        }
+    }
+    return false;
+}
+/**
  * Gets the custom stopping strings from the power user settings.
  * @param {number | undefined} limit Number of strings to return. If 0 or undefined, returns all strings.
  * @returns {string[]} An array of custom stopping strings

         helpString: 'Start a new chat with a random character. If an argument is provided, only considers characters that have the specified tag.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'delmode',
+        name: 'del',
         callback: doDelMode,
-        aliases: ['del'],
+        aliases: ['delete', 'delmode'],
         unnamedArgumentList: [
             new SlashCommandArgument(
                 'optional number', [ARGUMENT_TYPE.NUMBER], false,

         ],
         helpString: 'activates a movingUI preset by name',
     }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'stop-strings',
+        aliases: ['stopping-strings', 'custom-stopping-strings', 'custom-stop-strings'],
+        helpString: `
+            <div>
+                Sets a list of custom stopping strings. Gets the list if no value is provided.
+            </div>
+            <div>
+                <strong>Examples:</strong>
+            </div>
+            <ul>
+                <li>Value must be a JSON-serialized array: <pre><code class="language-stscript">/stop-strings ["goodbye", "farewell"]</code></pre></li>
+                <li>Pipe characters must be escaped with a backslash: <pre><code class="language-stscript">/stop-strings ["left\\|right"]</code></pre></li>
+            </ul>
+        `,
+        returns: ARGUMENT_TYPE.LIST,
+        unnamedArgumentList: [
+            SlashCommandArgument.fromProps({
+                description: 'list of strings',
+                typeList: [ARGUMENT_TYPE.LIST],
+                acceptsMultiple: false,
+                isRequired: false,
+            }),
+        ],
+        callback: (_, value) => {
+            if (String(value ?? '').trim()) {
+                const parsedValue = ((x) => { try { return JSON.parse(x.toString()); } catch { return null; } })(value);
+                if (!parsedValue || !Array.isArray(parsedValue)) {
+                    throw new Error('Invalid list format. The value must be a JSON-serialized array of strings.');
+                }
+                parsedValue.forEach((item, index) => {
+                    parsedValue[index] = String(item);
+                });
+                power_user.custom_stopping_strings = JSON.stringify(parsedValue);
+                $('#custom_stopping_strings').val(power_user.custom_stopping_strings);
+                saveSettingsDebounced();
+            }
+            return power_user.custom_stopping_strings;
+        },
+    }));
 });

public/scripts/preset-manager.js+3 -0 Viewed

             'tabby_model',
             'derived',
             'generic_model',
+            'include_reasoning',
+            'global_banned_tokens',
+            'send_banned_tokens',
         ];
         const settings = Object.assign({}, getSettingsByApiId(this.apiId));

public/scripts/reasoning.js+765 -21 Viewed

-import { chat, closeMessageEditor, saveChatConditional, saveSettingsDebounced, substituteParams, updateMessageBlock } from '../script.js';
+import {
-import { t } from './i18n.js';
+    moment,
+} from '../lib.js';
+import { chat, closeMessageEditor, event_types, eventSource, main_api, messageFormatting, saveChatConditional, saveSettingsDebounced, substituteParams, updateMessageBlock } from '../script.js';
+import { getRegexedString, regex_placement } from './extensions/regex/engine.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 { copyText } from './utils.js';
+import { textgen_types, textgenerationwebui_settings } from './textgen-settings.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.

+}
 /**
+ * Toggles the auto-expand state of reasoning blocks.
+ */
+function toggleReasoningAutoExpand() {
+    const reasoningBlocks = document.querySelectorAll('details.mes_reasoning_details');
+    reasoningBlocks.forEach((block) => {
+        if (block instanceof HTMLDetailsElement) {
+            block.open = power_user.reasoning.auto_expand;
+        }
+    });
+}
+/**
+ * Extracts the reasoning from the response data.
+ * @param {object} data Response data
+ * @returns {string} Extracted reasoning
+ */
+export function extractReasoningFromData(data) {
+    switch (main_api) {
+        case 'textgenerationwebui':
+            switch (textgenerationwebui_settings.type) {
+                case textgen_types.OPENROUTER:
+                    return data?.choices?.[0]?.reasoning ?? '';
+            }
+            break;
+        case 'openai':
+            if (!oai_settings.show_thoughts) break;
+            switch (oai_settings.chat_completion_source) {
+                case chat_completion_sources.DEEPSEEK:
+                    return data?.choices?.[0]?.message?.reasoning_content ?? '';
+                case chat_completion_sources.OPENROUTER:
+                    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;
+    }
+    return '';
+}
+/**
+ * Check if the model supports reasoning, but does not send back the reasoning
+ * @returns {boolean} True if the model supports reasoning
+ */
+export function isHiddenReasoningModel() {
+    if (main_api !== 'openai') {
+        return false;
+    }
+    /** @typedef {{ (currentModel: string, supportedModel: string): boolean }} MatchingFunc */
+    /** @type {Record.<string, MatchingFunc>} */
+    const FUNCS = {
+        equals: (currentModel, supportedModel) => currentModel === supportedModel,
+        startsWith: (currentModel, supportedModel) => currentModel.startsWith(supportedModel),
+    };
+    /** @type {{ name: string; func: MatchingFunc; }[]} */
+    const hiddenReasoningModels = [
+        { name: 'o1', func: FUNCS.startsWith },
+        { name: 'o3', func: FUNCS.startsWith },
+        { name: 'gemini-2.0-flash-thinking-exp', func: FUNCS.startsWith },
+        { name: 'gemini-2.0-pro-exp', func: FUNCS.startsWith },
+    ];
+    const model = getChatCompletionModel() || '';
+    const isHidden = hiddenReasoningModels.some(({ name, func }) => func(model, name));
+    return isHidden;
+}
+/**
+ * Updates the Reasoning UI for a specific message
+ * @param {number|JQuery<HTMLElement>|HTMLElement} messageIdOrElement The message ID or the message element
+ * @param {Object} [options={}] - Optional arguments
+ * @param {boolean} [options.reset=false] - Whether to reset state, and not take the current mess properties (for example when swiping)
+ */
+export function updateReasoningUI(messageIdOrElement, { reset = false } = {}) {
+    const handler = new ReasoningHandler();
+    handler.initHandleMessage(messageIdOrElement, { reset });
+}
+/**
+ * Enum for representing the state of reasoning
+ * @enum {string}
+ * @readonly
+ */
+export const ReasoningState = {
+    None: 'none',
+    Thinking: 'thinking',
+    Done: 'done',
+    Hidden: 'hidden',
+};
+/**
+ * Handles reasoning-specific logic and DOM updates for messages.
+ * 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 */
+        this.startTime = null;
+        /** @type {Date} When the reasoning ended */
+        this.endTime = null;
+        /** @type {Date} Initial starting time of the generation */
+        this.initialTime = timeStarted ?? new Date();
+        this.#isHiddenReasoningModel = isHiddenReasoningModel();
+        // Cached DOM elements for reasoning
+        /** @type {HTMLElement} Main message DOM element `.mes` */
+        this.messageDom = null;
+        /** @type {HTMLDetailsElement} Reasoning details DOM element `.mes_reasoning_details` */
+        this.messageReasoningDetailsDom = null;
+        /** @type {HTMLElement} Reasoning content DOM element `.mes_reasoning` */
+        this.messageReasoningContentDom = null;
+        /** @type {HTMLElement} Reasoning header DOM element `.mes_reasoning_header_title` */
+        this.messageReasoningHeaderDom = null;
+    }
+    /**
+     * Initializes the reasoning handler for a specific message.
+     *
+     * Can be used to update the DOM elements or read other reasoning states.
+     * It will internally take the message-saved data and write the states back into the handler, as if during streaming of the message.
+     * The state will always be either done/hidden or none.
+     *
+     * @param {number|JQuery<HTMLElement>|HTMLElement} messageIdOrElement - The message ID or the message element
+     * @param {Object} [options={}] - Optional arguments
+     * @param {boolean} [options.reset=false] - Whether to reset state of the handler, and not take the current mess properties (for example when swiping)
+     */
+    initHandleMessage(messageIdOrElement, { reset = false } = {}) {
+        /** @type {HTMLElement} */
+        const messageElement = typeof messageIdOrElement === 'number'
+            ? document.querySelector(`#chat [mesid="${messageIdOrElement}"]`)
+            : messageIdOrElement instanceof HTMLElement
+                ? messageIdOrElement
+                : $(messageIdOrElement)[0];
+        const messageId = Number(messageElement.getAttribute('mesid'));
+        if (isNaN(messageId) || !chat[messageId]) return;
+        if (!chat[messageId].extra) {
+            chat[messageId].extra = {};
+        }
+        const extra = chat[messageId].extra;
+        if (extra.reasoning) {
+            this.state = ReasoningState.Done;
+        } else if (extra.reasoning_duration) {
+            this.state = ReasoningState.Hidden;
+        }
+        this.type = extra?.reasoning_type;
+        this.reasoning = extra?.reasoning ?? '';
+        if (this.state !== ReasoningState.None) {
+            this.initialTime = new Date(chat[messageId].gen_started);
+            this.startTime = this.initialTime;
+            this.endTime = new Date(this.startTime.getTime() + (extra?.reasoning_duration ?? 0));
+        }
+        // Prefill main dom element, as message might not have been rendered yet
+        this.messageDom = messageElement;
+        // 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;
+            this.endTime = null;
+        }
+        this.updateDom(messageId);
+        if (power_user.reasoning.auto_expand && this.state !== ReasoningState.Hidden) {
+            this.messageReasoningDetailsDom.open = true;
+        }
+    }
+    /**
+     * Gets the duration of the reasoning in milliseconds.
+     *
+     * @returns {number?} The duration in milliseconds, or null if the start or end time is not set
+     */
+    getDuration() {
+        if (this.startTime && this.endTime) {
+            return this.endTime.getTime() - this.startTime.getTime();
+        }
+        return 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 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, allowReset = false } = {}) {
+        if (messageId == -1 || !chat[messageId]) {
+            return false;
+        }
+        reasoning = allowReset ? reasoning ?? this.reasoning : reasoning || this.reasoning;
+        reasoning = trimSpaces(reasoning);
+        // Ensure the chat extra exists
+        if (!chat[messageId].extra) {
+            chat[messageId].extra = {};
+        }
+        const extra = 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;
+    }
+    /**
+     * Handles processing of reasoning for a message.
+     *
+     * This is usually called by the message processor when a message is changed.
+     *
+     * @param {number} messageId - The ID of the message to process
+     * @param {boolean} mesChanged - Whether the message has changed
+     * @returns {Promise<void>}
+     */
+    async process(messageId, mesChanged) {
+        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 });
+        if ((this.#isHiddenReasoningModel || reasoningChanged) && this.state === ReasoningState.None) {
+            this.state = ReasoningState.Thinking;
+            this.startTime = this.initialTime;
+        }
+        if ((this.#isHiddenReasoningModel || !reasoningChanged) && mesChanged && this.state === ReasoningState.Thinking) {
+            this.endTime = new Date();
+            await this.finish(messageId);
+        }
+    }
+    #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.
+     *
+     * Records the finish time if it was not set during streaming and updates the reasoning state.
+     * Emits an event to signal the completion of reasoning and updates the DOM elements accordingly.
+     *
+     * @param {number} messageId - The ID of the message to complete reasoning for
+     * @returns {Promise<void>}
+     */
+    async finish(messageId) {
+        if (this.state === ReasoningState.None) return;
+        // Make sure the finish time is recorded if a reasoning was in process and it wasn't ended correctly during streaming
+        if (this.startTime !== null && this.endTime === null) {
+            this.endTime = new Date();
+        }
+        if (this.state === ReasoningState.Thinking) {
+            this.state = this.#isHiddenReasoningModel ? ReasoningState.Hidden : ReasoningState.Done;
+            this.updateReasoning(messageId, null, { persist: true });
+            await eventSource.emit(event_types.STREAM_REASONING_DONE, this.reasoning, this.getDuration(), messageId, this.state);
+        }
+        this.updateDom(messageId);
+    }
+    /**
+     * Updates the reasoning UI elements for a message.
+     *
+     * Toggles the CSS class, updates states, reasoning message, and duration.
+     *
+     * @param {number} messageId - The ID of the message to update
+     */
+    updateDom(messageId) {
+        this.#checkDomElements(messageId);
+        // Main CSS class to show this message includes reasoning
+        this.messageDom.classList.toggle('reasoning', this.state !== ReasoningState.None);
+        // 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 = trimSpaces(this.reasoning);
+        const displayReasoning = messageFormatting(reasoning, '', false, false, messageId, {}, true);
+        this.messageReasoningContentDom.innerHTML = displayReasoning;
+        // Update tooltip for hidden reasoning edit
+        /** @type {HTMLElement} */
+        const button = this.messageDom.querySelector('.mes_edit_add_reasoning');
+        button.title = this.state === ReasoningState.Hidden ? t`Hidden reasoning - Add reasoning block` : t`Add reasoning block`;
+        // Make sure that hidden reasoning headers are collapsed by default, to not show a useless edit button
+        if (this.state === ReasoningState.Hidden) {
+            this.messageReasoningDetailsDom.open = false;
+        }
+        // Update the reasoning duration in the UI
+        this.#updateReasoningTimeUI();
+    }
+    /**
+     * Finds and caches reasoning-related DOM elements for the given message.
+     *
+     * @param {number} messageId - The ID of the message to cache the DOM elements for
+     */
+    #checkDomElements(messageId) {
+        // Make sure we reset dom elements if we are checking for a different message (shouldn't happen, but be sure)
+        if (this.messageDom !== null && this.messageDom.getAttribute('mesid') !== messageId.toString()) {
+            this.messageDom = null;
+        }
+        // Cache the DOM elements once
+        if (this.messageDom === null) {
+            this.messageDom = document.querySelector(`#chat .mes[mesid="${messageId}"]`);
+            if (this.messageDom === null) throw new Error('message dom does not exist');
+        }
+        if (this.messageReasoningDetailsDom === null) {
+            this.messageReasoningDetailsDom = this.messageDom.querySelector('.mes_reasoning_details');
+        }
+        if (this.messageReasoningContentDom === null) {
+            this.messageReasoningContentDom = this.messageDom.querySelector('.mes_reasoning');
+        }
+        if (this.messageReasoningHeaderDom === null) {
+            this.messageReasoningHeaderDom = this.messageDom.querySelector('.mes_reasoning_header_title');
+        }
+    }
+    /**
+     * Updates the reasoning time display in the UI.
+     *
+     * Shows the duration in a human-readable format with a tooltip for exact seconds.
+     * Displays "Thinking..." if still processing, or a generic message otherwise.
+     */
+    #updateReasoningTimeUI() {
+        const element = this.messageReasoningHeaderDom;
+        const duration = this.getDuration();
+        let data = null;
+        let title = '';
+        if (duration) {
+            const seconds = moment.duration(duration).asSeconds();
+            const durationStr = moment.duration(duration).locale(getCurrentLocale()).humanize({ s: 50, ss: 3 });
+            element.textContent = t`Thought for ${durationStr}`;
+            data = String(seconds);
+            title = `${seconds} seconds`;
+        } else if ([ReasoningState.Done, ReasoningState.Hidden].includes(this.state)) {
+            element.textContent = t`Thought for some time`;
+            data = 'unknown';
+        } else {
+            element.textContent = t`Thinking...`;
+            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);
+    }
+}
+/**
  * Helper class for adding reasoning to messages.
  * Keeps track of the number of reasoning additions.
  */
 export class PromptReasoning {
     static REASONING_PLACEHOLDER = '\u200B';
-    static REASONING_PLACEHOLDER_REGEX = new RegExp(`${PromptReasoning.REASONING_PLACEHOLDER}$`);
     constructor() {
         this.counter = 0;

      * Add reasoning to a message according to the power user settings.
      * @param {string} content Message content
      * @param {string} reasoning Message reasoning
+     * @param {boolean} isPrefix Whether this is the last message prefix
      * @returns {string} Message content with reasoning
      */
-    addToMessage(content, reasoning) {
+    addToMessage(content, reasoning, isPrefix) {
         // Disabled or reached limit of additions
-        if (!power_user.reasoning.add_to_prompts || this.counter >= power_user.reasoning.max_additions) {
+        if (!isPrefix && (!power_user.reasoning.add_to_prompts || this.counter >= power_user.reasoning.max_additions)) {
             return content;
+        }
-        // No reasoning provided or a placeholder
+        // No reasoning provided or a legacy placeholder
         if (!reasoning || reasoning === PromptReasoning.REASONING_PLACEHOLDER) {
             return content;
+        }

         const separator = substituteParams(power_user.reasoning.separator || '');
         const suffix = substituteParams(power_user.reasoning.suffix || '');
+        // Combine parts with reasoning only
+        if (isPrefix && !content) {
+            return `${prefix}${reasoning}`;
+        }
         // Combine parts with reasoning and content
         return `${prefix}${reasoning}${suffix}${separator}${content}`;
+    }

         power_user.reasoning.max_additions = Number($(this).val());
         saveSettingsDebounced();
     });
+    $('#reasoning_auto_parse').prop('checked', power_user.reasoning.auto_parse);
+    $('#reasoning_auto_parse').on('change', function () {
+        power_user.reasoning.auto_parse = !!$(this).prop('checked');
+        saveSettingsDebounced();
+    });
+    $('#reasoning_auto_expand').prop('checked', power_user.reasoning.auto_expand);
+    $('#reasoning_auto_expand').on('change', function () {
+        power_user.reasoning.auto_expand = !!$(this).prop('checked');
+        toggleReasoningAutoExpand();
+        saveSettingsDebounced();
+    });
+    toggleReasoningAutoExpand();
+    $('#reasoning_show_hidden').prop('checked', power_user.reasoning.show_hidden);
+    $('#reasoning_show_hidden').on('change', function () {
+        power_user.reasoning.show_hidden = !!$(this).prop('checked');
+        $('#chat').attr('data-show-hidden-reasoning', power_user.reasoning.show_hidden ? 'true' : null);
+        saveSettingsDebounced();
+    });
+    $('#chat').attr('data-show-hidden-reasoning', power_user.reasoning.show_hidden ? 'true' : null);
+}
 function registerReasoningSlashCommands() {
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'reasoning-get',
+        aliases: ['get-reasoning'],
         returns: ARGUMENT_TYPE.STRING,
         helpString: t`Get the contents of a reasoning block of a message. Returns an empty string if the message does not have a reasoning block.`,
         unnamedArgumentList: [

             }),
         ],
         callback: (_args, value) => {
-            const messageId = !isNaN(Number(value)) ? Number(value) : chat.length - 1;
+            const messageId = !isNaN(parseInt(value.toString())) ? parseInt(value.toString()) : chat.length - 1;
             const message = chat[messageId];
             const reasoning = String(message?.extra?.reasoning ?? '');
-            return reasoning.replace(PromptReasoning.REASONING_PLACEHOLDER_REGEX, '');
+            return reasoning;
         },
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'reasoning-set',
+        aliases: ['set-reasoning'],
         returns: ARGUMENT_TYPE.STRING,
         helpString: t`Set the reasoning block of a message. Returns the reasoning block content.`,
         namedArgumentList: [

             }),
         ],
         callback: async (args, value) => {
-            const messageId = !isNaN(Number(args[0])) ? Number(args[0]) : chat.length - 1;
+            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');

             return message.extra.reasoning;
         },
     }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'reasoning-parse',
+        aliases: ['parse-reasoning'],
+        returns: 'reasoning string',
+        helpString: t`Extracts the reasoning block from a string using the Reasoning Formatting settings.`,
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'regex',
+                description: 'Whether to apply regex scripts to the reasoning content.',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'true',
+                isRequired: false,
+                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: [
+            SlashCommandArgument.fromProps({
+                description: 'input string',
+                typeList: [ARGUMENT_TYPE.STRING],
+            }),
+        ],
+        callback: (args, 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.`, t`Reasoning Parse`);
+                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 returnMessage = args.return === 'content';
+            const parsedReasoning = parseReasoningFromString(value, { strict: !isFalseBoolean(String(args.strict ?? '')) });
+            if (!parsedReasoning) {
+                return returnMessage ? value : '';
+            }
+            if (returnMessage) {
+                return parsedReasoning.content;
+            }
+            const applyRegex = !isFalseBoolean(String(args.regex ?? ''));
+            return applyRegex
+                ? getRegexedString(parsedReasoning.reasoning, regex_placement.REASONING)
+                : parsedReasoning.reasoning;
+        },
+    }));
+}
 function registerReasoningMacros() {

+}
 function setReasoningEventHandlers() {
+    $(document).on('click', '.mes_reasoning_details', function (e) {
+        if (!e.target.closest('.mes_reasoning_actions') && !e.target.closest('.mes_reasoning_header')) {
+            e.preventDefault();
+        }
+    });
+    $(document).on('click', '.mes_reasoning_header', function (e) {
+        const details = $(this).closest('.mes_reasoning_details');
+        // Along with the CSS rules to mark blocks not toggle-able when they are empty, prevent them from actually being toggled, or being edited
+        if (details.find('.mes_reasoning').is(':empty')) {
+            e.preventDefault();
+            return;
+        }
+        // If we are in message edit mode and reasoning area is closed, a click opens and edits it
+        const mes = $(this).closest('.mes');
+        const mesEditArea = mes.find('#curEditTextarea');
+        if (mesEditArea.length) {
+            const summary = $(mes).find('.mes_reasoning_summary');
+            if (!summary.attr('open')) {
+                summary.find('.mes_reasoning_edit').trigger('click');
+            }
+        }
+    });
     $(document).on('click', '.mes_reasoning_copy', (e) => {
         e.stopPropagation();
         e.preventDefault();

         const textarea = document.createElement('textarea');
         const reasoningBlock = messageBlock.find('.mes_reasoning');
         textarea.classList.add('reasoning_edit_textarea');
-        textarea.value = reasoning.replace(PromptReasoning.REASONING_PLACEHOLDER_REGEX, '');
+        textarea.value = reasoning;
         $(textarea).insertBefore(reasoningBlock);
         if (!CSS.supports('field-sizing', 'content')) {

+        }
         const textarea = messageBlock.find('.reasoning_edit_textarea');
-        const reasoning = String(textarea.val());
+        const reasoning = getRegexedString(String(textarea.val()), regex_placement.REASONING, { isEdit: true });
         message.extra.reasoning = reasoning;
+        message.extra.reasoning_type = message.extra.reasoning_type ? ReasoningType.Edited : ReasoningType.Manual;
         await saveChatConditional();
         updateMessageBlock(messageId, message);
         textarea.remove();
+        messageBlock.find('.mes_edit_done:visible').trigger('click');
     });
     $(document).on('click', '.mes_reasoning_edit_cancel', function (e) {

         const { messageBlock } = getMessageFromJquery(this);
         const textarea = messageBlock.find('.reasoning_edit_textarea');
         textarea.remove();
+        messageBlock.find('.mes_reasoning_edit_cancel:visible').trigger('click');
+        updateReasoningUI(messageBlock);
     });
     $(document).on('click', '.mes_edit_add_reasoning', async function () {
-        const { message, messageId } = getMessageFromJquery(this);
+        const { message, messageBlock } = getMessageFromJquery(this);
         if (!message?.extra) {
             return;
+        }

             return;
+        }
-        message.extra.reasoning = PromptReasoning.REASONING_PLACEHOLDER;
+        messageBlock.addClass('reasoning');
+        // To make hidden reasoning blocks editable, we just set them to "Done" here already.
+        // They will be done on save anyway - and on cancel the reasoning block gets rerendered too.
+        if (messageBlock.attr('data-reasoning-state') === ReasoningState.Hidden) {
+            messageBlock.attr('data-reasoning-state', ReasoningState.Done);
+        }
+        // Open the reasoning area so we can actually edit it
+        messageBlock.find('.mes_reasoning_details').attr('open', '');
+        messageBlock.find('.mes_reasoning_edit').trigger('click');
         await saveChatConditional();
-        closeMessageEditor();
-        updateMessageBlock(messageId, message);
     });
     $(document).on('click', '.mes_reasoning_delete', async function (e) {
         e.stopPropagation();
         e.preventDefault();
-        const confirm = await Popup.show.confirm(t`Are you sure you want to clear the reasoning?`, t`Visible message contents will stay intact.`);
+        const confirm = await Popup.show.confirm(t`Remove Reasoning`, t`Are you sure you want to clear the reasoning?<br />Visible message contents will stay intact.`);
         if (!confirm) {
             return;
+        }
-        const { message, messageId } = getMessageFromJquery(this);
+        const { message, messageId, messageBlock } = getMessageFromJquery(this);
         if (!message?.extra) {
             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');
+        textarea.remove();
     });
     $(document).on('pointerup', '.mes_reasoning_copy', async function () {
         const { message } = getMessageFromJquery(this);
-        const reasoning = String(message?.extra?.reasoning ?? '').replace(PromptReasoning.REASONING_PLACEHOLDER_REGEX, '');
+        const reasoning = String(message?.extra?.reasoning ?? '');
         if (!reasoning) {
             return;

     });
+}
+/**
+ * Removes reasoning from a string if auto-parsing is enabled.
+ * @param {string} str Input string
+ * @returns {string} Output string
+ */
+export function removeReasoningFromString(str) {
+    if (!power_user.reasoning.auto_parse) {
+        return str;
+    }
+    const parsedReasoning = parseReasoningFromString(str);
+    return parsedReasoning?.content ?? str;
+}
+/**
+ * Parses reasoning from a string using the power user reasoning settings.
+ * @typedef {Object} ParsedReasoning
+ * @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, { 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(`${(strict ? '^\\s*?' : '')}${escapeRegex(power_user.reasoning.prefix)}(.*?)${escapeRegex(power_user.reasoning.suffix)}`, 's');
+        let didReplace = false;
+        let reasoning = '';
+        let content = String(str).replace(regex, (_match, captureGroup) => {
+            didReplace = true;
+            reasoning = captureGroup;
+            return '';
+        });
+        if (didReplace) {
+            reasoning = trimSpaces(reasoning);
+            content = trimSpaces(content);
+        }
+        return { reasoning, content };
+    } catch (error) {
+        console.error('[Reasoning] Error parsing reasoning block', error);
+        return null;
+    }
+}
+function registerReasoningAppEvents() {
+    eventSource.makeFirst(event_types.MESSAGE_RECEIVED, (/** @type {number} */ idx) => {
+        if (!power_user.reasoning.auto_parse) {
+            return;
+        }
+        console.debug('[Reasoning] Auto-parsing reasoning block for message', idx);
+        const message = chat[idx];
+        if (!message) {
+            console.warn('[Reasoning] Message not found', idx);
+            return null;
+        }
+        if (!message.mes || message.mes === '...') {
+            console.debug('[Reasoning] Message content is empty or a placeholder', idx);
+            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 (!parsedReasoning) {
+            return;
+        }
+        // Make sure the message has an extra object
+        if (!message.extra || typeof message.extra !== 'object') {
+            message.extra = {};
+        }
+        const contentUpdated = !!parsedReasoning.reasoning || parsedReasoning.content !== message.mes;
+        // 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
+        if (parsedReasoning.content !== message.mes) {
+            message.mes = parsedReasoning.content;
+        }
+        // Find if a message already exists in DOM and must be updated
+        if (contentUpdated) {
+            const messageRendered = document.querySelector(`.mes[mesid="${idx}"]`) !== null;
+            if (messageRendered) {
+                console.debug('[Reasoning] Updating message block', idx);
+                updateMessageBlock(idx, message);
+            }
+        }
+    });
+}
 export function initReasoning() {
     loadReasoningSettings();
     setReasoningEventHandlers();
     registerReasoningSlashCommands();
     registerReasoningMacros();
+    registerReasoningAppEvents();
+}

public/scripts/secrets.js+2 -0 Viewed

     BFL: 'api_key_bfl',
     GENERIC: 'api_key_generic',
     DEEPSEEK: 'api_key_deepseek',
+    SERPER: 'api_key_serper',
+    FALAI: 'api_key_falai',
 };
 const INPUT_MAP = {

public/scripts/slash-commands.js+127 -47 Viewed

 import { addEphemeralStoppingString, chat_styles, flushEphemeralStoppingStrings, power_user } from './power-user.js';
 import { SERVER_INPUTS, textgen_types, textgenerationwebui_settings } from './textgen-settings.js';
 import { decodeTextTokens, getAvailableTokenizers, getFriendlyTokenizerName, getTextTokens, getTokenCountAsync, selectTokenizer } from './tokenizers.js';
-import { debounce, delay, equalsIgnoreCaseAndAccents, findChar, getCharIndex, isFalseBoolean, isTrueBoolean, onlyUnique, showFontAwesomePicker, stringToRange, trimToEndSentence, trimToStartSentence, waitUntilCondition } from './utils.js';
+import { debounce, delay, equalsIgnoreCaseAndAccents, findChar, getCharIndex, isFalseBoolean, isTrueBoolean, onlyUnique, regexFromString, showFontAwesomePicker, stringToRange, trimToEndSentence, trimToStartSentence, waitUntilCondition } from './utils.js';
 import { registerVariableCommands, resolveVariable } from './variables.js';
 import { background_settings } from './backgrounds.js';
 import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';

 import { SlashCommandExecutionError } from './slash-commands/SlashCommandExecutionError.js';
 import { slashCommandReturnHelper } from './slash-commands/SlashCommandReturnHelper.js';
 import { t } from './i18n.js';
+import { accountStorage } from './util/AccountStorage.js';
 export {
     executeSlashCommands, executeSlashCommandsWithOptions, getSlashCommandsHelp, registerSlashCommand,
 };

                 description: 'Character name - or unique character identifier (avatar key)',
                 typeList: [ARGUMENT_TYPE.STRING],
                 enumProvider: commonEnumProviders.characters('character'),
-                forceEnum: false,
             }),
         ],
         helpString: `

                 typeList: [ARGUMENT_TYPE.STRING],
                 isRequired: true,
                 enumProvider: commonEnumProviders.characters('character'),
-                forceEnum: false,
             }),
             SlashCommandNamedArgument.fromProps({
                 name: 'avatar',

                 typeList: [ARGUMENT_TYPE.STRING],
                 isRequired: true,
                 enumProvider: commonEnumProviders.characters('all'),
-                forceEnum: true,
             }),
         ],
         helpString: 'Opens up a chat with the character or group by its name',

         helpString: 'Unhides a message from the prompt.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'member-get',
+        aliases: ['getmember', 'memberget'],
+        callback: (async ({ field = 'name' }, arg) => {
+            if (!selected_group) {
+                toastr.warning('Cannot run /member-get command outside of a group chat.');
+                return '';
+            }
+            if (field === '') {
+                toastr.warning('\'/member-get field=\' argument required!');
+                return '';
+            }
+            field = field.toString();
+            arg = arg.toString();
+            if (!['name', 'index', 'id', 'avatar'].includes(field)) {
+                toastr.warning('\'/member-get field=\' argument required!');
+                return '';
+            }
+            const isId = !isNaN(parseInt(arg));
+            const groupMember = findGroupMemberId(arg, true);
+            if (!groupMember) {
+                toastr.warn(`No group member found using ${isId ? 'id' : 'string'} ${arg}`);
+                return '';
+            }
+            return groupMember[field];
+        }),
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'field',
+                description: 'Whether to retrieve the name, index, id, or avatar.',
+                typeList: [ARGUMENT_TYPE.STRING],
+                isRequired: true,
+                defaultValue: 'name',
+                enumList: [
+                    new SlashCommandEnumValue('name', 'Character name'),
+                    new SlashCommandEnumValue('index', 'Group member index'),
+                    new SlashCommandEnumValue('avatar', 'Character avatar'),
+                    new SlashCommandEnumValue('id', 'Character index'),
+                ],
+            }),
+        ],
+        unnamedArgumentList: [
+            SlashCommandArgument.fromProps({
+                description: 'member index (starts with 0), name, or avatar',
+                typeList: [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.STRING],
+                isRequired: true,
+                enumProvider: commonEnumProviders.groupMembers(),
+            }),
+        ],
+        helpString: 'Retrieves a group member\'s name, index, id, or avatar.',
+    }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'member-disable',
         callback: disableGroupMemberCallback,
         aliases: ['disable', 'disablemember', 'memberdisable'],

         helpString: 'Moves a group member down in the group chat list.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
-        name: 'peek',
+        name: 'member-peek',
+        aliases: ['peek', 'memberpeek', 'peekmember'],
         callback: peekCallback,
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({

                 typeList: [ARGUMENT_TYPE.STRING],
                 defaultValue: 'System',
                 enumProvider: () => [...commonEnumProviders.characters('character')(), new SlashCommandEnumValue('System', null, enumTypes.enum, enumIcons.assistant)],
-                forceEnum: false,
             }),
             new SlashCommandNamedArgument(
                 'length', 'API response length in tokens', [ARGUMENT_TYPE.NUMBER], false,

         returns: 'uppercase string',
         unnamedArgumentList: [
             new SlashCommandArgument(
-                'string', [ARGUMENT_TYPE.STRING], true, false,
+                'text to affect', [ARGUMENT_TYPE.STRING], true, false,
             ),
         ],
         helpString: 'Converts the provided string to uppercase.',

         returns: 'lowercase string',
         unnamedArgumentList: [
             new SlashCommandArgument(
-                'string', [ARGUMENT_TYPE.STRING], true, false,
+                'text to affect', [ARGUMENT_TYPE.STRING], true, false,
             ),
         ],
         helpString: 'Converts the provided string to lowercase.',

         ],
         unnamedArgumentList: [
             new SlashCommandArgument(
-                'string', [ARGUMENT_TYPE.STRING], true, false,
+                'text to affect', [ARGUMENT_TYPE.STRING], true, false,
             ),
         ],
         helpString: `

             return '';
         },
     }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'replace',
+        aliases: ['re'],
+        callback: (async ({ mode = 'literal', pattern, replacer = '' }, text) => {
+            if (pattern === '')
+                throw new Error('Argument of \'pattern=\' cannot be empty');
+            switch (mode) {
+                case 'literal':
+                    return text.replaceAll(pattern, replacer);
+                case 'regex':
+                    return text.replace(regexFromString(pattern), replacer);
+                default:
+                    throw new Error('Invalid \'/replace mode=\' argument specified!');
+            }
+        }),
+        returns: 'replaced text',
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'mode',
+                description: 'Replaces occurrence(s) of a pattern',
+                typeList: [ARGUMENT_TYPE.STRING],
+                defaultValue: 'literal',
+                enumList: ['literal', 'regex'],
+            }),
+            new SlashCommandNamedArgument(
+                'pattern', 'pattern to search with', [ARGUMENT_TYPE.STRING], true, false,
+            ),
+            new SlashCommandNamedArgument(
+                'replacer', 'replacement text for matches', [ARGUMENT_TYPE.STRING], false, false, '',
+            ),
+        ],
+        unnamedArgumentList: [
+            new SlashCommandArgument(
+                'text to affect', [ARGUMENT_TYPE.STRING], true, false,
+            ),
+        ],
+        helpString: `
+            <div>
+                Replaces text within the provided string based on the pattern.
+            </div>
+            <div>
+                If <code>mode</code> is <code>literal</code> (or omitted), <code>pattern</code> is a literal search string (case-sensitive).<br />
+                If <code>mode</code> is <code>regex</code>, <code>pattern</code> is parsed as an ECMAScript Regular Expression.<br />
+                The <code>replacer</code> replaces based on the <code>pattern</code> in the input text.<br />
+                If <code>replacer</code> is omitted, the replacement(s) will be an empty string.<br />
+            </div>
+            <div>
+                <strong>Example:</strong>
+                <pre>/let x Blue house and blue car ||                                                                        </pre>
+                <pre>/replace pattern="blue" {{var::x}}                                | /echo  |/# Blue house and  car     ||</pre>
+                <pre>/replace pattern="blue" replacer="red" {{var::x}}                 | /echo  |/# Blue house and red car  ||</pre>
+                <pre>/replace mode=regex pattern="/blue/i" replacer="red" {{var::x}}   | /echo  |/# red house and blue car  ||</pre>
+                <pre>/replace mode=regex pattern="/blue/gi" replacer="red" {{var::x}}  | /echo  |/# red house and red car   ||</pre>
+            </div>
+        `,
+    }));
     registerVariableCommands();
+}

 async function disableGroupMemberCallback(_, arg) {
     if (!selected_group) {
-        toastr.warning('Cannot run /disable command outside of a group chat.');
+        toastr.warning('Cannot run /member-disable command outside of a group chat.');
         return '';
+    }

 async function enableGroupMemberCallback(_, arg) {
     if (!selected_group) {
-        toastr.warning('Cannot run /enable command outside of a group chat.');
+        toastr.warning('Cannot run /member-enable command outside of a group chat.');
         return '';
+    }

 async function moveGroupMemberUpCallback(_, arg) {
     if (!selected_group) {
-        toastr.warning('Cannot run /memberup command outside of a group chat.');
+        toastr.warning('Cannot run /member-up command outside of a group chat.');
         return '';
+    }

 async function moveGroupMemberDownCallback(_, arg) {
     if (!selected_group) {
-        toastr.warning('Cannot run /memberdown command outside of a group chat.');
+        toastr.warning('Cannot run /member-down command outside of a group chat.');
         return '';
+    }

@@ -3107,12 +3212,12 @@ async function moveGroupMemberDownCallback(_, arg) {
3107		3212
3108	async function peekCallback(_, arg) {	3213	async function peekCallback(_, arg) {
3109	if (!selected_group) {	3214	if (!selected_group) {
3110	toastr.warning('Cannot run /peek command outside of a group chat.');	3215	toastr.warning('Cannot run /member-peek command outside of a group chat.');
3111	return '';	3216	return '';
3112	}	3217	}
3113		3218
3114	if (is_group_generating) {	3219	if (is_group_generating) {
3115	toastr.warning('Cannot run /peek command while the group reply is generating.');	3220	toastr.warning('Cannot run /member-peek command while the group reply is generating.');
3116	return '';	3221	return '';
3117	}	3222	}
3118		3223

 async function removeGroupMemberCallback(_, arg) {
     if (!selected_group) {
-        toastr.warning('Cannot run /memberremove command outside of a group chat.');
+        toastr.warning('Cannot run /member-remove command outside of a group chat.');
-        return '';
-    }
-    if (is_group_generating) {
-        toastr.warning('Cannot run /memberremove command while the group reply is generating.');
         return '';
+    }

+}
 async function sendUserMessageCallback(args, text) {
-    if (!text) {
+    text = String(text ?? '').trim();
-        toastr.warning('You must specify text to send');
-        return;
-    }
-    text = text.trim();
     const compact = isTrueBoolean(args?.compact);
     const bias = extractMessageBias(text);

+}
 export async function sendMessageAs(args, text) {
-    if (!text) {
-        toastr.warning('You must specify text to send as');
-        return '';
-    }
     let name = args.name?.trim();
-    let mesText;
     if (!name) {
         const namelessWarningKey = 'sendAsNamelessWarningShown';
-        if (localStorage.getItem(namelessWarningKey) !== 'true') {
+        if (accountStorage.getItem(namelessWarningKey) !== 'true') {
             toastr.warning('To avoid confusion, please use /sendas name="Character Name"', 'Name defaulted to {{char}}', { timeOut: 10000 });
-            localStorage.setItem(namelessWarningKey, 'true');
+            accountStorage.setItem(namelessWarningKey, 'true');
+        }
         name = name2;
+    }
-    mesText = text.trim();
+    let mesText = String(text ?? '').trim();
     // Requires a regex check after the slash command is pushed to output
     mesText = getRegexedString(mesText, regex_placement.SLASH_COMMAND, { characterOverride: name });

+}
 export async function sendNarratorMessage(args, text) {
-    if (!text) {
+    text = String(text ?? '');
-        toastr.warning('You must specify text to send');
-        return '';
-    }
     const name = chat_metadata[NARRATOR_NAME_KEY] || NARRATOR_NAME_DEFAULT;
     // Messages that do nothing but set bias will be hidden from the context
     const bias = extractMessageBias(text);

+}
 async function sendCommentMessage(args, text) {
-    if (!text) {
-        toastr.warning('You must specify text to send');
-        return '';
-    }
     const compact = isTrueBoolean(args?.compact);
     const message = {
         name: COMMENT_NAME_DEFAULT,
         is_user: false,
         is_system: true,
         send_date: getMessageTimeStamp(),
-        mes: substituteParams(text.trim()),
+        mes: substituteParams(String(text ?? '').trim()),
         force_avatar: comment_avatar,
         extra: {
             type: system_message_types.COMMENT,

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

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

public/scripts/st-context.js+18 -0 Viewed

 import { textgenerationwebui_settings } from './textgen-settings.js';
 import { tokenizers, getTextTokens, getTokenCount, getTokenCountAsync, getTokenizerModel } from './tokenizers.js';
 import { ToolManager } from './tool-calling.js';
+import { accountStorage } from './util/AccountStorage.js';
 import { timestampToMoment, uuidv4 } from './utils.js';
+import { getGlobalVariable, getLocalVariable, setGlobalVariable, setLocalVariable } from './variables.js';
+import { convertCharacterBook, loadWorldInfo, saveWorldInfo, updateWorldInfoList } from './world-info.js';
 export function getContext() {
     return {
+        accountStorage,
         chat,
         characters,
         groups,

         humanizedDateTime,
         updateMessageBlock,
         appendMediaToMessage,
+        variables: {
+            local: {
+                get: getLocalVariable,
+                set: setLocalVariable,
+            },
+            global: {
+                get: getGlobalVariable,
+                set: setGlobalVariable,
+            },
+        },
+        loadWorldInfo,
+        saveWorldInfo,
+        updateWorldInfoList,
+        convertCharacterBook,
     };
+}

public/scripts/templates/itemizationChat.html+1 -1 Viewed

 </div>
 <hr>
 <div id="rawPromptPopup" class="list-group">
-    <div id="rawPromptWrapper" class="tokenItemizingSubclass"></div>
+    <div id="rawPromptWrapper" class="tokenItemizingMaintext"></div>
 </div>

public/scripts/textgen-models.js+15 -3 Viewed

 import { renderTemplateAsync } from './templates.js';
 import { POPUP_TYPE, callGenericPopup } from './popup.js';
 import { t } from './i18n.js';
+import { accountStorage } from './util/AccountStorage.js';
 let mancerModels = [];
 let togetherModels = [];

     'xAI',
     'Cloudflare',
     'SF Compute',
+    'Minimax',
+    'Nineteen',
+    'Liquid',
+    'InferenceNet',
+    'Friendli',
+    'AionLabs',
+    'Alibaba',
+    'Nebius',
+    'Chutes',
+    'Kluster',
+    'Targon',
     '01.AI',
     'HuggingFace',
     'Mancer',

     populateClassSelection(data);
     // Retrieve the stored number of items per page or default to 10
-    const perPage = Number(localStorage.getItem(storageKey)) || 10;
+    const perPage = Number(accountStorage.getItem(storageKey)) || 10;
     // Initialize pagination
     applyFiltersAndSort();

             },
             afterSizeSelectorChange: function (e) {
                 const newPerPage = e.target.value;
-                localStorage.setItem('Models_PerPage', newPerPage);
+                accountStorage.setItem(storageKey, newPerPage);
                 setupPagination(models, Number(newPerPage), featherlessCurrentPage); // Use the stored current page number
             },
         });

         const currentModelIndex = filteredModels.findIndex(x => x.id === textgen_settings.featherless_model);
         featherlessCurrentPage = currentModelIndex >= 0 ? (currentModelIndex / perPage) + 1 : 1;
-        setupPagination(filteredModels, Number(localStorage.getItem(storageKey)) || perPage, featherlessCurrentPage);
+        setupPagination(filteredModels, Number(accountStorage.getItem(storageKey)) || perPage, featherlessCurrentPage);
+    }
     // Required to keep the /model command function

public/scripts/textgen-settings.js+44 -9 Viewed

     setOnlineStatus,
     substituteParams,
 } from '../script.js';
+import { t } from './i18n.js';
 import { BIAS_CACHE, createNewLogitBiasEntry, displayLogitBias, getLogitBiasListResult } from './logit-bias.js';
 import { power_user, registerDebugFunction } from './power-user.js';

     //truncation_length: 2048,
     ban_eos_token: false,
     skip_special_tokens: true,
+    include_reasoning: true,
     streaming: false,
     mirostat_mode: 0,
     mirostat_tau: 5,

     grammar_string: '',
     json_schema: {},
     banned_tokens: '',
+    global_banned_tokens: '',
+    send_banned_tokens: true,
     sampler_priority: OOBA_DEFAULT_ORDER,
     samplers: LLAMACPP_DEFAULT_ORDER,
     samplers_priorities: APHRODITE_DEFAULT_ORDER,

     'add_bos_token',
     'ban_eos_token',
     'skip_special_tokens',
+    'include_reasoning',
     'streaming',
     'mirostat_mode',
     'mirostat_tau',

     'grammar_string',
     'json_schema',
     'banned_tokens',
+    'global_banned_tokens',
+    'send_banned_tokens',
     'ignore_eos_token',
     'spaces_between_special_tokens',
     'speculative_ngram',

     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;
+    }

  * @returns {TokenBanResult} String with comma-separated banned token IDs
  */
 function getCustomTokenBans() {
-    if (!settings.banned_tokens && !textgenerationwebui_banned_in_macros.length) {
+    if (!settings.send_banned_tokens || (!settings.banned_tokens && !settings.global_banned_tokens && !textgenerationwebui_banned_in_macros.length)) {
         return {
             banned_tokens: '',
             banned_strings: [],

     const tokenizer = getTokenizerForTokenIds();
     const banned_tokens = [];
     const banned_strings = [];
-    const sequences = settings.banned_tokens
+    const sequences = []
-        .split('\n')
+        .concat(settings.banned_tokens.split('\n'))
+        .concat(settings.global_banned_tokens.split('\n'))
         .concat(textgenerationwebui_banned_in_macros)
         .filter(x => x.length > 0)
         .filter(onlyUnique);

+}
 /**
+ * Sets the banned strings kill switch toggle.
+ * @param {boolean} isEnabled Kill switch state
+ * @param {string} title Label title
+ */
+function toggleBannedStringsKillSwitch(isEnabled, title) {
+    $('#send_banned_tokens_textgenerationwebui').prop('checked', isEnabled);
+    $('#send_banned_tokens_label').find('.menu_button').toggleClass('toggleEnabled', isEnabled).prop('title', title);
+    settings.send_banned_tokens = isEnabled;
+    saveSettingsDebounced();
+}
+/**
  * Calculates logit bias object from the logit bias list.
  * @returns {object} Logit bias object
  */

     for (const [type, selector] of Object.entries(SERVER_INPUTS)) {
         const control = $(selector);
         control.val(settings.server_urls[type] ?? '').on('input', function () {
-            settings.server_urls[type] = String($(this).val());
+            settings.server_urls[type] = String($(this).val()).trim();
             saveSettingsDebounced();
         });
+    }

+}
 jQuery(function () {
+    $('#send_banned_tokens_textgenerationwebui').on('change', function () {
+        const checked = !!$(this).prop('checked');
+        toggleBannedStringsKillSwitch(checked,
+            checked
+                ? t`Banned tokens/strings are being sent in the request.`
+                : t`Banned tokens/strings are NOT being sent in the request.`);
+    });
     $('#koboldcpp_order').sortable({
         delay: getSortableDelay(),
         stop: function () {

             'add_bos_token_textgenerationwebui': true,
             'temperature_last_textgenerationwebui': true,
             'skip_special_tokens_textgenerationwebui': true,
+            'include_reasoning_textgenerationwebui': true,
             'top_a_textgenerationwebui': 0,
             'top_a_counter_textgenerationwebui': 0,
             'mirostat_mode_textgenerationwebui': 0,

     if (isCheckbox) {
         const val = Boolean(value);
         $(`#${setting}_textgenerationwebui`).prop('checked', val);
+        if ('send_banned_tokens' === setting) {
+            $(`#${setting}_textgenerationwebui`).trigger('change');
+        }
+    }
     else if (isText) {
         $(`#${setting}_textgenerationwebui`).val(value);

         let logprobs = null;
         const swipes = [];
         const toolCalls = [];
-        const state = {};
+        const state = { reasoning: '' };
         while (true) {
             const { done, value } = await reader.read();
             if (done) return;

                 const newText = data?.choices?.[0]?.text || data?.content || '';
                 text += newText;
                 logprobs = parseTextgenLogprobs(newText, data.choices?.[0]?.logprobs || data?.completion_probabilities);
+                state.reasoning += data?.choices?.[0]?.reasoning ?? '';
+            }
             yield { text, swipes, logprobs, toolCalls, state };

             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;

@@ -1217,7 +1251,7 @@ function replaceMacrosInList(str) {
1217	}	1251	}
1218	}	1252	}
1219		1253
1220	export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate, isContinue, cfgValues, type) {	1254	export async function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate, isContinue, cfgValues, type) {
1221	const canMultiSwipe = !isContinue && !isImpersonate && type !== 'quiet';	1255	const canMultiSwipe = !isContinue && !isImpersonate && type !== 'quiet';
1222	const dynatemp = isDynamicTemperatureSupported();	1256	const dynatemp = isDynamicTemperatureSupported();
1223	const { banned_tokens, banned_strings } = getCustomTokenBans();	1257	const { banned_tokens, banned_strings } = getCustomTokenBans();

         'truncation_length': max_context,
         'ban_eos_token': settings.ban_eos_token,
         'skip_special_tokens': settings.skip_special_tokens,
+        'include_reasoning': settings.include_reasoning,
         'top_a': settings.top_a,
         'tfs': settings.tfs,
         'epsilon_cutoff': [OOBA, MANCER].includes(settings.type) ? settings.epsilon_cutoff : undefined,

@@ -1444,7 +1479,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
1444	}	1479	}
1445	}	1480	}
1446		1481
1447	eventSource.emitAndWait(event_types.TEXT_COMPLETION_SETTINGS_READY, params);	1482	await eventSource.emit(event_types.TEXT_COMPLETION_SETTINGS_READY, params);
1448		1483
1449	// Grammar conflicts with with json_schema	1484	// Grammar conflicts with with json_schema
1450	if (settings.type === LLAMACPP) {	1485	if (settings.type === LLAMACPP) {

public/scripts/tokenizers.js+6 -0 Viewed

@@ -679,6 +679,9 @@ 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') \|\| oai_settings.perplexity_model.includes('r1-1776')) {
		683	return deepseekTokenizer;
		684	}
682	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')) {
683	return llama3Tokenizer;	686	return llama3Tokenizer;
684	}	687	}

@@ -691,6 +694,9 @@ export function getTokenizerModel() {
691	}	694	}
692		695
693	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	}
694	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')) {
695	return llama3Tokenizer;	701	return llama3Tokenizer;
696	}	702	}

public/scripts/tool-calling.js+1 -0 Viewed

             chat_completion_sources.OPENROUTER,
             chat_completion_sources.GROQ,
             chat_completion_sources.COHERE,
+            chat_completion_sources.DEEPSEEK,
         ];
         return supportedSources.includes(oai_settings.chat_completion_source);
+    }

public/scripts/user.js+34 -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

+}
 /**
+ * Gets the handle string of the current user.
+ * @returns {string} User handle
+ */
+export function getCurrentUserHandle() {
+    return currentUser?.handle || 'default-user';
+}
+/**
  * Get the current user.
  * @returns {Promise<void>}
  */

+    }
+}
+/**
+ * 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/util/AccountStorage.js+139 -0 Viewed

+import { saveSettingsDebounced } from '../../script.js';
+const MIGRATED_MARKER = '__migrated';
+const MIGRATABLE_KEYS = [
+    /^AlertRegex_/,
+    /^AlertWI_/,
+    /^Assets_SkipConfirm_/,
+    /^Characters_PerPage$/,
+    /^DataBank_sortField$/,
+    /^DataBank_sortOrder$/,
+    /^extension_update_nag$/,
+    /^extensions_sortByName$/,
+    /^FeatherlessModels_PerPage$/,
+    /^GroupMembers_PerPage$/,
+    /^GroupCandidates_PerPage$/,
+    /^LNavLockOn$/,
+    /^LNavOpened$/,
+    /^mediaWarningShown:/,
+    /^NavLockOn$/,
+    /^NavOpened$/,
+    /^Personas_PerPage$/,
+    /^Personas_GridView$/,
+    /^Proxy_SkipConfirm_/,
+    /^qr--executeShortcut$/,
+    /^qr--syntax$/,
+    /^qr--tabSize$/,
+    /^qr--wrap$/,
+    /^RegenerateWithCtrlEnter$/,
+    /^SelectedNavTab$/,
+    /^sendAsNamelessWarningShown$/,
+    /^StoryStringValidationCache$/,
+    /^WINavOpened$/,
+    /^WI_PerPage$/,
+    /^world_info_sort_order$/,
+];
+/**
+ * Provides access to account storage of arbitrary key-value pairs.
+ */
+class AccountStorage {
+    /**
+     * @type {Record<string, string>} Storage state
+     */
+    #state = {};
+    /**
+     * @type {boolean} If the storage was initialized
+     */
+    #ready = false;
+    #migrateLocalStorage() {
+        const localStorageKeys = [];
+        for (let i = 0; i < globalThis.localStorage.length; i++) {
+            localStorageKeys.push(globalThis.localStorage.key(i));
+        }
+        for (const key of localStorageKeys) {
+            if (MIGRATABLE_KEYS.some(k => k.test(key))) {
+                const value = globalThis.localStorage.getItem(key);
+                this.#state[key] = value;
+                globalThis.localStorage.removeItem(key);
+            }
+        }
+    }
+    /**
+     * Initialize the account storage.
+     * @param {Object} state Initial state
+     */
+    init(state) {
+        if (state && typeof state === 'object') {
+            this.#state = Object.assign(this.#state, state);
+        }
+        if (!Object.hasOwn(this.#state, MIGRATED_MARKER)) {
+            this.#migrateLocalStorage();
+            this.#state[MIGRATED_MARKER] = '1';
+            saveSettingsDebounced();
+        }
+        this.#ready = true;
+    }
+    /**
+     * Get the value of a key in account storage.
+     * @param {string} key Key to get
+     * @returns {string|null} Value of the key
+     */
+    getItem(key) {
+        if (!this.#ready) {
+            console.warn(`AccountStorage not ready (trying to read from ${key})`);
+        }
+        return Object.hasOwn(this.#state, key) ? String(this.#state[key]) : null;
+    }
+    /**
+     * Set a key in account storage.
+     * @param {string} key Key to set
+     * @param {string} value Value to set
+     */
+    setItem(key, value) {
+        if (!this.#ready) {
+            console.warn(`AccountStorage not ready (trying to write to ${key})`);
+        }
+        this.#state[key] = String(value);
+        saveSettingsDebounced();
+    }
+    /**
+     * Remove a key from account storage.
+     * @param {string} key Key to remove
+     */
+    removeItem(key) {
+        if (!this.#ready) {
+            console.warn(`AccountStorage not ready (trying to remove ${key})`);
+        }
+        if (!Object.hasOwn(this.#state, key)) {
+            return;
+        }
+        delete this.#state[key];
+        saveSettingsDebounced();
+    }
+    /**
+     * Gets a snapshot of the storage state.
+     * @returns {Record<string, string>} A deep clone of the storage state
+     */
+    getState() {
+        return structuredClone(this.#state);
+    }
+}
+/**
+ * Account storage instance.
+ */
+export const accountStorage = new AccountStorage();

public/scripts/utils.js+48 -13 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(/\.[^/.]+$/, '');
-    }
+}
 /**

 /**
  * Run an action once an animation on a control ends. If the control has no animation, the action will be executed immediately.
- *
+ * The action will be executed after the animation ends or after the timeout, whichever comes first.
  * @param {HTMLElement} control - The control element to listen for animation end event
  * @param {(control:*?) => void} callback - The callback function to be executed when the animation ends
+ * @param {number} [timeout=500] - The timeout in milliseconds to wait for the animation to end before executing the callback
  */
-export function runAfterAnimation(control, callback) {
+export function runAfterAnimation(control, callback, timeout = 500) {
     if (hasAnimation(control)) {
-        const onAnimationEnd = () => {
+        Promise.race([
-            control.removeEventListener('animationend', onAnimationEnd);
+            new Promise((r) => setTimeout(r, timeout)), // Fallback timeout
-            callback(control);
+            new Promise((r) => control.addEventListener('animationend', r, { once: true })),
-        };
+        ]).finally(() => callback(control));
-        control.addEventListener('animationend', onAnimationEnd);
     } else {
         callback(control);
+    }

+    }
+}
+/**
+ * Sets or removes a dataset property on an HTMLElement
+ *
+ * Utility function to make it easier to reset dataset properties on null, without them being "null" as value.
+ *
+ * @param {HTMLElement} element - The element to modify
+ * @param {string} name - The name of the dataset property
+ * @param {string|null} value - The value to set - If null, the dataset property will be removed
+ */
+export function setDatasetProperty(element, name, value) {
+    if (value === null) {
+        delete element.dataset[name];
+    } else {
+        element.dataset[name] = value;
+    }
+}
 export async function fetchFaFile(name) {
     const style = document.createElement('style');
     style.innerHTML = await (await fetch(`/css/${name}`)).text();

public/scripts/variables.js+4 -4 Viewed

 const MAX_LOOPS = 100;
-function getLocalVariable(name, args = {}) {
+export function getLocalVariable(name, args = {}) {
     if (!chat_metadata.variables) {
         chat_metadata.variables = {};
+    }

@@ -45,7 +45,7 @@ function getLocalVariable(name, args = {}) {
45	return (localVariable?.trim?.() === '' \|\| isNaN(Number(localVariable))) ? (localVariable \|\| '') : Number(localVariable);	45	return (localVariable?.trim?.() === '' \|\| isNaN(Number(localVariable))) ? (localVariable \|\| '') : Number(localVariable);
46	}	46	}
47		47
48	function setLocalVariable(name, value, args = {}) {	48	export function setLocalVariable(name, value, args = {}) {
49	if (!name) {	49	if (!name) {
50	throw new Error('Variable name cannot be empty or undefined.');	50	throw new Error('Variable name cannot be empty or undefined.');
51	}	51	}

     return value;
+}
-function getGlobalVariable(name, args = {}) {
+export function getGlobalVariable(name, args = {}) {
     let globalVariable = extension_settings.variables.global[args.key ?? name];
     if (args.index !== undefined) {
         try {

@@ -102,7 +102,7 @@ function getGlobalVariable(name, args = {}) {
102	return (globalVariable?.trim?.() === '' \|\| isNaN(Number(globalVariable))) ? (globalVariable \|\| '') : Number(globalVariable);	102	return (globalVariable?.trim?.() === '' \|\| isNaN(Number(globalVariable))) ? (globalVariable \|\| '') : Number(globalVariable);
103	}	103	}
104		104
105	function setGlobalVariable(name, value, args = {}) {	105	export function setGlobalVariable(name, value, args = {}) {
106	if (!name) {	106	if (!name) {
107	throw new Error('Variable name cannot be empty or undefined.');	107	throw new Error('Variable name cannot be empty or undefined.');
108	}	108	}

public/scripts/world-info.js+36 -18 Viewed

 import { StructuredCloneMap } from './util/StructuredCloneMap.js';
 import { renderTemplateAsync } from './templates.js';
 import { t } from './i18n.js';
+import { accountStorage } from './util/AccountStorage.js';
 export const world_info_insertion_strategy = {
     evenly: 0,

     #entries = [];
     /**
+     * Is this a dry run?
+     * @type {boolean}
+     */
+    #isDryRun = false;
+    /**
      * Buffer for active timed effects.
      * @type {Record<TimedEffectType, WIScanEntry[]>}
      */

      * Initialize the timed effects with the given messages.
      * @param {string[]} chat Array of chat messages
      * @param {WIScanEntry[]} entries Array of entries
+     * @param {boolean} isDryRun Whether the operation is a dry run
      */
-    constructor(chat, entries) {
+    constructor(chat, entries, isDryRun = false) {
         this.#chat = chat;
         this.#entries = entries;
+        this.#isDryRun = isDryRun;
         this.#ensureChatMetadata();
+    }

      * Checks for timed effects on chat messages.
      */
     checkTimedEffects() {
+        if (!this.#isDryRun) {
             this.#checkTimedEffectOfType('sticky', this.#buffer.sticky, this.#onEnded.sticky.bind(this));
             this.#checkTimedEffectOfType('cooldown', this.#buffer.cooldown, this.#onEnded.cooldown.bind(this));
+        }
         this.#checkDelayEffect(this.#buffer.delay);
+    }

      * @param {WIScanEntry[]} activatedEntries Entries that were activated
      */
     setTimedEffects(activatedEntries) {
+        if (this.#isDryRun) return;
         for (const entry of activatedEntries) {
             this.#setTimedEffectOfType('sticky', entry);
             this.#setTimedEffectOfType('cooldown', entry);

         if (!this.isValidEffectType(type)) {
             return;
+        }
+        if (this.#isDryRun && type !== 'delay') {
+            return;
+        }
         const key = this.#getEntryKey(entry);
         delete chat_metadata.timedWorldInfo[type][key];

         $('#world_editor_select').append(`<option value='${i}'>${item}</option>`);
     });
-    $('#world_info_sort_order').val(localStorage.getItem(SORT_ORDER_KEY) || '0');
+    $('#world_info_sort_order').val(accountStorage.getItem(SORT_ORDER_KEY) || '0');
     $('#world_info').trigger('change');
     $('#world_editor_select').trigger('change');

     return null;
+}
-async function updateWorldInfoList() {
+export async function updateWorldInfoList() {
     const result = await fetch('/api/settings/get', {
         method: 'POST',
         headers: getRequestHeaders(),

     if (typeof navigation === 'number' && Number(navigation) >= 0) {
         const data = getDataArray();
         const uidIndex = data.findIndex(x => x.uid === navigation);
-        const perPage = Number(localStorage.getItem(storageKey)) || perPageDefault;
+        const perPage = Number(accountStorage.getItem(storageKey)) || perPageDefault;
         startPage = Math.floor(uidIndex / perPage) + 1;
+    }
     $('#world_info_pagination').pagination({
         dataSource: getDataArray,
-        pageSize: Number(localStorage.getItem(storageKey)) || perPageDefault,
+        pageSize: Number(accountStorage.getItem(storageKey)) || perPageDefault,
         sizeChangerOptions: [10, 25, 50, 100, 500, 1000],
         showSizeChanger: true,
         pageRange: 1,

             worldEntriesList.append(blocks);
         },
         afterSizeSelectorChange: function (e) {
-            localStorage.setItem(storageKey, e.target.value);
+            accountStorage.setItem(storageKey, e.target.value);
         },
         afterPaging: function () {
             $('#world_popup_entries_list textarea[name="comment"]').each(function () {

@@ -2174,7 +2189,7 @@ function verifyWorldInfoSearchSortRule() {
2174	// If search got cleared, we make sure to hide the option and go back to the one before	2189	// If search got cleared, we make sure to hide the option and go back to the one before
2175	if (!searchTerm && !isHidden) {	2190	if (!searchTerm && !isHidden) {
2176	searchOption.attr('hidden', '');	2191	searchOption.attr('hidden', '');
2177	selector.val(localStorage.getItem(SORT_ORDER_KEY) \|\| '0');	2192	selector.val(accountStorage.getItem(SORT_ORDER_KEY) \|\| '0');
2178	}	2193	}
2179	}	2194	}
2180		2195

                     setWIOriginalDataValue(data, uid, originalDataValueName, data.entries[uid][entryPropName]);
                     await saveWorldInfo(name, data);
+                }
+                $(this).toggleClass('empty', !data.entries[uid][entryPropName].length);
             });
+            input.toggleClass('empty', !entry[entryPropName].length);
             input.on('select2:select', /** @type {function(*):void} */ event => updateWorldEntryKeyOptionsCache([event.params.data]));
             input.on('select2:unselect', /** @type {function(*):void} */ event => updateWorldEntryKeyOptionsCache([event.params.data], { remove: true }));

                     data.entries[uid][entryPropName] = splitKeywordsAndRegexes(value);
                     setWIOriginalDataValue(data, uid, originalDataValueName, data.entries[uid][entryPropName]);
                     await saveWorldInfo(name, data);
+                    $(this).toggleClass('empty', !data.entries[uid][entryPropName].length);
+                }
             });
             input.val(entry[entryPropName].join(', ')).trigger('input', { skipReset: true });

         headers: getRequestHeaders(),
         body: JSON.stringify({ name: name, data: data }),
     });
-    eventSource.emit(event_types.WORLDINFO_UPDATED, name, data);
+    await eventSource.emit(event_types.WORLDINFO_UPDATED, name, data);
+}

     const context = getContext();
     const buffer = new WorldInfoBuffer(chat);
-    console.debug(`[WI] --- START WI SCAN (on ${chat.length} messages) ---`);
+    console.debug(`[WI] --- START WI SCAN (on ${chat.length} messages)${isDryRun ? ' (DRY RUN)' : ''} ---`);
     // Combine the chat

     console.debug(`[WI] Context size: ${maxContext}; WI budget: ${budget} (max% = ${world_info_budget}%, cap = ${world_info_budget_cap})`);
     const sortedEntries = await getSortedEntries();
-    const timedEffects = new WorldInfoTimedEffects(chat, sortedEntries);
+    const timedEffects = new WorldInfoTimedEffects(chat, sortedEntries, isDryRun);
-    !isDryRun && timedEffects.checkTimedEffects();
+    timedEffects.checkTimedEffects();
     if (sortedEntries.length === 0) {
         return { worldInfoBefore: '', worldInfoAfter: '', WIDepthEntries: [], EMEntries: [], allActivatedEntries: new Set() };

@@ -4324,12 +4342,12 @@ export async function checkWorldInfo(chat, maxContext, isDryRun) {
4324	context.setExtensionPrompt(NOTE_MODULE_NAME, ANWithWI, chat_metadata[metadata_keys.position], chat_metadata[metadata_keys.depth], extension_settings.note.allowWIScan, chat_metadata[metadata_keys.role]);	4342	context.setExtensionPrompt(NOTE_MODULE_NAME, ANWithWI, chat_metadata[metadata_keys.position], chat_metadata[metadata_keys.depth], extension_settings.note.allowWIScan, chat_metadata[metadata_keys.role]);
4325	}	4343	}
4326		4344
4327	!isDryRun && timedEffects.setTimedEffects(Array.from(allActivatedEntries.values()));	4345	timedEffects.setTimedEffects(Array.from(allActivatedEntries.values()));
4328	buffer.resetExternalEffects();	4346	buffer.resetExternalEffects();
4329	timedEffects.cleanUp();	4347	timedEffects.cleanUp();
4330		4348
4331	console.log(`[WI] Adding ${allActivatedEntries.size} entries to prompt`, Array.from(allActivatedEntries.values()));	4349	console.log(`[WI] ${isDryRun ? 'Hypothetically adding' : 'Adding'} ${allActivatedEntries.size} entries to prompt`, Array.from(allActivatedEntries.values()));
4332	console.debug('[WI] --- DONE ---');	4350	console.debug(`[WI] --- DONE${isDryRun ? ' (DRY RUN)' : ''} ---`);
4333		4351
4334	return { worldInfoBefore, worldInfoAfter, EMEntries, WIDepthEntries, allActivatedEntries: new Set(allActivatedEntries.values()) };	4352	return { worldInfoBefore, worldInfoAfter, EMEntries, WIDepthEntries, allActivatedEntries: new Set(allActivatedEntries.values()) };
4335	}	4353	}

     return outputObj;
+}
-function convertCharacterBook(characterBook) {
+export function convertCharacterBook(characterBook) {
     const result = { entries: {}, originalData: characterBook };
     characterBook.entries.forEach((entry, index) => {

         // Only show the alert once per character
         const checkKey = `AlertWI_${characters[chid].avatar}`;
         const worldName = characters[chid]?.data?.extensions?.world;
-        if (!localStorage.getItem(checkKey) && (!worldName || !world_names.includes(worldName))) {
+        if (!accountStorage.getItem(checkKey) && (!worldName || !world_names.includes(worldName))) {
-            localStorage.setItem(checkKey, 'true');
+            accountStorage.setItem(checkKey, 'true');
             if (power_user.world_import_dialog) {
                 const html = `<h3>This character has an embedded World/Lorebook.</h3>

     $('#world_info_sort_order').on('change', function () {
         const value = String($(this).find(':selected').val());
         // Save sort order, but do not save search sorting, as this is a temporary sorting option
-        if (value !== 'search') localStorage.setItem(SORT_ORDER_KEY, value);
+        if (value !== 'search') accountStorage.setItem(SORT_ORDER_KEY, value);
         updateEditor(navigation_option.none);
     });

public/style.css+144 -56 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);

     --tool-cool-color-picker-btn-bg: transparent;
     --tool-cool-color-picker-btn-border-color: transparent;
+    --mes-right-spacing: 30px;
     --avatar-base-height: 50px;
     --avatar-base-width: 50px;
     --avatar-base-border-radius: 2px;

     color: var(--SmartThemeEmColor);
+}
+.tokenItemizingMaintext {
+    font-size: calc(var(--mainFontSize) * 0.8);
+}
 .tokenGraph {
     border-radius: 10px;
     border: 1px solid var(--SmartThemeBorderColor);

 .mes_reasoning {
     display: block;
-    border: 1px solid var(--SmartThemeBorderColor);
+    border-left: 2px solid var(--reasoning-body-color);
-    background-color: var(--black30a);
+    border-radius: 2px;
-    border-radius: 5px;
     padding: 5px;
-    margin: 5px 0;
+    padding-left: 14px;
+    margin-bottom: 0.5em;
     overflow-y: auto;
+    color: hsl(from var(--reasoning-body-color) h calc(s * var(--reasoning-saturation)) l);
+}
+.mes_reasoning_details {
+    margin-right: var(--mes-right-spacing);
+}
-.mes_reasoning_summary {
+.mes_reasoning_details .mes_reasoning_summary {
+    list-style: none;
+    margin-right: calc(var(--mes-right-spacing) * -1);
+}
+.mes_reasoning_details summary::-webkit-details-marker {
+    display: none;
+}
+.mes_reasoning *:last-child {
+    margin-bottom: 0;
+}
+.mes_reasoning_header_block {
+    flex-grow: 1;
+}
+.mes_reasoning_header {
     cursor: pointer;
     position: relative;
-    margin: 2px;
+    user-select: none;
+    margin: 0.5em 2px;
+    padding: 7px 14px;
+    padding-right: calc(0.7em + 14px);
+    border-radius: 5px;
+    background-color: var(--grey30);
+    font-size: calc(var(--mainFontSize) * 0.9);
+    align-items: baseline;
+}
+.mes:has(.mes_reasoning:empty) .mes_reasoning_header {
+    cursor: default;
+}
+/* TWIMC: Remove with custom CSS to show the icon */
+.mes_reasoning_header>.icon-svg {
+    display: none;
+}
 @supports not selector(:has(*)) {

+}
 .mes_bias:empty,
-.mes_reasoning:empty,
+.mes:not(.reasoning) .mes_reasoning_details,
-.mes_reasoning_details:has(.mes_reasoning:empty),
-.mes_block:has(.edit_textarea) .mes_reasoning_details,
 .mes_reasoning_details:not([open]) .mes_reasoning_actions,
 .mes_reasoning_details:has(.reasoning_edit_textarea) .mes_reasoning,
-.mes_reasoning_details:not(:has(.reasoning_edit_textarea)) .mes_reasoning_actions .mes_button.mes_reasoning_edit_done,
+.mes_reasoning_details:has(.reasoning_edit_textarea) .mes_reasoning_header,
-.mes_reasoning_details:not(:has(.reasoning_edit_textarea)) .mes_reasoning_actions .mes_button.mes_reasoning_edit_cancel,
+.mes_reasoning_details:has(.reasoning_edit_textarea) .mes_reasoning_actions .mes_button:not(.edit_button),
-.mes_reasoning_details:has(.reasoning_edit_textarea) .mes_reasoning_actions .mes_button:not(.mes_reasoning_edit_done, .mes_reasoning_edit_cancel) {
+.mes_reasoning_details:not(:has(.reasoning_edit_textarea)) .mes_reasoning_actions .edit_button,
+.mes_block:has(.edit_textarea):has(.reasoning_edit_textarea) .mes_reasoning_actions,
+.mes.reasoning:not([data-reasoning-state="hidden"]) .mes_edit_add_reasoning,
+.mes:has(.mes_reasoning:empty) .mes_reasoning_arrow,
+.mes:has(.mes_reasoning:empty) .mes_reasoning,
+.mes:has(.mes_reasoning:empty) .mes_reasoning_copy {
     display: none;
+}
-.mes_reasoning_actions {
+.mes[data-reasoning-state="hidden"] .mes_edit_add_reasoning {
+    background-color: color-mix(in srgb, var(--SmartThemeQuoteColor) 33%, var(--SmartThemeBlurTintColor) 66%);
+}
+/** If hidden reasoning should not be shown, we hide all blocks that don't have content */
+#chat:not([data-show-hidden-reasoning="true"]):not(:has(.reasoning_edit_textarea)) .mes:has(.mes_reasoning:empty) .mes_reasoning_details {
+    display: none;
+}
+.mes_reasoning_details .mes_reasoning_arrow {
     position: absolute;
-    right: 0;
+    top: 50%;
-    top: 0;
+    right: 7px;
+    transform: translateY(-50%);
+    font-size: calc(var(--mainFontSize) * 0.7);
+    width: calc(var(--mainFontSize) * 0.7);
+    height: calc(var(--mainFontSize) * 0.7);
+}
-    display: flex;
+.mes_reasoning_details:not([open]) .mes_reasoning_arrow {
-    gap: 4px;
+    transform: translateY(-50%) rotate(180deg);
-    flex-wrap: nowrap;
-    justify-content: flex-end;
-    transition: all 200ms;
-    overflow-x: hidden;
-    padding: 1px;
+}
 .mes_reasoning_summary>span {

+}
 .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 u,
+.mes_text q i,
-.mes_reasoning u {
+.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 {
     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,

     /*only affects bubblechat to make it sit nicely at the bottom*/
+}
-.last_mes:has(.mes_text:empty):has(.mes_reasoning_details[open]) .mes_reasoning:not(:empty) {
+.last_mes:has(.mes_text:empty):has(.mes_reasoning_details) .mes_reasoning:not(:empty) {
-    margin-bottom: 30px;
+    margin-bottom: var(--mes-right-spacing);
-}
-.last_mes .mes_reasoning,
-.last_mes .mes_text {
-    padding-right: 30px;
+}
 /* SWIPE RELATED STYLES*/

     padding-left: 0;
     padding-top: 5px;
     padding-bottom: 5px;
+    padding-right: var(--mes-right-spacing);
+}
 br {

@@ -2849,9 +2920,8 @@ select option:not(:checked) {
2849	color: var(--active) !important;	2920	color: var(--active) !important;
2850	}	2921	}
2851		2922
2852	#instruct_enabled_label .menu_button:not(.toggleEnabled),	2923	.menu_button.togglable:not(.toggleEnabled) {
2853	#sysprompt_enabled_label .menu_button:not(.toggleEnabled) {	2924	color: red;
2854	color: Red;
2855	}	2925	}
2856		2926
2857	.displayBlock {	2927	.displayBlock {

 .mes_block .ch_name {
     max-width: 100%;
     min-height: 22px;
+    align-items: flex-start;
+}
 /*applies to both groups and solos chars in the char list*/

     transition: 0.3s ease-in-out;
+}
-.mes_edit_buttons .menu_button {
+.mes_reasoning_actions {
+    margin: 0;
+    margin-top: 0.5em;
+}
+.mes_edit_buttons .menu_button,
+.mes_reasoning_actions .edit_button {
     opacity: 0.5;
     padding: 0px;
     font-size: 1rem;

     align-items: center;
+}
+.mes_reasoning_actions .edit_button {
+    margin-bottom: 0.5em;
+    opacity: 1;
+    filter: brightness(0.7);
+}
 .mes_reasoning_edit_cancel,
 .mes_edit_cancel.menu_button {
     background-color: var(--crimson70a);

     field-sizing: content;
+}
+body[data-generating="true"] #send_but,
+body[data-generating="true"] #mes_continue,
+body[data-generating="true"] #mes_impersonate,
+body[data-generating="true"] #chat .last_mes .mes_buttons,
+body[data-generating="true"] #chat .last_mes .mes_reasoning_actions {
+    display: none;
+}
 #anchor_order {
     margin-bottom: 15px;
+}

     opacity: 1;
+}
-.typing_indicator {
-    position: sticky;
-    bottom: 10px;
-    margin: 10px;
-    opacity: 0.85;
-    text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor);
-    order: 9999;
-}
-.typing_indicator:after {
-    display: inline-block;
-    vertical-align: bottom;
-    animation: ellipsis steps(4, end) 1500ms infinite;
-    content: "";
-    width: 0px;
-}
 #group_avatar_preview .missing-avatar {
     display: inline;
     vertical-align: middle;

@@ -5758,11 +5832,13 @@ body:not(.movingUI) .drawer-content.maximized {
5758	overflow-wrap: anywhere;	5832	overflow-wrap: anywhere;
5759	}	5833	}
5760		5834
		5835	#SystemPromptColumn summary,
5761	#InstructSequencesColumn summary {	5836	#InstructSequencesColumn summary {
5762	font-size: 0.95em;	5837	font-size: 0.95em;
5763	cursor: pointer;	5838	cursor: pointer;
5764	}	5839	}
5765		5840
		5841	#SystemPromptColumn details,
5766	#InstructSequencesColumn details:not(:last-of-type) {	5842	#InstructSequencesColumn details:not(:last-of-type) {
5767	margin-bottom: 5px;	5843	margin-bottom: 5px;
5768	}	5844	}

     flex: 1;
+}
+.oneline-dropdown label {
+    margin-top: 3px;
+    margin-bottom: 5px;
+    flex-grow: 1;
+    text-align: left;
+}
+.oneline-dropdown select {
+    min-width: fit-content;
+    width: 40%;
+}
 .multiline {
     white-space: pre-wrap;
+}

server.js+133 -18 Viewed

 import fs from 'node:fs';
 import http from 'node:http';
 import https from 'node:https';
+import os from 'os';
 import path from 'node:path';
 import util from 'node:util';
 import net from 'node:net';

 // net related library imports
 import fetch from 'node-fetch';
+import ipRegex from 'ip-regex';
 // Unrestrict console logs display limit
 util.inspect.defaultOptions.maxArrayLength = null;

 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';
 import {
     getVersion,
     getConfigValue,

     forwardFetchResponse,
     removeColorFormatting,
     getSeparator,
+    stringToBool,
+    urlHostnameToIPv6,
+    canResolve,
     safeReadFileSync,
+    setupLogLevel,
 } from './src/util.js';
 import { UPLOADS_DIRECTORY } from './src/constants.js';
 import { ensureThumbnailCache } from './src/endpoints/thumbnails.js';

 const DEFAULT_PORT = 8000;
 const DEFAULT_AUTORUN = false;
 const DEFAULT_LISTEN = false;
+const DEFAULT_LISTEN_ADDRESS_IPV6 = '[::]';
+const DEFAULT_LISTEN_ADDRESS_IPV4 = '0.0.0.0';
 const DEFAULT_CORS_PROXY = false;
 const DEFAULT_WHITELIST = true;
 const DEFAULT_ACCOUNTS = false;

 const cliArguments = yargs(hideBin(process.argv))
     .usage('Usage: <your-start-script> <command> [options]')
     .option('enableIPv6', {
-        type: 'boolean',
+        type: 'string',
         default: null,
         describe: `Enables IPv6.\n[config default: ${DEFAULT_ENABLE_IPV6}]`,
     }).option('enableIPv4', {
-        type: 'boolean',
+        type: 'string',
         default: null,
         describe: `Enables IPv4.\n[config default: ${DEFAULT_ENABLE_IPV4}]`,
     }).option('port', {

         type: 'boolean',
         default: null,
         describe: `SillyTavern is listening on all network interfaces (Wi-Fi, LAN, localhost). If false, will limit it only to internal localhost (127.0.0.1).\nIf not provided falls back to yaml config 'listen'.\n[config default: ${DEFAULT_LISTEN}]`,
+    }).option('listenAddressIPv6', {
+        type: 'string',
+        default: null,
+        describe: 'Set SillyTavern to listen to a specific IPv6 address. If not set, it will fallback to listen to all.\n[config default: [::] ]',
+    }).option('listenAddressIPv4', {
+        type: 'string',
+        default: null,
+        describe: 'Set SillyTavern to listen to a specific IPv4 address. If not set, it will fallback to listen to all.\n[config default: 0.0.0.0 ]',
     }).option('corsProxy', {
         type: 'boolean',
         default: null,

         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(compression());
 app.use(responseTime());
+/** @type {number} */
 const server_port = cliArguments.port ?? process.env.SILLY_TAVERN_PORT ?? getConfigValue('port', DEFAULT_PORT);
+/** @type {boolean} */
 const autorun = (cliArguments.autorun ?? getConfigValue('autorun', DEFAULT_AUTORUN)) && !cliArguments.ssl;
+/** @type {boolean} */
 const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN);
+/** @type {string} */
+const listenAddressIPv6 = cliArguments.listenAddressIPv6 ?? getConfigValue('listenAddress.ipv6', DEFAULT_LISTEN_ADDRESS_IPV6);
+/** @type {string} */
+const listenAddressIPv4 = cliArguments.listenAddressIPv4 ?? getConfigValue('listenAddress.ipv4', DEFAULT_LISTEN_ADDRESS_IPV4);
+/** @type {boolean} */
 const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY);
 const enableWhitelist = cliArguments.whitelist ?? getConfigValue('whitelistMode', DEFAULT_WHITELIST);
+/** @type {string} */
 const dataRoot = cliArguments.dataRoot ?? getConfigValue('dataRoot', './data');
+/** @type {boolean} */
 const disableCsrf = cliArguments.disableCsrf ?? getConfigValue('disableCsrfProtection', DEFAULT_CSRF_DISABLED);
 const basicAuthMode = cliArguments.basicAuthMode ?? getConfigValue('basicAuthMode', DEFAULT_BASIC_AUTH);
 const perUserBasicAuth = getConfigValue('perUserBasicAuth', DEFAULT_PER_USER_BASIC_AUTH);
+/** @type {boolean} */
 const enableAccounts = getConfigValue('enableUserAccounts', DEFAULT_ACCOUNTS);
 const uploadsPath = path.join(dataRoot, UPLOADS_DIRECTORY);
-const enableIPv6 = cliArguments.enableIPv6 ?? getConfigValue('protocol.ipv6', DEFAULT_ENABLE_IPV6);
-const enableIPv4 = cliArguments.enableIPv4 ?? getConfigValue('protocol.ipv4', DEFAULT_ENABLE_IPV4);
+/** @type {boolean | "auto"} */
+let enableIPv6 = stringToBool(cliArguments.enableIPv6) ?? getConfigValue('protocol.ipv6', DEFAULT_ENABLE_IPV6);
+/** @type {boolean | "auto"} */
+let enableIPv4 = stringToBool(cliArguments.enableIPv4) ?? getConfigValue('protocol.ipv4', DEFAULT_ENABLE_IPV4);
+/** @type {string} */
 const autorunHostname = cliArguments.autorunHostname ?? getConfigValue('autorunHostname', DEFAULT_AUTORUN_HOSTNAME);
+/** @type {number} */
 const autorunPortOverride = cliArguments.autorunPortOverride ?? getConfigValue('autorunPortOverride', DEFAULT_AUTORUN_PORT);
+/** @type {boolean} */
 const dnsPreferIPv6 = cliArguments.dnsPreferIPv6 ?? getConfigValue('dnsPreferIPv6', DEFAULT_PREFER_IPV6);
+/** @type {boolean} */
 const avoidLocalhost = cliArguments.avoidLocalhost ?? getConfigValue('avoidLocalhost', DEFAULT_AVOID_LOCALHOST);
 const proxyEnabled = cliArguments.requestProxyEnabled ?? getConfigValue('requestProxy.enabled', DEFAULT_PROXY_ENABLED);

     console.log('Preferring IPv4 for DNS resolution');
+}
-if (!enableIPv6 && !enableIPv4) {
+const ipOptions = [true, 'auto', false];
+if (!ipOptions.includes(enableIPv6)) {
+    console.warn(color.red('`protocol: ipv6` option invalid'), '\n use:', ipOptions, '\n setting to:', DEFAULT_ENABLE_IPV6);
+    enableIPv6 = DEFAULT_ENABLE_IPV6;
+}
+if (!ipOptions.includes(enableIPv4)) {
+    console.warn(color.red('`protocol: ipv4` option invalid'), '\n use:', ipOptions, '\n setting to:', DEFAULT_ENABLE_IPV4);
+    enableIPv4 = DEFAULT_ENABLE_IPV4;
+}
+if (enableIPv6 === false && enableIPv4 === false) {
     console.error('error: You can\'t disable all internet protocols: at least IPv6 or IPv4 must be enabled.');
     process.exit(1);
+}

 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({

     return undefined;
+}
+/**
+ * Checks the network interfaces to determine the presence of IPv6 and IPv4 addresses.
+ *
+ * @returns {Promise<[boolean, boolean, boolean, boolean]>} A promise that resolves to an array containing:
+ * - [0]: `hasIPv6` (boolean) - Whether the computer has any IPv6 address, including (`::1`).
+ * - [1]: `hasIPv4` (boolean) - Whether the computer has any IPv4 address, including (`127.0.0.1`).
+ * - [2]: `hasIPv6Local` (boolean) - Whether the computer has local IPv6 address (`::1`).
+ * - [3]: `hasIPv4Local` (boolean) - Whether the computer has local IPv4 address (`127.0.0.1`).
+ */
+async function getHasIP() {
+    let hasIPv6 = false;
+    let hasIPv6Local = false;
+    let hasIPv4 = false;
+    let hasIPv4Local = false;
+    const interfaces = os.networkInterfaces();
+    for (const iface of Object.values(interfaces)) {
+        if (iface === undefined) {
+            continue;
+        }
+        for (const info of iface) {
+            if (info.family === 'IPv6') {
+                hasIPv6 = true;
+                if (info.address === '::1') {
+                    hasIPv6Local = true;
+                }
+            }
+            if (info.family === 'IPv4') {
+                hasIPv4 = true;
+                if (info.address === '127.0.0.1') {
+                    hasIPv4Local = true;
+                }
+            }
+            if (hasIPv6 && hasIPv4 && hasIPv6Local && hasIPv4Local) break;
+        }
+        if (hasIPv6 && hasIPv4 && hasIPv6Local && hasIPv4Local) break;
+    }
+    return [
+        hasIPv6,
+        hasIPv4,
+        hasIPv6Local,
+        hasIPv4Local,
+    ];
+}
 app.use(cookieSession({
     name: getCookieSessionName(),
     sameSite: 'strict',

 // Static files
 // Host index page
-app.get('/', (request, response) => {
+app.get('/', getCacheBusterMiddleware(), (request, response) => {
     if (shouldRedirectToLogin(request)) {
         const query = request.url.split('?')[1];
         const redirectUrl = query ? `/login?${query}` : '/login';

 // 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'));

 const tavernUrlV6 = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
-    (listen ? '[::]' : '[::1]') +
+    (listen ? (ipRegex.v6({ exact: true }).test(listenAddressIPv6) ? listenAddressIPv6 : '[::]') : '[::1]') +
     (':' + server_port),
 );
 const tavernUrl = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
-    (listen ? '0.0.0.0' : '127.0.0.1') +
+    (listen ? (ipRegex.v4({ exact: true }).test(listenAddressIPv4) ? listenAddressIPv4 : '0.0.0.0') : '127.0.0.1') +
     (':' + server_port),
 );

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

 /**
  * Gets the hostname to use for autorun in the browser.
- * @returns {string} The hostname to use for autorun
+ * @param {boolean} useIPv6 If use IPv6
+ * @param {boolean} useIPv4 If use IPv4
+ * @returns Promise<string> The hostname to use for autorun
  */
-function getAutorunHostname() {
+async function getAutorunHostname(useIPv6, useIPv4) {
     if (autorunHostname === 'auto') {
-        if (enableIPv6 && enableIPv4) {
+        let localhostResolve = await canResolve('localhost', useIPv6, useIPv4);
-            if (avoidLocalhost) return '[::1]';
-            return 'localhost';
+        if (useIPv6 && useIPv4) {
+            return (avoidLocalhost || !localhostResolve) ? '[::1]' : 'localhost';
+        }
-        if (enableIPv6) {
+        if (useIPv6) {

src/constants.js+0 -0 Viewed

src/endpoints/anthropic.js+0 -0 Viewed

src/endpoints/assets.js+0 -0 Viewed

src/endpoints/azure.js+0 -0 Viewed

src/endpoints/backends/chat-completions.js+0 -0 Viewed

src/endpoints/backends/kobold.js+0 -0 Viewed

src/endpoints/backends/scale-alt.js+0 -0 Viewed

src/endpoints/backends/text-completions.js+0 -0 Viewed

src/endpoints/backgrounds.js+0 -0 Viewed

src/endpoints/caption.js+0 -0 Viewed

src/endpoints/characters.js+0 -0 Viewed

src/endpoints/chats.js+0 -0 Viewed

src/endpoints/classify.js+0 -0 Viewed

src/endpoints/content-manager.js+0 -0 Viewed

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

src/endpoints/files.js+0 -0 Viewed

src/endpoints/google.js+0 -0 Viewed

src/endpoints/groups.js+0 -0 Viewed

src/endpoints/horde.js+0 -0 Viewed

src/endpoints/images.js+0 -0 Viewed

src/endpoints/novelai.js+0 -0 Viewed

src/endpoints/openai.js+0 -0 Viewed

src/endpoints/openrouter.js+0 -0 Viewed

src/endpoints/presets.js+0 -0 Viewed

src/endpoints/search.js+0 -0 Viewed

src/endpoints/secrets.js+0 -0 Viewed

src/endpoints/settings.js+0 -0 Viewed

src/endpoints/speech.js+0 -0 Viewed

src/endpoints/sprites.js+0 -0 Viewed

src/endpoints/stable-diffusion.js+0 -0 Viewed

src/endpoints/stats.js+0 -0 Viewed

src/endpoints/thumbnails.js+0 -0 Viewed

src/endpoints/tokenizers.js+0 -0 Viewed

src/endpoints/translate.js+0 -0 Viewed

src/endpoints/users-admin.js+0 -0 Viewed

src/endpoints/users-private.js+0 -0 Viewed

src/endpoints/users-public.js+0 -0 Viewed

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

src/endpoints/worldinfo.js+0 -0 Viewed

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

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

src/middleware/cacheBuster.js+0 -0 Viewed

src/middleware/webpack-serve.js+0 -0 Viewed

src/middleware/whitelist.js+0 -0 Viewed

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

src/prompt-converters.js+0 -0 Viewed

src/request-proxy.js+0 -0 Viewed

src/users.js+0 -0 Viewed

src/util.js+0 -0 Viewed

src/vectors/cohere-vectors.js+0 -0 Viewed

src/vectors/extras-vectors.js+0 -0 Viewed

src/vectors/makersuite-vectors.js+0 -0 Viewed

src/vectors/nomicai-vectors.js+0 -0 Viewed

src/vectors/openai-vectors.js+0 -0 Viewed

webpack.config.js+0 -0 Viewed

Merge branch 'staging' into persona-improvements