Preserve user input on tool call recursion (#5134) Supersedes #5129

9714374749b0bf1193f10af1b83695ab38147b7c

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

Signed

public/script.js+5 -5 Viewed

     const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
     const isImpersonate = type == 'impersonate';
     if (!(dryRun || depth || type == 'regenerate' || type == 'swipe' || type == 'quiet')) {
         const interruptedByCommand = await processCommands(String($('#send_textarea').val()));
         if (interruptedByCommand) {

     const lastMessage = chat[chat.length - 1];
     let textareaText;
     if (type !== 'regenerate' && type !== 'swipe' && type !== 'quiet' && !isImpersonate && !dryRun && !depth) {
         is_send_press = true;
         textareaText = String($('#send_textarea').val());
         $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));

         if (chat.length && lastMessage.is_user) {
             //do nothing? why does this check exist?
+        }
         else if (type !== 'quiet' && type !== 'swipe' && !isImpersonate && !dryRun && !depth && chat.length) {
             deleteItemizedPromptForMessage(chat.length - 1);
             chat.length = chat.length - 1;
             await removeLastMessage();

         'continue',
     ];
     //for normal messages sent from user..
     if ((textareaText != '' || (hasPendingFileAttachment() && !noAttachTypes.includes(type))) && !automatic_trigger && type !== 'quiet' && !dryRun && !depth) {
         // If user message contains no text other than bias - send as a system message
         if (messageBias && !removeMacros(textareaText)) {
             sendSystemMessage(system_message_types.GENERIC, ' ', { bias: messageBias });

@@ -4288,7 +4288,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4288	4288	await sendMessageAsUser(textareaText, messageBias);
4289	4289	}
4290	4290	}
4291	4291	else if (textareaText == '' && !automatic_trigger && !dryRun && [undefined, 'normal'].includes(type) && main_api == 'openai' && oai_settings.send_if_empty.trim().length > 0 && !depth) {
4292	4292	// Use send_if_empty if set and the user message is empty. Only when sending messages normally
4293	4293	await sendMessageAsUser(oai_settings.send_if_empty.trim(), messageBias);
4294	4294	}