Dont count Continue as message 0 (#3594) * continue works same as swipe continued message isn't depth counted * correct early-out check * update regex depth setting tooltips for accuracy * update max tooltip * remove redundant check * Allow -1 as a min depth value --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

01ef823da91dac0943742d1df3b0fe220f90420e

Reithan <bo122081@hotmail.com>

Signed

Parents: 1b02426df104d7fbfa463a340205396a0666d6c3

public/script.js+2 -2 Viewed

     coreChat = await Promise.all(coreChat.map(async (chatItem, index) => {
         let message = chatItem.mes;
         let regexType = chatItem.is_user ? regex_placement.USER_INPUT : regex_placement.AI_OUTPUT;
         let options = { isPrompt: true, depth: (coreChat.length - index - (isContinue ? 2 : 1)) };
         let regexedMessage = getRegexedString(message, regexType, options);
         regexedMessage = await appendFileContent(chatItem, regexedMessage);

     const promptReasoning = new PromptReasoning();
     for (let i = coreChat.length - 1; i >= 0; i--) {
         const depth = coreChat.length - i - 1;
         const isPrefix = isContinue && i === coreChat.length - (isContinue ? 2 : 1);
         coreChat[i] = {
             ...coreChat[i],
             mes: promptReasoning.addToMessage(

public/scripts/extensions/regex/editor.html+3 -3 Viewed

                 </div>
                 <div class="flex-container wide100p marginTop5">
                     <div class="flex1 flex-container flexNoGap">
                         <small data-i18n="[title]ext_regex_min_depth_desc" title="When applied to prompts or display, only affect messages that are at least N levels deep. 0 = last message, 1 = penultimate message, etc. Only countsSystem WIprompt entriesand @Depthutility andprompts usableare messages,not i.eaffected. notWhen hiddenblank / 'Unlimited' or system-1, also affect message to continue on Continue.">
                             <span data-i18n="Min Depth">Min Depth</span>
                             <span class="fa-solid fa-circle-question note-link-span"></span>
                         </small>
                         <input name="min_depth" class="text_pole textarea_compact" type="number" min="0-1" max="999" data-i18n="[placeholder]ext_regex_min_depth_placeholder" placeholder="Unlimited" />
                     </div>
                     <div class="flex1 flex-container flexNoGap">
                         <small data-i18n="[title]ext_regex_max_depth_desc" title="When applied to prompts or display, only affect messages no more than N levels deep. 0 = last message, 1 = penultimate message, etc. Only countsSystem WIprompt entriesand @Depthutility andprompts usableare messages,not i.eaffected. notMax hiddenmust orbe systemgreater than Min for regex to apply.">
                             <span data-i18n="Max Depth">Max Depth</span>
                             <span class="fa-solid fa-circle-question note-link-span"></span>
                         </small>

public/scripts/extensions/regex/engine.js+2 -2 Viewed

@@ -103,8 +103,8 @@ function getRegexedString(rawString, placement, { characterOverride, isMarkdown,
103	103	}
104	104
105	105	// Check if the depth is within the min/max depth
106	106	if (typeof depth === 'number' && depth >= 0) {
107	107	if (!isNaN(script.minDepth) && script.minDepth !== null && script.minDepth >= 0-1 && depth < script.minDepth) {
108	108	console.debug(`getRegexedString: Skipping script ${script.scriptName} because depth ${depth} is less than minDepth ${script.minDepth}`);
109	109	return;
110	110	}