Merge pull request #3413 from SillyTavern/thinking-is-stylish

Thinking is stylish - if you are not cool, I don't know how to help you

public/scripts/RossAscends-mods.js

@@ -1063,12 +1063,19 @@ export function initRossMods() {
         // Ctrl+Enter for Regeneration Last Response. If editing, accept the edits instead
         if (event.ctrlKey && event.key == 'Enter') {
             const editMesDone = $('.mes_edit_done:visible');
+            const reasoningMesDone = $('.mes_reasoning_edit_done:visible');
             if (editMesDone.length > 0) {
                 console.debug('Accepting edits with Ctrl+Enter');
-                $('#send_textarea').focus();
+                $('#send_textarea').trigger('focus');
                 editMesDone.trigger('click');
                 return;
-            } else if (is_send_press == false) {
+            } else if (reasoningMesDone.length > 0) {
+                console.debug('Accepting edits with Ctrl+Enter');
+                $('#send_textarea').trigger('focus');
+                reasoningMesDone.trigger('click');
+                return;
+            }
+            else if (is_send_press == false) {
                 const skipConfirmKey = 'RegenerateWithCtrlEnter';
                 const skipConfirm = LoadLocalBool(skipConfirmKey);
                 function doRegenerate() {
@@ -1082,7 +1089,9 @@ export function initRossMods() {
                     let regenerateWithCtrlEnter = false;
                     const result = await Popup.show.confirm('Regenerate Message', 'Are you sure you want to regenerate the latest message?', {
                         customInputs: [{ id: 'regenerateWithCtrlEnter', label: 'Don\'t ask again' }],
-                        onClose: (popup) => regenerateWithCtrlEnter = popup.inputResults.get('regenerateWithCtrlEnter') ?? false,
+                        onClose: (popup) => {
+                            regenerateWithCtrlEnter = popup.inputResults.get('regenerateWithCtrlEnter') ?? false;
+                        },
                     });
                     if (!result) {
                         return;

public/scripts/power-user.js

@@ -256,6 +256,7 @@ let power_user = {
     reasoning: {
         auto_parse: false,
         add_to_prompts: false,
+        auto_expand: false,
         prefix: '<think>\n',
         suffix: '\n</think>',
         separator: '\n\n',

public/scripts/reasoning.js

@@ -22,6 +22,18 @@ function getMessageFromJquery(element) {
     return { messageId: messageId, message, messageBlock };
 }
 
+/**
+ * Toggles the auto-expand state of reasoning blocks.
+ */
+function toggleReasoningAutoExpand() {
+    const reasoningBlocks = document.querySelectorAll('details.mes_reasoning_details');
+    reasoningBlocks.forEach((block) => {
+        if (block instanceof HTMLDetailsElement) {
+            block.open = power_user.reasoning.auto_expand;
+        }
+    });
+}
+
 /**
  * Helper class for adding reasoning to messages.
  * Keeps track of the number of reasoning additions.
@@ -118,6 +130,13 @@ function loadReasoningSettings() {
         power_user.reasoning.auto_parse = !!$(this).prop('checked');
         saveSettingsDebounced();
     });
+
+    $('#reasoning_auto_expand').prop('checked', power_user.reasoning.auto_expand);
+    $('#reasoning_auto_expand').on('change', function () {
+        power_user.reasoning.auto_expand = !!$(this).prop('checked');
+        toggleReasoningAutoExpand();
+        saveSettingsDebounced();
+    });
 }
 
 function registerReasoningSlashCommands() {
@@ -288,6 +307,8 @@ function setReasoningEventHandlers() {
         await saveChatConditional();
         updateMessageBlock(messageId, message);
         textarea.remove();
+
+        messageBlock.find('.mes_edit_done:visible').trigger('click');
     });
 
     $(document).on('click', '.mes_reasoning_edit_cancel', function (e) {
@@ -297,6 +318,8 @@ function setReasoningEventHandlers() {
         const { messageBlock } = getMessageFromJquery(this);
         const textarea = messageBlock.find('.reasoning_edit_textarea');
         textarea.remove();
+
+        messageBlock.find('.mes_reasoning_edit_cancel:visible').trigger('click');
     });
 
     $(document).on('click', '.mes_edit_add_reasoning', async function () {
@@ -311,9 +334,8 @@ function setReasoningEventHandlers() {
         }
 
         message.extra.reasoning = PromptReasoning.REASONING_PLACEHOLDER;
-        await saveChatConditional();
-        closeMessageEditor();
         updateMessageBlock(messageId, message);
+        await saveChatConditional();
     });
 
     $(document).on('click', '.mes_reasoning_delete', async function (e) {
@@ -441,6 +463,7 @@ function registerReasoningAppEvents() {
 
 export function initReasoning() {
     loadReasoningSettings();
+    toggleReasoningAutoExpand();
     setReasoningEventHandlers();
     registerReasoningSlashCommands();
     registerReasoningMacros();