hoi4-agent-tools 3.9.0 → 4.0.0

package/dist/hoi4_agent_tools/gui/studio.js

@@ -917,6 +917,8 @@ export function guiArtifactProvenance(graph, kind, primaryScene, scenarioScenes
     };
 }
 const sharedGuiGraphs = new WeakMap();
+/** Graphs kept per engine: one for each scope a preview builds, across a few workspaces. */
+const GUI_GRAPH_CACHE_SCOPES = 6;
 export class ScriptedGuiStudio {
     engine;
     resolver;
@@ -953,12 +955,21 @@ export class ScriptedGuiStudio {
             return cached;
         }
         const retainedFiles = [...files];
+        // The previous graph of this scope still indexes every unchanged file.
+        const previous = [...this.#graphCache].find(([existing]) => existing.startsWith(`${scope}:`))?.[1].index;
+        const index = this.engine.indexFiles(retainedFiles, previous);
         const scanned = {
             files: retainedFiles,
-            graph: buildGuiSourceGraph(retainedFiles, this.engine.indexFiles(retainedFiles), additionalLocalisationKeys),
+            graph: buildGuiSourceGraph(retainedFiles, index, additionalLocalisationKeys),
+            index,
         };
+        // One graph per scope: a preview builds layout, game-layout and definition graphs, and a
+        // single shared slot made each repeat call rebuild all of them.
+        for (const existing of this.#graphCache.keys())
+            if (existing.startsWith(`${scope}:`))
+                this.#graphCache.delete(existing);
         this.#graphCache.set(key, scanned);
-        while (this.#graphCache.size > 1) {
+        while (this.#graphCache.size > GUI_GRAPH_CACHE_SCOPES) {
             const oldest = this.#graphCache.keys().next().value;
             if (oldest === undefined)
                 break;
@@ -1004,7 +1015,7 @@ export class ScriptedGuiStudio {
             const gameGraph = this.graphForFiles(gameLayouts.files, `game-layout:${workspaceId}`).graph;
             const selectedPaths = new Set(selectedElements(gameGraph, windowName, [...requiredNames]).map(({ sourcePath }) => sourcePath));
             layoutFiles = mergeScannedFiles(layoutFiles, gameLayouts.files.filter(({ displayPath }) => selectedPaths.has(displayPath)));
-            layoutGraph = this.graphForFiles(layoutFiles, `layout:${workspaceId}`).graph;
+            layoutGraph = this.graphForFiles(layoutFiles, `merged-layout:${workspaceId}`).graph;
         }
         if (!layoutGraph.elements.some(({ name }) => name === windowName))
             assertTargetWindowAvailable(layoutGraph, windowName);
@@ -1062,12 +1073,13 @@ export class ScriptedGuiStudio {
             ? undefined
             : parseGeneratedScenarioOptions(input.generatedScenarios);
         const scanned = await this.scanWindow(input.workspaceId, input.windowName, input.principal, input.signal, [placeholderScenario.language, ...explicitRelatedScenarios.map(({ language }) => language)], scenarioSpriteNames([placeholderScenario, ...explicitRelatedScenarios], generatedOptions?.textSamples), scenarioTemplateNames([placeholderScenario, ...explicitRelatedScenarios]), scenarioCountryFlagPatterns([placeholderScenario, ...explicitRelatedScenarios]), scenarioLocalisationKeys([placeholderScenario, ...explicitRelatedScenarios]), [placeholderScenario, ...explicitRelatedScenarios].some(({ tooltip }) => tooltip !== undefined));
-        const evaluationDefinitions = ClausewitzEvaluationDefinitions.build(scanned);
+        let builtDefinitions;
+        const evaluationDefinitions = () => (builtDefinitions ??= ClausewitzEvaluationDefinitions.build(scanned));
         const resolveLocalisation = (target) => resolveScenarioScriptedLocalisation(scanned.graph, input.windowName, target, evaluationDefinitions);
         const suppliedScenario = resolveLocalisation(placeholderScenario);
         const generatedScenarios = generatedOptions === undefined
             ? []
-            : generateGuiPreviewScenarios(scanned.graph, input.windowName, placeholderScenario, generatedOptions, evaluationDefinitions);
+            : generateGuiPreviewScenarios(scanned.graph, input.windowName, placeholderScenario, generatedOptions, evaluationDefinitions());
         const scenario = generatedScenarios[0] ?? suppliedScenario;
         const relatedScenarios = [
             ...(generatedOptions?.preservePlaceholder === true && generatedScenarios.length > 0
@@ -1160,12 +1172,13 @@ export class ScriptedGuiStudio {
             ...(requestedBaselineScenario === undefined ? [] : [requestedBaselineScenario]),
             ...explicitRelatedScenarios,
         ].some(({ tooltip }) => tooltip !== undefined));
-        const evaluationDefinitions = ClausewitzEvaluationDefinitions.build(scanned);
+        let builtDefinitions;
+        const evaluationDefinitions = () => (builtDefinitions ??= ClausewitzEvaluationDefinitions.build(scanned));
         const resolveLocalisation = (target) => resolveScenarioScriptedLocalisation(scanned.graph, input.windowName, target, evaluationDefinitions);
         const suppliedScenario = resolveLocalisation(placeholderScenario);
         const generatedScenarios = generatedOptions === undefined
             ? []
-            : generateGuiPreviewScenarios(scanned.graph, input.windowName, placeholderScenario, generatedOptions, evaluationDefinitions);
+            : generateGuiPreviewScenarios(scanned.graph, input.windowName, placeholderScenario, generatedOptions, evaluationDefinitions());
         const scenario = generatedScenarios[0] ?? suppliedScenario;
         const relatedScenarios = [
             ...(generatedOptions?.preservePlaceholder === true && generatedScenarios.length > 0

package/dist/hoi4_agent_tools/gui/validators.js

@@ -490,15 +490,17 @@ function validateOverlapAndGeometry(scene, diagnostics, work) {
                 if (overlap === undefined)
                     continue;
                 const ratio = area(overlap) / Math.max(1, Math.min(area(left.rect), area(right.rect)));
+                // Tab pages and alternative panels overlap by design; the game shows one at a time.
+                // When the scenario cannot decide which, the preview draws them stacked, and the pair
+                // is reported only as missing scenario facts, not as a layout or click conflict.
+                if (left.visibilityStatus === 'unresolved' || right.visibilityStatus === 'unresolved') {
+                    if (left.depth === right.depth && ratio > 0.2)
+                        diagnostics.push(issue('GUI_UNRESOLVED_VISIBILITY_OVERLAP', 'warning', 'layout', `${left.name} and ${right.name} overlap and the scenario does not decide which is visible, so the preview draws both. Declare the flags or variables their visible triggers read, with closedFlags, to render one of them.`, right, { left: left.id, right: right.id, ratio }));
+                    continue;
+                }
                 if (left.clickable && right.clickable && ratio > 0.02) {
                     diagnostics.push(issue('GUI_CONFLICTING_CLICK_REGIONS', 'error', 'design', `${left.name} and ${right.name} have overlapping click regions (${(ratio * 100).toFixed(1)}%).`, right, { left: left.id, right: right.id, ratio }));
                 }
-                // Tab pages and alternative panels overlap by design; the game shows one at a time.
-                // When the scenario cannot decide which, the preview draws them stacked.
-                if (left.depth === right.depth &&
-                    ratio > 0.2 &&
-                    (left.visibilityStatus === 'unresolved' || right.visibilityStatus === 'unresolved'))
-                    diagnostics.push(issue('GUI_UNRESOLVED_VISIBILITY_OVERLAP', 'warning', 'layout', `${left.name} and ${right.name} overlap and the scenario does not decide which is visible, so the preview draws both. Declare the flags or variables their visible triggers read, with closedFlags, to render one of them.`, right, { left: left.id, right: right.id, ratio }));
                 if (left.depth === right.depth && ratio > 0.2) {
                     diagnostics.push(issue('GUI_VISIBLE_OVERLAP', 'warning', 'layout', `${left.name} and ${right.name} overlap by ${(ratio * 100).toFixed(1)}% of the smaller element.`, right, { left: left.id, right: right.id, ratio }));
                 }

package/dist/hoi4_agent_tools/map/bmp.js

@@ -314,7 +314,7 @@ export function createBmp(options) {
     bytes.writeUInt32LE(0, 30);
     bytes.writeUInt32LE(stride * options.height, 34);
     if (options.bitsPerPixel === 8)
-        bytes.writeUInt32LE(palette.length === 256 ? 256 : palette.length, 46);
+        bytes.writeUInt32LE(options.colorsUsed ?? palette.length, 46);
     for (const [index, color] of palette.entries()) {
         const offset = 14 + dibSize + index * 4;
         bytes[offset] = color.b;