Introduce a proper initial state

47b679202f5a965267a9e727ff2e7eb7fba04449

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

public/scripts/world-info.js+16 -5 Viewed

      */
     NONE: 0,
     /**
-     * The scan is triggered by a recursion step. Initial state.
+     * Initial state.
      */
-    RECURSION: 1,
+    INITIAL: 1,
+    /**
+     * The scan is triggered by a recursion step.
+     */
+    RECURSION: 2,
     /**
      * The scan is triggered by a min activations depth skew.
      */

@@ -3526,7 +3530,7 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
3526	}	3530	}
3527	}	3531	}
3528		3532
3529	let scanState = scan_state.RECURSION;	3533	let scanState = scan_state.INITIAL;
3530	let token_budget_overflowed = false;	3534	let token_budget_overflowed = false;
3531	let count = 0;	3535	let count = 0;
3532	let allActivatedEntries = new Set();	3536	let allActivatedEntries = new Set();

+    }
     while (scanState) {
-        // Track how many times the loop has run
+        // Track how many times the loop has run. May be useful for debugging.
+        // eslint-disable-next-line no-unused-vars
         count++;
         let activatedNow = new Set();

+            }
             // 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))) {
+            if (scanState !== scan_state.RECURSION && entry.delayUntilRecursion) {
+                console.debug(`WI entry ${entry.uid} suppressed by delay until recursion`, entry);
+                continue;
+            }
+            if (scanState === scan_state.RECURSION && world_info_recursive && entry.excludeRecursion) {
+                console.debug(`WI entry ${entry.uid} suppressed by exclude recursion`, entry);
                 continue;
+            }