Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging

public/index.html

@@ -4121,7 +4121,7 @@
                         <div class="floating_prompt_radio_group">
                             <label>
                                 <input type="radio" name="extension_floating_position" value="0" />
-                                After scenario
+                                After Main Prompt / Story String
                             </label>
                             <label>
                                 <input type="radio" name="extension_floating_position" value="1" />
@@ -4189,7 +4189,7 @@
                         <div class="floating_prompt_radio_group">
                             <label>
                                 <input type="radio" name="extension_default_position" value="0" />
-                                After scenario
+                                After Main Prompt / Story String
                             </label>
                             <label>
                                 <input type="radio" name="extension_default_position" value="1" />

public/script.js

@@ -373,6 +373,9 @@ const system_message_types = {
 };
 
 const extension_prompt_types = {
+    /**
+     * @deprecated Outdated term. In reality it's "after main prompt or story string"
+     */
     AFTER_SCENARIO: 0,
     IN_CHAT: 1
 };
@@ -2257,8 +2260,8 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
         return;
     }
 
-    // Hide swipes on either multigen or real streaming
-    if ((isStreamingEnabled() || isMultigenEnabled()) && !dryRun) {
+    // Hide swipes if not in a dry run.
+    if (!dryRun) {
         hideSwipeButtons();
     }
 

public/scripts/extensions/memory/index.js

@@ -567,7 +567,7 @@ jQuery(function () {
                     <div class="radio_group">
                         <label>
                             <input type="radio" name="memory_position" value="0" />
-                            After scenario
+                            After Main Prompt / Story String
                         </label>
                         <label>
                             <input type="radio" name="memory_position" value="1" />

public/scripts/openai.js

@@ -683,9 +683,9 @@ function preparePromptsForChatCompletion({Scenario, charPersonality, name2, worl
 
     // Tavern Extras - Summary
     const summary = extensionPrompts['1_memory'];
-    if (summary && summary.content) systemPrompts.push({
+    if (summary && summary.value) systemPrompts.push({
         role: 'system',
-        content: summary.content,
+        content: summary.value,
         identifier: 'summary'
     });
 

public/style.css

@@ -916,12 +916,22 @@ select {
     white-space: nowrap;
 }
 
+@media screen and (max-width: 1000px) {
+    #form_create textarea {
+        flex-grow: 1;
+    }
+}
 
+@media screen and (min-width: 1001px) {
+    #description_textarea {
+        height: 33vh;
+        height: 33svh;
+    }
 
-#description_textarea,
-#firstmessage_textarea {
-    height: -webkit-fill-available;
-    width: -moz-available;
+    #firstmessage_textarea {
+        resize: none;
+        flex: 1;
+    }
 }
 
 #character_name_pole {
@@ -1550,10 +1560,6 @@ input[type=search]:focus::-webkit-search-cancel-button {
     overflow-y: auto;
 }
 
-#form_create textarea {
-    flex-grow: 1;
-}
-
 .avatar_div {
     display: flex;
     width: 100%;
@@ -3520,4 +3526,4 @@ a {
     z-index: 10;
     margin-left: 10px;
     /* Give some space between the button and search box */
-}
+}