From ed77f4763a46be0ea29f80477871ca40bc9aa8db Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 15 Jan 2024 03:45:31 +0200
Subject: [PATCH 1/7] #1696 Don't cancel generation on first Escape press if
 editing a message

---
 public/script.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/script.js b/public/script.js
index 3251c47fc..01cbf2c59 100644
--- a/public/script.js
+++ b/public/script.js
@@ -9292,13 +9292,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');

From 67deef0b2916b7e992605c89665608f69dfcf996 Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Mon, 15 Jan 2024 16:19:47 +0900
Subject: [PATCH 2/7] add BOS and temp last back to tabby (eos was already
 there)

---
 public/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7cb4f79da..cc468feae 100644
--- a/public/index.html
+++ b/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>

From ad40e703468da03fc40736dcf9dbe6cddd1b80ab Mon Sep 17 00:00:00 2001
From: Hirose <86906598+HiroseKoichi@users.noreply.github.com>
Date: Mon, 15 Jan 2024 10:36:00 -0600
Subject: [PATCH 3/7] Update start.sh

Update the bash script so that non-standard distros, such as Nixos, will be able to run the file without editing it. This does not affect current behavior; it just makes it so other distros will work OOTB.
---
 start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index 719bb6265..a88bc42de 100755
--- a/start.sh
+++ b/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if ! command -v npm &> /dev/null
 then

From e4d5eac6cf2ca86a0b2c47f20fc095f9df512298 Mon Sep 17 00:00:00 2001
From: maver <kentucky@posteo.de>
Date: Mon, 15 Jan 2024 17:45:50 +0100
Subject: [PATCH 4/7] Add world info to generate_before_combine_prompts event
 data

---
 public/script.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/script.js b/public/script.js
index 01cbf2c59..571b95d2f 100644
--- a/public/script.js
+++ b/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,

From 25a695c78395a43881eaab6198f1231ae6f8ae2e Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 15 Jan 2024 19:30:14 +0200
Subject: [PATCH 5/7] Await QR auto-execution

---
 public/scripts/extensions/quick-reply/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/scripts/extensions/quick-reply/index.js b/public/scripts/extensions/quick-reply/index.js
index ae9be7ac8..376fd7152 100644
--- a/public/scripts/extensions/quick-reply/index.js
+++ b/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);

From 22e605168b88aa82244e98d82cf1acd39dc273cf Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:44:07 +0200
Subject: [PATCH 6/7] Properly reset seed with neutralize samplers

---
 public/scripts/textgen-settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 08adfbcb7..7b20d9256 100644
--- a/public/scripts/textgen-settings.js
+++ b/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,

From 5cb4dbc280bd3d92e77d4a46fe7280c4ec1b8079 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:45:21 +0200
Subject: [PATCH 7/7] Trim TG types after split

---
 public/scripts/textgen-settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 7b20d9256..51b08538d 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -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();