mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'staging' into sd-args
This commit is contained in:
@@ -384,6 +384,10 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
|
||||
* @returns {string} Formatted instruct mode system prompt.
|
||||
*/
|
||||
export function formatInstructModeSystemPrompt(systemPrompt) {
|
||||
if (!systemPrompt) {
|
||||
return '';
|
||||
}
|
||||
|
||||
const separator = power_user.instruct.wrap ? '\n' : '';
|
||||
|
||||
if (power_user.instruct.system_sequence_prefix) {
|
||||
|
@@ -3027,7 +3027,7 @@ async function continueChatCallback(args, prompt) {
|
||||
resolve();
|
||||
} catch (error) {
|
||||
console.error('Error running /continue command:', error);
|
||||
reject();
|
||||
reject(error);
|
||||
}
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user