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

public/scripts/extensions/regex/editor.html

@@ -33,7 +33,7 @@
                     <small data-i18n="Replace With">Replace With</small>
                 </label>
                 <div>
-                    <textarea 
+                    <textarea
                         class="regex_replace_string text_pole wide100p textarea_compact"
                         placeholder="Use {{match}} to include the matched text from the Find Regex"
                         rows="2"
@@ -45,7 +45,7 @@
                     <small data-i18n="Trim Out">Trim Out</small>
                 </label>
                 <div>
-                    <textarea 
+                    <textarea
                         class="regex_trim_strings text_pole wide100p textarea_compact"
                         placeholder="Globally trims any unwanted parts from a regex match before replacement. Separate each element by an enter."
                         rows="3"
@@ -86,6 +86,10 @@
                     <input type="checkbox" name="only_format_display" />
                     <span data-i18n="Only Format Display">Only Format Display</span>
                 </label>
+                <label class="checkbox flex-container" title="Chat history won't change, only the prompt as the request is sent (on generation)">
+                    <input type="checkbox" name="only_format_prompt"/>
+                    <span data-i18n="Only Format Prompt (?)">Only Format Prompt (?)</span>
+                </label>
                 <label class="checkbox flex-container">
                     <input type="checkbox" name="run_on_edit" />
                     <span data-i18n="Run On Edit">Run On Edit</span>

public/scripts/extensions/regex/engine.js

@@ -24,12 +24,12 @@ function regexFromString(input) {
     try {
         // Parse input
         var m = input.match(/(\/?)(.+)\1([a-z]*)/i);
-    
+
         // Invalid flags
         if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])) {
             return RegExp(input);
         }
-    
+
         // Create the regular expression
         return new RegExp(m[2], m[3]);
     } catch {
@@ -38,19 +38,24 @@ function regexFromString(input) {
 }
 
 // Parent function to fetch a regexed version of a raw string
-function getRegexedString(rawString, placement, { characterOverride, isMarkdown } = {}) {
+function getRegexedString(rawString, placement, { characterOverride, isMarkdown, isPrompt } = {}) {
     let finalString = rawString;
     if (extension_settings.disabledExtensions.includes("regex") || !rawString || placement === undefined) {
         return finalString;
     }
 
     extension_settings.regex.forEach((script) => {
-        if ((script.markdownOnly && !isMarkdown) || (!script.markdownOnly && isMarkdown)) {
-            return;
-        }
-
-        if (script.placement.includes(placement)) {
-            finalString = runRegexScript(script, finalString, { characterOverride });
+        if (
+            // Script applies to Markdown and input is Markdown
+            (script.markdownOnly && isMarkdown) ||
+            // 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)
+        ) {
+            if (script.placement.includes(placement)) {
+                finalString = runRegexScript(script, finalString, { characterOverride });
+            }
         }
     });
 
@@ -91,7 +96,7 @@ function runRegexScript(regexScript, rawString, { characterOverride } = {}) {
         const subReplaceString = substituteRegexParams(
             regexScript.replaceString,
             trimCapturedMatch ?? trimFencedMatch,
-            { 
+            {
                 characterOverride,
                 replaceStrategy: regexScript.replaceStrategy ?? regex_replace_strategy.REPLACE
             }

public/scripts/extensions/regex/index.js

@@ -113,6 +113,9 @@ async function onRegexEditorOpenClick(existingId) {
             editorHtml
                 .find(`input[name="only_format_display"]`)
                 .prop("checked", existingScript.markdownOnly ?? false);
+            editorHtml
+                .find(`input[name="only_format_prompt"]`)
+                .prop("checked", existingScript.promptOnly ?? false);
             editorHtml
                 .find(`input[name="run_on_edit"]`)
                 .prop("checked", existingScript.runOnEdit ?? false);
@@ -165,6 +168,10 @@ async function onRegexEditorOpenClick(existingId) {
                 editorHtml
                     .find(`input[name="only_format_display"]`)
                     .prop("checked"),
+            promptOnly:
+                editorHtml
+                    .find(`input[name="only_format_prompt"]`)
+                    .prop("checked"),
             runOnEdit:
                 editorHtml
                     .find(`input[name="run_on_edit"]`)
@@ -197,6 +204,7 @@ function migrateSettings() {
                 script.placement = script.placement.filter((e) => e !== regex_placement.MD_DISPLAY);
 
             script.markdownOnly = true
+            script.promptOnly = true
 
             performSave = true;
         }

public/scripts/slash-commands.js

@@ -639,21 +639,34 @@ async function sendCommentMessage(_, text) {
     await saveChatConditional();
 }
 
+/**
+ * Displays a help message from the slash command
+ * @param {any} _ Unused
+ * @param {string} type Type of help to display
+ */
 function helpCommandCallback(_, type) {
-    switch (type?.trim()) {
+    switch (type?.trim()?.toLowerCase()) {
         case 'slash':
+        case 'commands':
+        case 'slashes':
+        case 'slash commands':
         case '1':
             sendSystemMessage(system_message_types.SLASH_COMMANDS);
             break;
         case 'format':
+        case 'formatting':
+        case 'formats':
+        case 'chat formatting':
         case '2':
             sendSystemMessage(system_message_types.FORMATTING);
             break;
         case 'hotkeys':
+        case 'hotkey':
         case '3':
             sendSystemMessage(system_message_types.HOTKEYS);
             break;
         case 'macros':
+        case 'macro':
         case '4':
             sendSystemMessage(system_message_types.MACROS);
             break;

public/scripts/world-info.js

@@ -12,6 +12,8 @@ export {
     world_info,
     world_info_budget,
     world_info_depth,
+    world_info_min_activations,
+    world_info_min_activations_depth_max,
     world_info_recursive,
     world_info_overflow_alert,
     world_info_case_sensitive,
@@ -35,6 +37,9 @@ let world_info = {};
 let selected_world_info = [];
 let world_names;
 let world_info_depth = 2;
+let world_info_min_activations = 0; // if > 0, will continue seeking chat until minimum world infos are activated
+let world_info_min_activations_depth_max = 0; // used when (world_info_min_activations > 0)
+
 let world_info_budget = 25;
 let world_info_recursive = false;
 let world_info_overflow_alert = false;
@@ -55,14 +60,14 @@ const worldInfoFilter = new FilterHelper(() => updateEditor());
 const SORT_ORDER_KEY = 'world_info_sort_order';
 const METADATA_KEY = 'world_info';
 
-const InputWidthReference = $("#WIInputWidthReference");
-
 const DEFAULT_DEPTH = 4;
 
 export function getWorldInfoSettings() {
     return {
         world_info,
         world_info_depth,
+        world_info_min_activations,
+        world_info_min_activations_depth_max,
         world_info_budget,
         world_info_recursive,
         world_info_overflow_alert,
@@ -102,6 +107,10 @@ async function getWorldInfoPrompt(chat2, maxContext) {
 function setWorldInfoSettings(settings, data) {
     if (settings.world_info_depth !== undefined)
         world_info_depth = Number(settings.world_info_depth);
+    if (settings.world_info_min_activations !== undefined)
+        world_info_min_activations = Number(settings.world_info_min_activations);
+    if (settings.world_info_min_activations_depth_max !== undefined)
+        world_info_min_activations_depth_max = Number(settings.world_info_min_activations_depth_max);
     if (settings.world_info_budget !== undefined)
         world_info_budget = Number(settings.world_info_budget);
     if (settings.world_info_recursive !== undefined)
@@ -138,6 +147,12 @@ function setWorldInfoSettings(settings, data) {
     $("#world_info_depth_counter").val(world_info_depth);
     $("#world_info_depth").val(world_info_depth);
 
+    $("#world_info_min_activations_counter").val(world_info_min_activations);
+    $("#world_info_min_activations").val(world_info_min_activations);
+
+    $("#world_info_min_activations_depth_max_counter").val(world_info_min_activations_depth_max);
+    $("#world_info_min_activations_depth_max").val(world_info_min_activations_depth_max);
+
     $("#world_info_budget_counter").val(world_info_budget);
     $("#world_info_budget").val(world_info_budget);
 
@@ -367,24 +382,23 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
             <small class="flex1">
             Title/Memo
         </small>
-                <small style="width:${InputWidthReference.width() + 5 + 'px'}">
+                <small style="width: calc(3.5em + 5px)">
                     Status
                 </small>
-                <small style="width:${InputWidthReference.width() + 20 + 'px'}">
+                <small style="width: calc(3.5em + 20px)">
                     Position
                 </small>
-                <small style="width:${InputWidthReference.width() + 15 + 'px'}">
+                <small style="width: calc(3.5em + 15px)">
                     Depth
                 </small>
-                <small style="width:${InputWidthReference.width() + 15 + 'px'}">
+                <small style="width: calc(3.5em + 15px)">
                     Order
                 </small>
-                <small style="width:${InputWidthReference.width() + 15 + 'px'}">
+                <small style="width: calc(3.5em + 15px)">
                     Trigger %
                 </small>
-
             </div>`
-            const blocks = page.map(entry => getWorldEntry(name, data, entry));
+            const blocks = page.map(entry => getWorldEntry(name, data, entry)).filter(x => x);
             $("#world_popup_entries_list").append(keywordHeaders);
             $("#world_popup_entries_list").append(blocks);
         },
@@ -545,6 +559,10 @@ function deleteOriginalDataValue(data, uid) {
 }
 
 function getWorldEntry(name, data, entry) {
+    if (!data.entries[entry.uid]) {
+        return;
+    }
+
     const template = $("#entry_edit_template .world_entry").clone();
     template.data("uid", entry.uid);
     template.attr("uid", entry.uid);
@@ -819,7 +837,7 @@ function getWorldEntry(name, data, entry) {
         saveWorldInfo(name, data);
     });
     orderInput.val(entry.order).trigger("input");
-    orderInput.width(InputWidthReference.width() + 15 + 'px')
+    orderInput.css('width', 'calc(3em + 15px)');
 
     // probability
     if (entry.probability === undefined) {
@@ -840,7 +858,7 @@ function getWorldEntry(name, data, entry) {
         saveWorldInfo(name, data);
     });
     depthInput.val(entry.depth ?? DEFAULT_DEPTH).trigger("input");
-    depthInput.width(InputWidthReference.width() + 15 + 'px');
+    depthInput.css('width', 'calc(3em + 15px)');
 
     // Hide by default unless depth is specified
     if (entry.position === world_info_position.atDepth) {
@@ -868,7 +886,7 @@ function getWorldEntry(name, data, entry) {
         saveWorldInfo(name, data);
     });
     probabilityInput.val(entry.probability).trigger("input");
-    probabilityInput.width(InputWidthReference.width() + 15 + 'px')
+    probabilityInput.css('width', 'calc(3em + 15px)');
 
     // probability toggle
     if (entry.useProbability === undefined) {
@@ -1379,6 +1397,7 @@ async function checkWorldInfo(chat, maxContext) {
 
     // Combine the chat
     let textToScan = chat.slice(0, messagesToLookBack).join("");
+    let minActivationMsgIndex = messagesToLookBack; // tracks chat index to satisfy `world_info_min_activations`
 
     // Add the depth or AN if enabled
     // Put this code here since otherwise, the chat reference is modified
@@ -1402,6 +1421,7 @@ async function checkWorldInfo(chat, maxContext) {
     textToScan = transformString(textToScan);
 
     let needsToScan = true;
+    let token_budget_overflowed = false;
     let count = 0;
     let allActivatedEntries = new Set();
     let failedProbabilityChecks = new Set();
@@ -1531,6 +1551,7 @@ async function checkWorldInfo(chat, maxContext) {
                     toastr.warning(`World info budget reached after ${allActivatedEntries.size} entries.`, 'World Info');
                 }
                 needsToScan = false;
+                token_budget_overflowed = true;
                 break;
             }
 
@@ -1553,6 +1574,24 @@ async function checkWorldInfo(chat, maxContext) {
             textToScan = (currentlyActivatedText + '\n' + textToScan);
             allActivatedText = (currentlyActivatedText + '\n' + allActivatedText);
         }
+
+        // world_info_min_activations
+        if (!needsToScan && !token_budget_overflowed) {
+            if (world_info_min_activations > 0 && (allActivatedEntries.size < world_info_min_activations)) {
+                let over_max = false
+                over_max = (
+                    world_info_min_activations_depth_max > 0 &&
+                    minActivationMsgIndex > world_info_min_activations_depth_max
+                ) || (
+                    minActivationMsgIndex >= chat.length
+                )
+                if (!over_max) {
+                    needsToScan = true
+                    textToScan = transformString(chat.slice(minActivationMsgIndex, minActivationMsgIndex + 1).join(""));
+                    minActivationMsgIndex += 1
+                }
+            }
+        }
     }
 
     // Forward-sorted list of entries for joining
@@ -2027,7 +2066,7 @@ jQuery(() => {
     $("#world_editor_select").on('change', async () => {
         $("#world_info_search").val('');
         worldInfoFilter.setFilterData(FILTER_TYPES.WORLD_INFO_SEARCH, '', true);
-        const selectedIndex = $("#world_editor_select").find(":selected").val();
+        const selectedIndex = String($("#world_editor_select").find(":selected").val());
 
         if (selectedIndex === "") {
             hideWorldEditor();
@@ -2042,27 +2081,39 @@ jQuery(() => {
         eventSource.emit(event_types.WORLDINFO_SETTINGS_UPDATED);
     }
 
-    $(document).on("input", "#world_info_depth", function () {
+    $("#world_info_depth").on('input', function () {
         world_info_depth = Number($(this).val());
         $("#world_info_depth_counter").val($(this).val());
         saveSettings();
     });
 
-    $(document).on("input", "#world_info_budget", function () {
+    $("#world_info_min_activations").on('input', function () {
+        world_info_min_activations = Number($(this).val());
+        $("#world_info_min_activations_counter").val($(this).val());
+        saveSettings();
+    });
+
+    $("#world_info_min_activations_depth_max").on('input', function () {
+        world_info_min_activations_depth_max = Number($(this).val());
+        $("#world_info_min_activations_depth_max_counter").val($(this).val());
+        saveSettings();
+    });
+
+    $("#world_info_budget").on('input', function () {
         world_info_budget = Number($(this).val());
         $("#world_info_budget_counter").val($(this).val());
         saveSettings();
     });
 
-    $(document).on("input", "#world_info_recursive", function () {
+    $("#world_info_recursive").on('input', function () {
         world_info_recursive = !!$(this).prop('checked');
         saveSettings();
-    })
+    });
 
     $('#world_info_case_sensitive').on('input', function () {
         world_info_case_sensitive = !!$(this).prop('checked');
         saveSettings();
-    })
+    });
 
     $('#world_info_match_whole_words').on('input', function () {
         world_info_match_whole_words = !!$(this).prop('checked');