Allow "none" position for extension prompt injects

87e562b75251bd786e6060048b47d501d08506a9

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

Parents: 1ad57e6ff63b508d8d8b66daa1f80dc3dc5e7809

public/css/extensions-panel.css+2 -1 Viewed

@@ -7,7 +7,8 @@
7	background-color: green;	7	background-color: green;
8	}	8	}
9		9
10	.extensions_block input[type="checkbox"] {	10	.extensions_block input[type="checkbox"],
		11	.extensions_block input[type="radio"] {
11	margin-left: 10px;	12	margin-left: 10px;
12	margin-right: 10px;	13	margin-right: 10px;
13	}	14	}

public/script.js+1 -0 Viewed

  * @enum {number} Extension prompt types
  */
 export const extension_prompt_types = {
+    NONE: -1,
     IN_PROMPT: 0,
     IN_CHAT: 1,
     BEFORE_PROMPT: 2,

public/scripts/extensions/memory/index.js+13 -2 Viewed

     substituteParamsExtended,
     generateRaw,
     getMaxContextSize,
+    setExtensionPrompt,
 } from '../../../script.js';
 import { is_group_generating, selected_group } from '../../group-chats.js';
 import { loadMovingUIState } from '../../power-user.js';

     template: defaultTemplate,
     position: extension_prompt_types.IN_PROMPT,
     role: extension_prompt_roles.SYSTEM,
+    scan: false,
     depth: 2,
     promptWords: 200,
     promptMinWords: 25,

     $(`input[name="memory_prompt_builder"][value="${extension_settings.memory.prompt_builder}"]`).prop('checked', true).trigger('input');
     $('#memory_override_response_length').val(extension_settings.memory.overrideResponseLength).trigger('input');
     $('#memory_max_messages_per_request').val(extension_settings.memory.maxMessagesPerRequest).trigger('input');
+    $('#memory_include_wi_scan').prop('checked', extension_settings.memory.scan).trigger('input');
     switchSourceControls(extension_settings.memory.source);
+}

     saveSettingsDebounced();
+}
+function onMemoryIncludeWIScanInput() {
+    const value = !!$(this).prop('checked');
+    extension_settings.memory.scan = value;
+    reinsertMemory();
+    saveSettingsDebounced();
+}
 function onMemoryPromptWordsForceInput() {
     const value = $(this).val();
     extension_settings.memory.promptForceWords = Number(value);

  * @param {number|null} index Index of the chat message to save the summary to. If null, the pre-last message is used.
  */
 function setMemoryContext(value, saveToMessage, index = null) {
-    const context = getContext();
+    setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, extension_settings.memory.scan, extension_settings.memory.role);
-    context.setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, false, extension_settings.memory.role);
     $('#memory_contents').val(value);
     const summaryLog = value

         : 'Summary has no content';
     console.debug(summaryLog);
+    const context = getContext();
     if (saveToMessage && context.chat.length) {
         const idx = index ?? context.chat.length - 2;
         const mes = context.chat[idx < 0 ? 0 : idx];

     $('#memory_prompt_words_auto').off('click').on('click', onPromptForceWordsAutoClick);
     $('#memory_override_response_length').off('click').on('input', onOverrideResponseLengthInput);
     $('#memory_max_messages_per_request').off('click').on('input', onMaxMessagesPerRequestInput);
+    $('#memory_include_wi_scan').off('input').on('input', onMemoryIncludeWIScanInput);
     $('#summarySettingsBlockToggle').off('click').on('click', function () {
         console.log('saw settings button click');
         $('#summarySettingsBlock').slideToggle(200, 'swing'); //toggleClass("hidden");

public/scripts/extensions/memory/settings.html+9 -0 Viewed

                         <textarea id="memory_template" class="text_pole textarea_compact" rows="2" data-i18n="[placeholder]ext_sum_memory_template_placeholder" placeholder="&lcub;&lcub;summary&rcub;&rcub; will resolve to the current summary contents."></textarea>
                     </div>
                     <label for="memory_position" data-i18n="ext_sum_injection_position">Injection Position</label>
+                    <label class="checkbox_label" for="memory_include_wi_scan" data-i18n="[title]ext_sum_include_wi_scan_desc" title="Include the latest summary in the WI scan.">
+                        <input id="memory_include_wi_scan" type="checkbox" />
+                        <span data-i18n="ext_sum_include_wi_scan">Include in World Info Scanning</span>
+                    </label>
                     <div class="radio_group">
                         <label>
+                            <input type="radio" name="memory_position" value="-1" />
+                            <span data-i18n="None (not injected)">None (not injected)</span>
+                            <i class="fa-solid fa-info-circle" title="The summary will not be injected into the prompt. You can still access it via the &lcub;&lcub;summary&rcub;&rcub; macro." data-i18n="[title]ext_sum_injection_position_none"></i>
+                        </label>
+                        <label>
                             <input type="radio" name="memory_position" value="2" />
                             <span data-i18n="Before Main Prompt / Story String">Before Main Prompt / Story String</span>
                         </label>

public/scripts/slash-commands.js+3 -2 Viewed

                 enumProvider: commonEnumProviders.injects,
             }),
             new SlashCommandNamedArgument(
-                'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat'],
+                'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat', 'none'],
             ),
             new SlashCommandNamedArgument(
                 'depth', 'injection depth', [ARGUMENT_TYPE.NUMBER], false, false, '4',

                 'text', [ARGUMENT_TYPE.STRING], false,
             ),
         ],
-        helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false).',
+        helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'listinjects',

         'before': extension_prompt_types.BEFORE_PROMPT,
         'after': extension_prompt_types.IN_PROMPT,
         'chat': extension_prompt_types.IN_CHAT,
+        'none': extension_prompt_types.NONE,
     };
     const roles = {
         'system': extension_prompt_roles.SYSTEM,