8346f519 · permissionBRICK/SillyTavern

public/script.js+3 -1 Viewed

  * @property {string} [quietName] Name to use for the quiet prompt (defaults to "System:")
  * @property {number} [depth] Recursion depth for the generation. Used to prevent infinite loops in tool calls.
  * @property {JsonSchema} [jsonSchema] JSON schema to use for the structured generation. Usually requires a special instruction.
+ * @property {boolean} [squashSystemMessages] Apply the configured system-message squashing during a dry run.
  */
 /**

  * @param {boolean} dryRun Whether to actually generate a message or just assemble the prompt
  * @returns {Promise<any>} Returns a promise that resolves when the text is done generating.
  */
-export async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage, quietName, jsonSchema = null, depth = 0 } = {}, dryRun = false) {
+export async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage, quietName, jsonSchema = null, depth = 0, squashSystemMessages = false } = {}, dryRun = false) {
     console.log('Generate entered');
     setGenerationProgress(0);
     generation_started = new Date();

                 jailbreakPromptOverride: jailbreak,
                 messages: oaiMessages,
                 messageExamples: oaiMessageExamples,
+                squashSystemMessages,
             }, dryRun);
             generate_data = { prompt: prompt };

public/scripts/extensions/keepalive/index.js+3 -1 Viewed

     eventSource.on(event_types.GENERATE_AFTER_DATA, captureData);
     setExtensionPrompt(KEEPALIVE_INJECT_ID, extension_settings[MODULE].message, extension_prompt_types.IN_CHAT, 0, false, extension_prompt_roles.USER);
     try {
-        await Generate('quiet', { quiet_prompt: '', force_name2: true }, true);
+        // A normal live request applies the user's system-message squashing after prompt assembly.
+        // Opt into the same final transform here so provider cache keys see identical boundaries.
+        await Generate('quiet', { quiet_prompt: '', force_name2: true, squashSystemMessages: true }, true);
     } finally {
         setExtensionPrompt(KEEPALIVE_INJECT_ID, '', extension_prompt_types.IN_CHAT, 0, false, extension_prompt_roles.USER);
         eventSource.removeListener(event_types.GENERATE_AFTER_DATA, captureData);

public/scripts/extensions/keepalive/manifest.json+1 -1 Viewed

     "js": "index.js",
     "css": "",
     "author": "SillyTavern",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "homePage": "https://github.com/SillyTavern/SillyTavern",
     "hooks": {
         "activate": "init"

public/scripts/openai.js+3 -1 Viewed

  * @param {object} content.extensionPrompts - An array of additional prompts.
  * @param {object[]} content.messages - An array of messages to be used as chat history.
  * @param {string[]} content.messageExamples - An array of messages to be used as dialogue examples.
+ * @param {boolean} [content.squashSystemMessages] Apply configured system-message squashing during a dry run.
  * @param dryRun - Whether this is a live call or not.
  * @returns {Promise<(any[]|boolean)[]>} An array where the first element is the prepared chat and the second element is a boolean flag.
  */

     jailbreakPromptOverride,
     messages,
     messageExamples,
+    squashSystemMessages = false,
 }, dryRun) {
     // Without a character selected, there is no way to accurately calculate tokens
     if (!promptManager.activeCharacter && dryRun) return [null, false];

         // Pass chat completion to prompt manager for inspection
         promptManager.setChatCompletion(chatCompletion);
-        if (oai_settings.squash_system_messages && dryRun == false) {
+        if (oai_settings.squash_system_messages && (!dryRun || squashSystemMessages)) {
             await chatCompletion.squashSystemMessages();
+        }

Preserve prompt cache shape in keepalives