Merge branch 'SillyTavern:release' into release

public/index.html

@@ -1387,7 +1387,7 @@
                                                 <input type="checkbox" id="do_sample_textgenerationwebui" />
                                                 <small data-i18n="Do Sample">Do Sample</small>
                                             </label>
-                                            <label data-forAphro="False" data-tg-type="ooba" class="checkbox_label  flexGrow flexShrink" for="add_bos_token_textgenerationwebui">
+                                            <label data-forAphro="False" data-tg-type="ooba, tabby" class="checkbox_label  flexGrow flexShrink" for="add_bos_token_textgenerationwebui">
                                                 <input type="checkbox" id="add_bos_token_textgenerationwebui" />
                                                 <small data-i18n="Add BOS Token">Add BOS Token
                                                     <div class="fa-solid fa-circle-info opacity50p " data-i18n="Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative." title="Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative."></div>
@@ -1411,7 +1411,7 @@
                                                 <input type="checkbox" id="skip_special_tokens_textgenerationwebui" />
                                                 <small data-i18n="Skip Special Tokens">Skip Special Tokens</small>
                                             </label>
-                                            <label data-forAphro="False" data-tg-type="ooba, aphrodite" class="checkbox_label  flexGrow flexShrink" for="temperature_last_textgenerationwebui">
+                                            <label data-forAphro="False" data-tg-type="ooba, aphrodite, tabby" class="checkbox_label  flexGrow flexShrink" for="temperature_last_textgenerationwebui">
                                                 <input type="checkbox" id="temperature_last_textgenerationwebui" />
                                                 <small data-i18n="Temperature Last">Temperature Last
                                                     <div class="fa-solid fa-circle-info opacity50p " data-i18n="Use the temperature sampler last." title="Use the temperature sampler last."></div>

public/script.js

@@ -3464,9 +3464,13 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
             scenario,
             char: name2,
             user: name1,
+            worldInfoBefore,
+            worldInfoAfter,
             beforeScenarioAnchor,
             afterScenarioAnchor,
+            storyString,
             mesExmString,
+            mesSendString,
             finalMesSend,
             generatedPromptCache,
             main: system,
@@ -9292,13 +9296,16 @@ jQuery(async function () {
 
     $(document).keyup(function (e) {
         if (e.key === 'Escape') {
-            if (power_user.auto_save_msg_edits === false) {
+            const isEditVisible = $('#curEditTextarea').is(':visible');
+            if (isEditVisible && power_user.auto_save_msg_edits === false) {
                 closeMessageEditor();
                 $('#send_textarea').focus();
+                return;
             }
-            if (power_user.auto_save_msg_edits === true) {
+            if (isEditVisible && power_user.auto_save_msg_edits === true) {
                 $(`#chat .mes[mesid="${this_edit_mes_id}"] .mes_edit_done`).click();
                 $('#send_textarea').focus();
+                return;
             }
             if (!this_edit_mes_id && $('#mes_stop').is(':visible')) {
                 $('#mes_stop').trigger('click');

public/scripts/extensions/quick-reply/index.js

@@ -183,7 +183,7 @@ const init = async () => {
     slash.init();
     autoExec = new AutoExecuteHandler(settings);
 
-    autoExec.handleStartup();
+    await autoExec.handleStartup();
 };
 eventSource.on(event_types.APP_READY, init);
 
@@ -197,16 +197,16 @@ const onChatChanged = async (chatIdx) => {
     manager.rerender();
     buttons.refresh();
 
-    autoExec.handleChatChanged();
+    await autoExec.handleChatChanged();
 };
 eventSource.on(event_types.CHAT_CHANGED, onChatChanged);
 
 const onUserMessage = async () => {
-    autoExec.handleUser();
+    await autoExec.handleUser();
 };
 eventSource.on(event_types.USER_MESSAGE_RENDERED, onUserMessage);
 
 const onAiMessage = async () => {
-    autoExec.handleAi();
+    await autoExec.handleAi();
 };
 eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, onAiMessage);

public/scripts/textgen-settings.js

@@ -511,7 +511,7 @@ jQuery(function () {
             'rep_pen_textgenerationwebui': 1,
             'rep_pen_range_textgenerationwebui': 0,
             'dynatemp_textgenerationwebui': false,
-            'seed_textgenerationwebui': 1,
+            'seed_textgenerationwebui': -1,
             'ban_eos_token_textgenerationwebui': false,
             'do_sample_textgenerationwebui': true,
             'add_bos_token_textgenerationwebui': true,
@@ -595,7 +595,7 @@ jQuery(function () {
 
 function showTypeSpecificControls(type) {
     $('[data-tg-type]').each(function () {
-        const tgTypes = $(this).attr('data-tg-type').split(',');
+        const tgTypes = $(this).attr('data-tg-type').split(',').map(x => x.trim());
         for (const tgType of tgTypes) {
             if (tgType === type || tgType == 'all') {
                 $(this).show();

start.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if ! command -v npm &> /dev/null
 then