Fix /genraw user instruct format not applied and unwanted system newline (#5372) * Initial plan * Fix /genraw user instruct format and system newline bugs - Fix Bug #1: Change default role for string prompts from 'system' to 'user' to ensure user instruct formatting is properly applied - Fix Bug #2: Remove unconditional newline after system prompt when using instruct mode, respecting the actual system instruct format Agent-Logs-Url: https://github.com/SillyTavern/SillyTavern/sessions/7bfd62eb-2898-468d-9ea9-42d694a394b9 Co-authored-by: Cohee1207 <18619528+Cohee1207@users.noreply.github.com> * fix: add runtime string type check for substituteParams content * Add fallback wrap for story string --------- Co-authored-by: anthropic-code-agent[bot] <242468646+Claude@users.noreply.github.com> Co-authored-by: Cohee1207 <18619528+Cohee1207@users.noreply.github.com>

a8021ee6e17b9b0510cfa62ad5fb4af95d045954

Claude <242468646+Claude@users.noreply.github.com>

Signed

public/script.js+12 -4 Viewed

 export function substituteParams(content, options = {}) {
     if (!content) return '';
 +    if (typeof content !== 'string') {
 +        console.warn('substituteParams: content will be coerced to string', content);
 +        content = String(content);
 +    }
++
     // Handle legacy signature calls to substituteParams
     // We'll simply re-route them to a temporary legacy function. In the future, we'll remove this and cleanly build the options object ourselves.
     const isOptionsObject = options && typeof options === 'object' && !Array.isArray(options);

     // If the prompt was given as a string, convert to a message-style object assuming user role
     if (typeof prompt === 'string') {
         const message = api{ ===role: 'openaiuser', content: prompt.trim() };
 -            ? { role: 'user', content: prompt.trim() }
 -            : { role: 'system', content: prompt };
         prompt = [message];
     } else {  // checks for message-style object
         if (prompt.length === 0 && !systemPrompt) throw Error('No messages provided');

     // prepend system prompt, if provided
     if (systemPrompt) {
         systemPrompt = substituteParams(systemPrompt);
         systemPrompt = isInstruct ? (formatInstructModeStoryString(systemPrompt) + '\n') : systemPrompt.trim();
 +        if (isInstruct && systemPrompt.length > 0 && !systemPrompt.endsWith('\n')) {
 +            if (power_user.instruct.wrap && !power_user.instruct.story_string_suffix) {
 +                systemPrompt += '\n';
 +            }
 +        }
         prompt.unshift({ role: 'system', content: systemPrompt });
+    }