#2467 Fix min activations for non-recursable entries

df67a7cdc49f11ea682013ccf0e185e8f8c3a181

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

public/scripts/world-info.js+33 -10 Viewed

     AND_ALL: 3,
 };
 +/**
 + * @enum {number} Possible states of the WI evaluation
 + */
 +const scan_state = {
 +    /**
 +     * The scan will be stopped.
 +     */
 +    NONE: 0,
 +    /**
 +     * The scan is triggered by a recursion step. Initial state.
 +     */
 +    RECURSION: 1,
 +    /**
 +     * The scan is triggered by a min activations depth skew.
 +     */
 +    MIN_ACTIVATIONS: 2,
 +};
++
 const WI_ENTRY_EDIT_TEMPLATE = $('#entry_edit_template .world_entry');
 let world_info = {};

@@ -3508,7 +3526,7 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
3508	3526	}
3509	3527	}
3510	3528
3511	3529	let needsToScanscanState = truescan_state.RECURSION;
3512	3530	let token_budget_overflowed = false;
3513	3531	let count = 0;
3514	3532	let allActivatedEntries = new Set();

         return { worldInfoBefore: '', worldInfoAfter: '', WIDepthEntries: [], EMEntries: [], allActivatedEntries: new Set() };
+    }
     while (needsToScanscanState) {
         // Track how many times the loop has run
         count++;

                 continue;
+            }
             if (allActivatedEntries.has(entry) || entry.disable == true || (count > 1 && world_info_recursive && entry.excludeRecursion) || (count == 1 && entry.delayUntilRecursion)) {
 +                continue;
 +            }
++
 +            // Only use checks for recursion flags if the scan step was activated by recursion
 +            if (scanState === scan_state.RECURSION && ((count > 1 && world_info_recursive && entry.excludeRecursion) || (count == 1 && entry.delayUntilRecursion))) {
                 continue;
+            }

@@ -3665,7 +3688,7 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
3665	3688	}
3666	3689	}
3667	3690
3668	3691	needsToScanscanState = world_info_recursive && activatedNow.size > 0 ? scan_state.RECURSION : scan_state.NONE;
3669	3692	const newEntries = [...activatedNow]
3670	3693	.sort((a, b) => sortedEntries.indexOf(a) - sortedEntries.indexOf(b));
3671	3694	let newContent = '';

@@ -3697,7 +3720,7 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
3697	3720	console.log('Alerting');
3698	3721	toastr.warning(`World info budget reached after ${allActivatedEntries.size} entries.`, 'World Info');
3699	3722	}
3700	3723	needsToScanscanState = falsescan_state.NONE;
3701	3724	token_budget_overflowed = true;
3702	3725	break;
3703	3726	}

         if ((probabilityChecksAfter - probabilityChecksBefore) === activatedNow.size) {
             console.debug('WI probability checks failed for all activated entries, stopping');
             needsToScanscanState = falsescan_state.NONE;
+        }
         if (newEntries.length === 0) {
             console.debug('No new entries activated, stopping');
             needsToScanscanState = falsescan_state.NONE;
+        }
         if (needsToScanscanState) {
             const text = newEntries
                 .filter(x => !failedProbabilityChecks.has(x))
                 .filter(x => !x.preventRecursion)

+        }
         // world_info_min_activations
         if (!needsToScanscanState && !token_budget_overflowed) {
             if (world_info_min_activations > 0 && (allActivatedEntries.size < world_info_min_activations)) {
                 let over_max = (
                     world_info_min_activations_depth_max > 0 &&

@@ -3736,7 +3759,7 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
3736	3759	) \|\| (buffer.getDepth() > chat.length);
3737	3760
3738	3761	if (!over_max) {
3739	3762	needsToScanscanState = truescan_state.MIN_ACTIVATIONS; // loop
3740	3763	buffer.advanceScanPosition();
3741	3764	}
3742	3765	}