Update historiographer.js

This commit is contained in:
2025-10-01 23:24:24 +08:00
committed by GitHub
parent d8c0666b94
commit d1b4c6521a

View File

@@ -302,8 +302,7 @@ async function getSummary(formattedHistory, toastTitle) {
toastr.info(`正在为您熔铸对话历史...`, toastTitle); toastr.info(`正在为您熔铸对话历史...`, toastTitle);
const settings = extension_settings[extensionName]; const settings = extension_settings[extensionName];
const presetPrompts = await getPresetPrompts('small_summary'); const presetPrompts = await getPresetPrompts('small_summary');
// 获取混合排序
let mixedOrder; let mixedOrder;
try { try {
const savedOrder = localStorage.getItem('amily2_prompt_presets_v2_mixed_order'); const savedOrder = localStorage.getItem('amily2_prompt_presets_v2_mixed_order');
@@ -318,19 +317,16 @@ async function getSummary(formattedHistory, toastTitle) {
const messages = [ const messages = [
{ role: 'system', content: generateRandomSeed() } { role: 'system', content: generateRandomSeed() }
]; ];
// 根据混合排序添加提示词 let promptCounter = 0;
let promptCounter = 0; // 用于跟踪已处理的提示词数量
for (const item of order) { for (const item of order) {
if (item.type === 'prompt') { if (item.type === 'prompt') {
// 处理普通提示词 - getPresetPrompts已经按照mixedOrder排序直接按顺序使用
if (presetPrompts && presetPrompts[promptCounter]) { if (presetPrompts && presetPrompts[promptCounter]) {
messages.push(presetPrompts[promptCounter]); messages.push(presetPrompts[promptCounter]);
promptCounter++; // 递增计数器 promptCounter++;
} }
} else if (item.type === 'conditional') { } else if (item.type === 'conditional') {
// 处理条件块
switch (item.id) { switch (item.id) {
case 'jailbreakPrompt': case 'jailbreakPrompt':
if (settings.historiographySmallJailbreakPrompt) { if (settings.historiographySmallJailbreakPrompt) {