diff --git a/public/script.js b/public/script.js index 7d1f85bdb..83a587d2d 100644 --- a/public/script.js +++ b/public/script.js @@ -3555,7 +3555,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu //TODO: respect output_sequence vs last_output_sequence settings //TODO: decide how to prompt this to clarify who is talking 'Narrator', 'System', etc. if (isInstruct) { - lastMesString += '\n' + quietAppend; // + power_user.instruct.output_sequence + '\n'; + lastMesString += quietAppend; // + power_user.instruct.output_sequence + '\n'; } else { lastMesString += quietAppend; } diff --git a/public/scripts/instruct-mode.js b/public/scripts/instruct-mode.js index 48fec1129..de8b93c5b 100644 --- a/public/scripts/instruct-mode.js +++ b/public/scripts/instruct-mode.js @@ -458,6 +458,11 @@ export function formatInstructModePrompt(name, isImpersonate, promptBias, name1, const separator = power_user.instruct.wrap ? '\n' : ''; let text = includeNames ? (separator + sequence + separator + `${name}:`) : (separator + sequence); + // Quiet prompt already has a newline at the end + if (isQuiet && separator) { + text = text.slice(separator.length); + } + if (!isImpersonate && promptBias) { text += (includeNames ? promptBias : (separator + promptBias.trimStart())); }