Merge branch 'staging' into reasoning-continue

5bd3d9a518dba4e9770323c975a925696c36d5f2

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/script.js+3 -3 Viewed

         return '';
+    }
     if (Number(messageId) === 0 && !isSystem && !isUser && !isReasoning) {
         const mesBeforeReplace = mes;
         const chatMessage = chat[messageId];
         mes = substituteParams(mes, undefined, ch_name);

             this.sendTextarea.dispatchEvent(new Event('input', { bubbles: true }));
+        }
         else {
             await saveReply(this.type, text, true, '', [], '');
             messageId = chat.length - 1;
             this.#checkDomElements(messageId);
             this.showMessageButtons(messageId);

             const timestamps = [];
             for await (const { text, swipes, logprobs, toolCalls, state } of this.generator()) {
                 timestamps.push(Date.now());
                 if (this.isStopped || this.abortController.signal.aborted) {
                     return;
+                }

public/scripts/backgrounds.js+14 -4 Viewed

     });
+}
 +/**
 + * Locks the background for the current chat
 + * @param {Event} e Click event
 + * @returns {string} Empty string
 + */
 function onLockBackgroundClick(e) {
     e?.stopPropagation();
     const chatName = getCurrentChatId();

     return '';
+}
 +/**
 + * Locks the background for the current chat
 + * @param {Event} e Click event
 + * @returns {string} Empty string
 + */
 function onUnlockBackgroundClick(e) {
     e?.stopPropagation();
     removeBackgroundMetadata();
     unsetCustomBackground();
     highlightLockedBackground();

     $('#add_bg_button').on('change', onBackgroundUploadSelected);
     $('#bg-filter').on('input', onBackgroundFilterInput);
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'lockbg',
 -        callback: onLockBackgroundClick,
 +        callback: () => onLockBackgroundClick(new CustomEvent('click')),
         aliases: ['bglock'],
         helpString: 'Locks a background for the currently selected chat',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'unlockbg',
 -        callback: onUnlockBackgroundClick,
 +        callback: () => onUnlockBackgroundClick(new CustomEvent('click')),
         aliases: ['bgunlock'],
         helpString: 'Unlocks a background for the currently selected chat',
     }));

public/scripts/reasoning.js+3 -0 Viewed

 function registerReasoningSlashCommands() {
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'reasoning-get',
 +        aliases: ['get-reasoning'],
         returns: ARGUMENT_TYPE.STRING,
         helpString: t`Get the contents of a reasoning block of a message. Returns an empty string if the message does not have a reasoning block.`,
         unnamedArgumentList: [

     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'reasoning-set',
 +        aliases: ['set-reasoning'],
         returns: ARGUMENT_TYPE.STRING,
         helpString: t`Set the reasoning block of a message. Returns the reasoning block content.`,
         namedArgumentList: [

     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'reasoning-parse',
 +        aliases: ['parse-reasoning'],
         returns: 'reasoning string',
         helpString: t`Extracts the reasoning block from a string using the Reasoning Formatting settings.`,
         namedArgumentList: [

public/scripts/textgen-models.js+6 -0 Viewed

     'xAI',
     'Cloudflare',
     'SF Compute',
 +    'Minimax',
 +    'Nineteen',
 +    'Liquid',
 +    'Nebius',
 +    'Chutes',
 +    'Kluster',
     '01.AI',
     'HuggingFace',
     'Mancer',