c6e612f1 · permissionBRICK/SillyTavern

@@ -223,12 +223,12 @@ class WorldInfoBuffer {
223	223	}
224	224
225	225	if (depth < 0) {
226	226	console.error(`[WI] Invalid WI scan depth ${depth}. Must be >= 0`);
227	227	return '';
228	228	}
229	229
230	230	if (depth > MAX_SCAN_DEPTH) {
231	231	console.warn(`[WI] Invalid WI scan depth ${depth}. Truncating to ${MAX_SCAN_DEPTH}`);
232	232	depth = MAX_SCAN_DEPTH;
233	233	}
234	234

             const key = this.#getEntryKey(entry);
             const effect = this.#getEntryTimedEffect('cooldown', entry, true);
             chat_metadata.timedWorldInfo.cooldown[key] = effect;
             console.log(`[WI] Adding cooldown entry ${key} on ended sticky: start=${effect.start}, end=${effect.end}, protected=${effect.protected}`);
             // Set the cooldown immediately for this evaluation
             this.#buffer.cooldown.push(entry);
         },

          * @param {WIScanEntry} entry Entry that ended cooldown
          */
         'cooldown': (entry) => {
             console.debug('[WI] Cooldown ended for entry', entry.uid);
         },
         'delay': () => { },

         /** @type {[string, WITimedEffect][]} */
         const effects = Object.entries(chat_metadata.timedWorldInfo[type]);
         for (const [key, value] of effects) {
             console.log(`[WI] Processing ${type} entry ${key}`, value);
             const entry = this.#entries.find(x => String(this.#getEntryHash(x)) === String(value.hash));
             if (this.#chat.length <= Number(value.start) && !value.protected) {
                 console.log(`[WI] Removing ${type} entry ${key} from timedWorldInfo: chat not advanced`, value);
                 delete chat_metadata.timedWorldInfo[type][key];
                 continue;
+            }

             // Missing entries (they could be from another character's lorebook)
             if (!entry) {
                 if (this.#chat.length >= Number(value.end)) {
                     console.log(`[WI] Removing ${type} entry from timedWorldInfo: entry not found and interval passed`, entry);
                     delete chat_metadata.timedWorldInfo[type][key];
+                }
                 continue;

             // Ignore invalid entries (not configured for timed effects)
             if (!entry[type]) {
                 console.log(`[WI] Removing ${type} entry from timedWorldInfo: entry not ${type}`, entry);
                 delete chat_metadata.timedWorldInfo[type][key];
                 continue;
+            }
             if (this.#chat.length >= Number(value.end)) {
                 console.log(`[WI] Removing ${type} entry from timedWorldInfo: ${type} interval passed`, entry);
                 delete chat_metadata.timedWorldInfo[type][key];
                 if (typeof onEnded === 'function') {
                     onEnded(entry);

@@ -581,7 +581,7 @@ class WorldInfoTimedEffects {
581	581	}
582	582
583	583	buffer.push(entry);
584	584	console.log(`[WI] Timed effect "${type}" applied to entry`, entry);
585	585	}
586	586	}
587	587

@@ -597,7 +597,7 @@ class WorldInfoTimedEffects {
597	597
598	598	if (this.#chat.length < entry.delay) {
599	599	buffer.push(entry);
600	600	console.log('[WI] Timed effect "delay" applied to entry', entry);
601	601	}
602	602	}
603	603

@@ -644,7 +644,7 @@ class WorldInfoTimedEffects {
644	644	const effect = this.#getEntryTimedEffect(type, entry, false);
645	645	chat_metadata.timedWorldInfo[type][key] = effect;
646	646
647	647	console.log(`[WI] Adding ${type} entry ${key}: start=${effect.start}, end=${effect.end}, protected=${effect.protected}`);
648	648	}
649	649	}
650	650

@@ -676,7 +676,7 @@ class WorldInfoTimedEffects {
676	676	if (newState) {
677	677	const effect = this.#getEntryTimedEffect(type, entry, false);
678	678	chat_metadata.timedWorldInfo[type][key] = effect;
679	679	console.log(`[WI] Adding ${type} entry ${key}: start=${effect.start}, end=${effect.end}, protected=${effect.protected}`);
680	680	}
681	681	}
682	682

@@ -3847,7 +3847,7 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
3847	3847	}
3848	3848
3849	3849	allActivatedEntries.add(entry);
3850	3850	console.debug(`[WI] entryEntry ${entry.uid} activation successful, adding to prompt`, entry);
3851	3851	}
3852	3852
3853	3853	const successfulNewEntries = newEntries.filter(x => !failedProbabilityChecks.has(x));

         } else if (!successfulNewEntries.length) {
             console.debug('[WI] Probability checks failed for all activated entries, stopping');
         } else {
             console.debug(`[WI] SucessfullySuccessfully activated ${successfulNewEntries.length} new entries to prompt. ${allActivatedEntries.size} total entries activated.`, successfulNewEntries);
+        }
         // After processing and rolling entries is done, see if we should continue with normal recursion

Add WI prefix to timed effect logs