Fix off-by-one cases in user prompt filler logic (#4648) * Fix off-by-one cases in user prompt filler logic Fixes #4645 * Skip inject pre-allocation in CC prompts * Fix filler insert on continuing on user message

a559f45ad4025263c083752cc5870541c6bc784c

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

Signed

public/script.js+16 -5 Viewed

     renderPaginationDropdown,
     paginationDropdownChangeHandler,
     importFromExternalUrl,
+    shiftUpByOne,
+    shiftDownByOne,
 } from './scripts/utils.js';
 import { debounce_timeout, GENERATION_TYPE_TRIGGERS, IGNORE_SYMBOL, inject_ids } from './scripts/constants.js';

@@ -3910,14 +3912,14 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
3910	// This operation will result in the injectedIndices indexes being off by one	3912	// This operation will result in the injectedIndices indexes being off by one
3911	coreChat.push({ mes: jailbreak, is_user: true });	3913	coreChat.push({ mes: jailbreak, is_user: true });
3912	// Add +1 to the elements to correct for the new PHI/Jailbreak message.	3914	// Add +1 to the elements to correct for the new PHI/Jailbreak message.
3913	injectedIndices.forEach((e, idx) => injectedIndices[idx] = e + 1);	3915	injectedIndices.forEach(shiftUpByOne);
3914	}	3916	}
3915	}	3917	}
3916	}	3918	}
3917		3919
3918	let chat2 = [];	3920	let chat2 = [];
3919	let continue_mag = '';	3921	let continue_mag = '';
3920	const userMessageIndices = [];	3922	let userMessageIndices = [];
3921	const lastUserMessageIndex = coreChat.findLastIndex(x => x.is_user);	3923	const lastUserMessageIndex = coreChat.findLastIndex(x => x.is_user);
3922		3924
3923	for (let i = coreChat.length - 1, j = 0; i >= 0; i--, j++) {	3925	for (let i = coreChat.length - 1, j = 0; i >= 0; i--, j++) {

     // Only add the chat in context if past the greeting message
     if (isContinue && (chat2.length > 1 || main_api === 'openai')) {
         cyclePrompt = chat2.shift();
+        // Adjust indices to account for the shift
+        injectedIndices = injectedIndices.map(shiftDownByOne).filter(x => x >= 0);
+        userMessageIndices = userMessageIndices.map(shiftDownByOne).filter(x => x >= 0);
+    }
     // Collect enough messages to fill the context
     let arrMes = new Array(chat2.length);
     let tokenCount = await getMessagesTokenCount();
-    let lastAddedIndex = -1;
+    let lastAddedIndex = 0;
     // Pre-allocate all injections first.
     // If it doesn't fit - user shot himself in the foot
     for (const index of injectedIndices) {
+        // not needed for OAI prompting
+        if (main_api == 'openai') {
+            break;
+        }
         const item = chat2[index];
         if (typeof item !== 'string') {

  * @returns {Promise<number[]>} Array of indices where the extension prompts were injected
  */
 async function doChatInject(messages, isContinue) {
-    const injectedIndices = [];
+    const injectedMessages = [];
     let totalInsertedMessages = 0;
     messages.reverse();

@@ -4808,10 +4818,11 @@ async function doChatInject(messages, isContinue) {
4808	const injectIdx = Math.min(depth + totalInsertedMessages, messages.length);	4818	const injectIdx = Math.min(depth + totalInsertedMessages, messages.length);
4809	messages.splice(injectIdx, 0, ...roleMessages);	4819	messages.splice(injectIdx, 0, ...roleMessages);
4810	totalInsertedMessages += roleMessages.length;	4820	totalInsertedMessages += roleMessages.length;
4811	injectedIndices.push(...Array.from({ length: roleMessages.length }, (_, i) => injectIdx + i));	4821	injectedMessages.push(...roleMessages);
4812	}	4822	}
4813	}	4823	}
4814		4824
		4825	const injectedIndices = injectedMessages.map(msg => messages.indexOf(msg));
4815	messages.reverse();	4826	messages.reverse();
4816	return injectedIndices;	4827	return injectedIndices;
4817	}	4828	}

public/scripts/utils.js+3 -0 Viewed

 import { getCurrentLocale, t } from './i18n.js';
 import { importWorldInfo } from './world-info.js';
+export const shiftUpByOne = (e, i, a) => a[i] = e + 1;
+export const shiftDownByOne = (e, i, a) => a[i] = e - 1;
 /**
  * Pagination status string template.
  * @type {string}