Merge branch 'dev' into dev

public/scripts/RossAscends-mods.js

@@ -260,16 +260,23 @@ export function RA_CountCharTokens() {
                 (power_user.pin_examples ? characters[this_chid].mes_example : ''),
             ].join('\n').replace(/\r/gm, '').trim();
             perm_tokens = getTokenCount(perm_string);
-        } else { console.debug("RA_TC -- no valid char found, closing."); }                // if neither, probably safety char or some error in loading
+            // if neither, probably safety char or some error in loading
+        } else { console.debug("RA_TC -- no valid char found, closing."); }
     }
     // display the counted tokens
     if (count_tokens < 1024 && perm_tokens < 1024) {
-        $("#result_info").html(count_tokens + " Tokens (" + perm_tokens + " Permanent)");      //display normal if both counts are under 1024
+        //display normal if both counts are under 1024
+        $("#result_info").html(`<small>${count_tokens} Tokens (${perm_tokens} Permanent)</small>`);
     } else {
         $("#result_info").html(`
-        <span class="neutral_warning">${count_tokens}</span>&nbsp;Tokens (<span class="neutral_warning">${perm_tokens}</span><span>&nbsp;Permanent Tokens)
-        <br>
-        <div id="chartokenwarning" class="menu_button whitespacenowrap"><a href="https://docs.sillytavern.app/usage/guidebook/#character-tokens" target="_blank">Learn More About Token 'Limits'</a></div>`);
+        <div class="flex-container flexFlowColumn alignitemscenter">
+            <div class="flex-container flexnowrap flexNoGap">
+                <small class="flex-container flexnowrap flexNoGap">
+                    <div class="neutral_warning">${count_tokens}</div>&nbsp;Tokens (<div class="neutral_warning">${perm_tokens}</div><div>&nbsp;Permanent)</div>
+                </small>
+            </div>
+            <div id="chartokenwarning" class="menu_button whitespacenowrap"><a href="https://docs.sillytavern.app/usage/core-concepts/characterdesign/#character-tokens" target="_blank">About Token 'Limits'</a></div>
+        </div>`);
     } //warn if either are over 1024
 }
 //Auto Load Last Charcter -- (fires when active_character is defined and auto_load_chat is true)

public/scripts/extensions.js

@@ -1,4 +1,4 @@
-import { callPopup, eventSource, event_types, extension_prompt_types, saveSettings, saveSettingsDebounced } from "../script.js";
+import { callPopup, eventSource, event_types, saveSettings, saveSettingsDebounced } from "../script.js";
 import { isSubsetOf, debounce } from "./utils.js";
 export {
     getContext,
@@ -69,6 +69,20 @@ const getContext = () => window['SillyTavern'].getContext();
 const getApiUrl = () => extension_settings.apiUrl;
 let connectedToApi = false;
 
+function showHideExtensionsMenu() {
+    const hasMenuItems = $('#extensionsMenu').children().length > 0;
+
+    // We have menu items, so we can stop checking
+    if (hasMenuItems) {
+        clearInterval(menuInterval);
+    }
+
+    $('#extensionsMenuButton').toggle(hasMenuItems);
+}
+
+// Periodically check for new extensions
+const menuInterval = setInterval(showHideExtensionsMenu, 1000);
+
 async function doExtrasFetch(endpoint, args) {
     if (!args) {
         args = {}
@@ -219,7 +233,7 @@ function autoConnectInputHandler() {
 
 function addExtensionsButtonAndMenu() {
     const buttonHTML =
-        `<div id="extensionsMenuButton" class="fa-solid fa-magic-wand-sparkles" title="Extras Extensions" /></div>`;
+        `<div id="extensionsMenuButton" style="display: none;" class="fa-solid fa-magic-wand-sparkles" title="Extras Extensions" /></div>`;
     const extensionsMenuHTML = `<div id="extensionsMenu" class="options-content" style="display: none;"></div>`;
 
     $(document.body).append(extensionsMenuHTML);

public/scripts/extensions/backgrounds/index.js

@@ -166,5 +166,5 @@ $(document).ready(function () {
     setInterval(moduleWorker, UPDATE_INTERVAL);
     registerSlashCommand('lock', onLockBackgroundClick, [], " – locks a background for the currently selected chat", true, true);
     registerSlashCommand('unlock', onUnlockBackgroundClick, [], ' – unlocks a background for the currently selected chat', true, true);
-    registerSlashCommand('autobg', autoBackgroundCommand, ['bgauto'], ' – automatically changes the background based on the chat context', true, true);
+    registerSlashCommand('autobg', autoBackgroundCommand, ['bgauto'], ' – automatically changes the background based on the chat context using the AI request prompt', true, true);
 });

public/scripts/extensions/dice/index.js

@@ -59,7 +59,7 @@ function addDiceRollButton() {
     button.hide();
 
     let popper = Popper.createPopper(button.get(0), dropdown.get(0), {
-        placement: 'bottom',
+        placement: 'top',
     });
 
     $(document).on('click touchend', function (e) {
@@ -68,10 +68,10 @@ function addDiceRollButton() {
         if (target.is(button) && !dropdown.is(":visible")) {
             e.preventDefault();
 
-            dropdown.show(200);
+            dropdown.fadeIn(250);
             popper.update();
         } else {
-            dropdown.hide(200);
+            dropdown.fadeOut(250);
         }
     });
 }

public/scripts/extensions/floating-prompt/index.js

@@ -1,4 +1,11 @@
-import { chat_metadata, saveSettingsDebounced, this_chid } from "../../../script.js";
+import {
+    chat_metadata,
+    eventSource,
+    event_types,
+    getTokenCount,
+    saveSettingsDebounced,
+    this_chid,
+} from "../../../script.js";
 import { selected_group } from "../../group-chats.js";
 import { ModuleWorkerWrapper, extension_settings, getContext, saveMetadataDebounced } from "../../extensions.js";
 import { registerSlashCommand } from "../../slash-commands.js";
@@ -66,6 +73,7 @@ function setNotePositionCommand(_, text) {
 
 async function onExtensionFloatingPromptInput() {
     chat_metadata[metadata_keys.prompt] = $(this).val();
+    $('#extension_floating_prompt_token_counter').text(getTokenCount(chat_metadata[metadata_keys.prompt]));
     saveMetadataDebounced();
 }
 
@@ -93,6 +101,7 @@ async function onExtensionFloatingPositionInput(e) {
 
 function onExtensionFloatingDefaultInput() {
     extension_settings.note.default = $(this).val();
+    $('#extension_floating_default_token_counter').text(getTokenCount(extension_settings.note.default));
     saveSettingsDebounced();
 }
 
@@ -173,6 +182,13 @@ function onANMenuItemClick() {
     }
 }
 
+function onChatChanged() {
+    const tokenCounter1 = chat_metadata[metadata_keys.prompt] ? getTokenCount(chat_metadata[metadata_keys.prompt]) : 0;
+    const tokenCounter2 = extension_settings.note.default ? getTokenCount(extension_settings.note.default) : 0;
+    $('#extension_floating_prompt_token_counter').text(tokenCounter1);
+    $('#extension_floating_default_token_counter').text(tokenCounter2);
+}
+
 (function () {
     function addExtensionsSettings() {
         const settingsHtml = `
@@ -195,6 +211,7 @@ function onANMenuItemClick() {
                     </small>
 
                     <textarea id="extension_floating_prompt" class="text_pole" rows="8" maxlength="10000"></textarea>
+                    <div class="extension_token_counter">Tokens: <span id="extension_floating_prompt_token_counter">0</small></div>
 
                     <div class="floating_prompt_radio_group">
                         <label>
@@ -228,6 +245,7 @@ function onANMenuItemClick() {
 
                         <textarea id="extension_floating_default" class="text_pole" rows="8" maxlength="10000"
                         placeholder="Example:\n[Scenario: wacky adventures; Genre: romantic comedy; Style: verbose, creative]"></textarea>
+                        <div class="extension_token_counter">Tokens: <span id="extension_floating_default_token_counter">0</small></div>
                     </div>
                 </div>
             </div>
@@ -265,4 +283,5 @@ function onANMenuItemClick() {
     registerSlashCommand('depth', setNoteDepthCommand, [], "<span class='monospace'>(number)</span> – sets an author's note depth for in-chat positioning", true, true);
     registerSlashCommand('freq', setNoteIntervalCommand, ['interval'], "<span class='monospace'>(number)</span> – sets an author's note insertion frequency", true, true);
     registerSlashCommand('pos', setNotePositionCommand, ['position'], "(<span class='monospace'>chat</span> or <span class='monospace'>scenario</span>) – sets an author's note position", true, true);
+    eventSource.on(event_types.CHAT_CHANGED, onChatChanged);
 })();

public/scripts/extensions/floating-prompt/style.css

@@ -1,61 +1,67 @@
-#floatingPrompt {
-    overflow-y: auto;
-    max-width: 90svw;
-    max-height: 90svh;
-    min-width: 100px;
-    min-height: 100px;
-    border-radius: 10px;
-    border: 1px solid var(--white30a);
-    position: fixed;
-    padding: 10px;
-    padding-top: 25px;
-    display: none;
-    flex-direction: column;
-    box-shadow: 0 0 10px var(--black70a);
-    z-index: 3000;
-    left: 0;
-    top: 0;
-    margin: 0;
-    right: unset;
-    width: calc(((100svw - var(--sheldWidth)) / 2) - 1px);
-
-}
-
-.floating_prompt_radio_group {
-    display: flex;
-    flex-direction: column;
-}
-
-#extension_floating_counter {
-    font-weight: 600;
-    color: orange;
-}
-
-.floating_prompt_settings textarea {
-    font-size: calc(var(--mainFontSize) * 0.9);
-    line-height: 1.2;
-}
-
-#ANClose {
-    height: 15px;
-    aspect-ratio: 1 / 1;
-    font-size: 20px;
-    opacity: 0.5;
-    transition: all 250ms;
-}
-
-#ANClose:hover {
-    cursor: pointer;
-    opacity: 1;
-}
-
-.panelControlBar {
-    position: absolute;
-    right: 5px;
-    top: 5px;
-    margin-right: 5px;
-}
-
-#floatingPrompt .drag-grabber {
-    position: unset;
-}
+#floatingPrompt {
+    overflow-y: auto;
+    max-width: 90svw;
+    max-height: 90svh;
+    min-width: 100px;
+    min-height: 100px;
+    border-radius: 10px;
+    border: 1px solid var(--white30a);
+    position: fixed;
+    padding: 10px;
+    padding-top: 25px;
+    display: none;
+    flex-direction: column;
+    box-shadow: 0 0 10px var(--black70a);
+    z-index: 3000;
+    left: 0;
+    top: 0;
+    margin: 0;
+    right: unset;
+    width: calc(((100svw - var(--sheldWidth)) / 2) - 1px);
+
+}
+
+.floating_prompt_radio_group {
+    display: flex;
+    flex-direction: column;
+}
+
+#extension_floating_counter {
+    font-weight: 600;
+    color: orange;
+}
+
+.extension_token_counter {
+    font-size: calc(var(--mainFontSize) * 0.9);
+    width: 100%;
+    text-align: right;
+}
+
+.floating_prompt_settings textarea {
+    font-size: calc(var(--mainFontSize) * 0.9);
+    line-height: 1.2;
+}
+
+#ANClose {
+    height: 15px;
+    aspect-ratio: 1 / 1;
+    font-size: 20px;
+    opacity: 0.5;
+    transition: all 250ms;
+}
+
+#ANClose:hover {
+    cursor: pointer;
+    opacity: 1;
+}
+
+.panelControlBar {
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    margin-right: 5px;
+}
+
+#floatingPrompt .drag-grabber {
+    position: unset;
+}

public/scripts/group-chats.js

@@ -547,7 +547,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
                 }
 
                 // if not swipe - check if message generated already
-                if (type !== "swipe" && !isMultigenEnabled() && chat.length == messagesBefore) {
+                if (generateType === "group_chat" && !isMultigenEnabled() && chat.length == messagesBefore) {
                     await delay(100);
                 }
                 // if swipe - see if message changed
@@ -1418,6 +1418,14 @@ function onGroupScenarioRemoveClick() {
     $(this).closest('.group_scenario').find('.group_chat_scenario').val('').trigger('input');
 }
 
+function onSendTextareaInput() {
+    if (is_group_automode_enabled) {
+        // Wait for current automode generation to finish
+        is_group_automode_enabled = false;
+        $("#rm_group_automode").prop("checked", false);
+    }
+}
+
 function stopAutoModeGeneration() {
     if (groupAutoModeAbortController) {
         groupAutoModeAbortController.abort();
@@ -1440,4 +1448,5 @@ jQuery(() => {
         is_group_automode_enabled = value;
         eventSource.once(event_types.GENERATION_STOPPED, stopAutoModeGeneration);
     });
+    $("#send_textarea").on("keyup", onSendTextareaInput);
 });

public/scripts/poe.js

@@ -44,7 +44,7 @@ If you have any objections to these requirements, please mention them specifical
 
 If you accept the requirements, please confirm this by replying with "${DEFAULT_JAILBREAK_RESPONSE}", and nothing more. Upon receiving your accurate confirmation message, I will specify the context of the scene and {{char}}'s characteristics, background, and personality in the next message.`;
 
-const DEFAULT_CHARACTER_NUDGE_MESSAGE = "[Unless otherwise stated by {{user}}, your the next response shall only be written from the point of view of {{char}}. Do not seek approval of your writing style at the end of the response.]";
+const DEFAULT_CHARACTER_NUDGE_MESSAGE = "[Unless otherwise stated by {{user}}, your the next response shall only be written from the point of view of {{char}}. Do not seek approval of your writing style at the end of the response. Don't reply with <ACK>.]";
 const DEFAULT_IMPERSONATION_PROMPT = "[Write 1 reply only in internet RP style from the point of view of {{user}}, using the chat history so far as a guideline for the writing style of {{user}}. Don't write as {{char}} or system.]";
 
 const poe_settings = {
@@ -265,7 +265,7 @@ async function generatePoe(type, finalPrompt, signal) {
     const isQuiet = type === 'quiet';
     let reply = '';
 
-    if (max_context > POE_TOKEN_LENGTH) {
+    if (max_context > POE_TOKEN_LENGTH && poe_settings.bot !== 'a2_100k') {
         console.debug('Prompt is too long, sending in chunks');
         const result = await sendChunkedMessage(finalPrompt, !isQuiet, signal)
         reply = result.reply;

public/scripts/power-user.js

@@ -146,6 +146,7 @@ let power_user = {
     },
 
     personas: {},
+    default_persona: null,
 };
 
 let themes = [];

public/scripts/slash-commands.js

@@ -98,7 +98,7 @@ const getSlashCommandsHelp = parser.getHelpString.bind(parser);
 parser.addCommand('help', helpCommandCallback, ['?'], ' – displays this help message', true, true);
 parser.addCommand('name', setNameCallback, ['persona'], '<span class="monospace">(name)</span> – sets user name and persona avatar (if set)', true, true);
 parser.addCommand('sync', syncCallback, [], ' – syncs user name in user-attributed messages in the current chat', true, true);
-parser.addCommand('bind', bindCallback, [], ' – binds/unbinds a persona (name and avatar) to the current chat', true, true);
+parser.addCommand('lock', bindCallback, ['bind'], ' – locks/unlocks a persona (name and avatar) to the current chat', true, true);
 parser.addCommand('bg', setBackgroundCallback, ['background'], '<span class="monospace">(filename)</span> – sets a background according to filename, partial names allowed, will set the first one alphabetically if multiple files begin with the provided argument string', false, true);
 parser.addCommand('sendas', sendMessageAs, [], ` – sends message as a specific character.<br>Example:<br><pre><code>/sendas Chloe\nHello, guys!</code></pre>will send "Hello, guys!" from "Chloe".<br>Uses character avatar if it exists in the characters list.`, true, true);
 parser.addCommand('sys', sendNarratorMessage, [], '<span class="monospace">(text)</span> – sends message as a system narrator', false, true);
@@ -262,6 +262,7 @@ function executeSlashCommands(text) {
             continue;
         }
 
+        console.debug('Slash command executing:', result);
         result.command.callback(result.args, result.value);
 
         if (result.command.interruptsGeneration) {