hoi4-agent-tools 2.8.11 → 3.0.1

package/dist/hoi4_agent_tools/gui/studio.js

@@ -241,7 +241,7 @@ function basenameFallbackPatterns(exactPaths, exactFiles) {
         .map(({ relativePath }) => relativePath.replaceAll('\\', '/').toLowerCase()));
     return [
         ...new Set(exactPaths
-            .filter((candidate) => !resolved.has(candidate.toLowerCase()))
+            .filter((candidate) => !/[*?[\]{}!]/u.test(candidate) && !resolved.has(candidate.toLowerCase()))
             .map((candidate) => `**/${path.posix.basename(candidate)}`)),
     ].sort((left, right) => compareCodeUnits(left, right));
 }
@@ -341,6 +341,22 @@ export function referencedAssetPatternsForWindow(graph, windowName, additionalSp
         if (textValues.has(localisation.key))
             textValues.add(localisation.value);
     }
+    const dynamicTextNames = new Set();
+    for (const value of textValues) {
+        for (const match of value.matchAll(/\[(?:\?[^\]]*\.)?([A-Za-z_][A-Za-z0-9_.:-]*)[^\]]*\]/gu)) {
+            const token = match[1];
+            if (token === undefined)
+                continue;
+            dynamicTextNames.add(token);
+            dynamicTextNames.add(token.slice(token.lastIndexOf('.') + 1));
+        }
+    }
+    const dynamicTextLocalisationKeys = new Set(graph.scriptedLocalisation
+        .filter(({ name }) => dynamicTextNames.has(name))
+        .flatMap(({ localisationKeys }) => localisationKeys));
+    for (const localisation of graph.localisation)
+        if (dynamicTextLocalisationKeys.has(localisation.key))
+            textValues.add(localisation.value);
     for (const value of textValues) {
         for (const token of localisationIconTokens(value)) {
             for (const candidate of localisationIconSpriteCandidates(token))
@@ -372,6 +388,12 @@ export function referencedAssetPatternsForWindow(graph, windowName, additionalSp
         const match = /^\[([^\]]+)\]$/u.exec(image);
         return match?.[1] === undefined ? [] : [match[1]];
     }));
+    const usesCountryFlags = graph.scriptedGuis
+        .filter(({ name }) => relatedScriptedGuiNames.has(name))
+        .flatMap(({ propertyDefinitions }) => propertyDefinitions)
+        .some(({ attributes }) => Object.entries(attributes).some(([key, value]) => key.toLocaleLowerCase('en-US') === 'image' &&
+        typeof value === 'string' &&
+        /(?:^|\.)GetFlag\]$/u.test(value)));
     for (const definition of graph.scriptedLocalisation) {
         if (!dynamicImageTokens.has(definition.name))
             continue;
@@ -417,17 +439,41 @@ export function referencedAssetPatternsForWindow(graph, windowName, additionalSp
             ...manifest.sourceFrames.map(({ path: framePath }) => framePath),
         ]),
     ];
-    return [...new Set(references.flatMap(referenceVariants))].sort((left, right) => compareCodeUnits(left, right));
-}
-function scenarioSpriteNames(scenarios) {
     return [
-        ...new Set(scenarios.flatMap(({ values, scriptedGui }) => Object.entries({ ...scriptedGui, ...values })
-            .filter(([key, value]) => typeof value === 'string' &&
-            value.startsWith('GFX_') &&
-            (key.endsWith('.image') || !key.includes('.')))
-            .map(([, value]) => value))),
+        ...new Set([
+            ...references.flatMap(referenceVariants),
+            ...(usesCountryFlags
+                ? [
+                    'gfx/flags/*.{bmp,dds,png,tga}',
+                    'gfx/flags/medium/*.{bmp,dds,png,tga}',
+                    'gfx/flags/small/*.{bmp,dds,png,tga}',
+                ]
+                : []),
+        ]),
     ].sort((left, right) => compareCodeUnits(left, right));
 }
+function scenarioSpriteNames(scenarios, additionalText = []) {
+    const sprites = new Set();
+    const pending = [...scenarios, ...additionalText];
+    while (pending.length > 0) {
+        const value = pending.pop();
+        if (typeof value === 'string') {
+            if (/^GFX_[A-Za-z0-9_.:+-]+$/u.test(value))
+                sprites.add(value);
+            for (const token of localisationIconTokens(value))
+                for (const candidate of localisationIconSpriteCandidates(token))
+                    sprites.add(candidate);
+            continue;
+        }
+        if (value === null || typeof value !== 'object')
+            continue;
+        if (Array.isArray(value))
+            pending.push(...value);
+        else
+            pending.push(...Object.values(value));
+    }
+    return [...sprites].sort((left, right) => compareCodeUnits(left, right));
+}
 function bmFontPagePatterns(files) {
     const references = files.flatMap((file) => {
         if (!file.relativePath.toLowerCase().endsWith('.fnt') || file.shadowedBy !== undefined)
@@ -570,6 +616,14 @@ function fullImage(render) {
         throw new Error('GUI render did not produce an image.');
     return image;
 }
+function visualSceneKey(scene) {
+    const { id: _id, description: _description, ...scenario } = scene.scenario;
+    return hashCanonical({
+        windowName: scene.windowName,
+        sourceRevision: scene.sourceRevision,
+        scenario,
+    });
+}
 export function guiArtifactProvenance(graph, kind, primaryScene, scenarioScenes = [primaryScene], metadata = {}) {
     const { scenario } = primaryScene;
     const sourceEvidence = boundedSourceHashEvidence(graph.sourceHashes);
@@ -657,7 +711,7 @@ export class ScriptedGuiStudio {
             graph: buildGuiSourceGraph(retainedFiles, this.engine.indexFiles(retainedFiles)),
         };
         this.#graphCache.set(key, scanned);
-        while (this.#graphCache.size > 8) {
+        while (this.#graphCache.size > 1) {
             const oldest = this.#graphCache.keys().next().value;
             if (oldest === undefined)
                 break;
@@ -665,6 +719,10 @@ export class ScriptedGuiStudio {
         }
         return scanned;
     }
+    /** Release parsed GUI graphs after a bounded batch job has finished using the studio. */
+    clearCaches() {
+        this.#graphCache.clear();
+    }
     async scan(workspaceId, principal, signal, languages = ['l_english']) {
         signal?.throwIfAborted();
         const workspace = this.resolver.get(workspaceId, principal);
@@ -746,10 +804,10 @@ export class ScriptedGuiStudio {
         input.signal?.throwIfAborted();
         const placeholderScenario = parsePreviewScenario(input.scenario);
         const explicitRelatedScenarios = (input.relatedScenarios ?? []).map(parsePreviewScenario);
-        const scanned = await this.scanWindow(input.workspaceId, input.windowName, input.principal, input.signal, [placeholderScenario.language, ...explicitRelatedScenarios.map(({ language }) => language)], scenarioSpriteNames([placeholderScenario, ...explicitRelatedScenarios]));
         const generatedOptions = input.generatedScenarios === undefined
             ? 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));
         const generatedScenarios = generatedOptions === undefined
             ? []
             : generateGuiPreviewScenarios(scanned.graph, input.windowName, placeholderScenario, generatedOptions);
@@ -817,6 +875,9 @@ export class ScriptedGuiStudio {
         const requestedBaselineScenario = input.comparisonScenario === undefined
             ? undefined
             : parsePreviewScenario(input.comparisonScenario);
+        const generatedOptions = input.generatedScenarios === undefined
+            ? undefined
+            : parseGeneratedScenarioOptions(input.generatedScenarios);
         const scanned = await this.scanWindow(input.workspaceId, input.windowName, input.principal, input.signal, [
             placeholderScenario.language,
             ...(requestedBaselineScenario === undefined ? [] : [requestedBaselineScenario.language]),
@@ -825,10 +886,7 @@ export class ScriptedGuiStudio {
             placeholderScenario,
             ...(requestedBaselineScenario === undefined ? [] : [requestedBaselineScenario]),
             ...explicitRelatedScenarios,
-        ]));
-        const generatedOptions = input.generatedScenarios === undefined
-            ? undefined
-            : parseGeneratedScenarioOptions(input.generatedScenarios);
+        ], generatedOptions?.textSamples));
         const generatedScenarios = generatedOptions === undefined
             ? []
             : generateGuiPreviewScenarios(scanned.graph, input.windowName, placeholderScenario, generatedOptions);
@@ -846,6 +904,18 @@ export class ScriptedGuiStudio {
         const catalog = new GuiAssetCatalog(scanned.graph, scanned.files, budget, scenario.language);
         const scene = await buildGuiScene(scanned.graph, scanned.files, input.windowName, scenario, catalog);
         const render = await renderGuiScene(scene, undefined, input.signal, budget);
+        const fullRenderCache = new Map([
+            [visualSceneKey(scene), fullImage(render)],
+        ]);
+        const renderFull = async (target) => {
+            const key = visualSceneKey(target);
+            const cached = fullRenderCache.get(key);
+            if (cached !== undefined)
+                return cached;
+            const image = fullImage(await renderGuiScene(target, ['full'], input.signal, budget));
+            fullRenderCache.set(key, image);
+            return image;
+        };
         const scenarioScenes = [scene];
         const scenarioItems = [];
         for (const variantScenario of [scenario, ...relatedScenarios]) {
@@ -855,10 +925,7 @@ export class ScriptedGuiStudio {
                 : await buildGuiScene(scanned.graph, scanned.files, input.windowName, variantScenario, catalog);
             if (variantScene !== scene)
                 scenarioScenes.push(variantScene);
-            const variantRender = variantScene === scene
-                ? render
-                : await renderGuiScene(variantScene, ['full'], input.signal, new RenderBudget());
-            const image = fullImage(variantRender);
+            const image = variantScene === scene ? fullImage(render) : await renderFull(variantScene);
             scenarioItems.push({
                 label: variantScenario.description ?? variantScenario.id,
                 png: image.png,
@@ -873,8 +940,7 @@ export class ScriptedGuiStudio {
             const stateScenario = scenarioWith(scenario, { id: `${scenario.id}-${state}`, state });
             const stateScene = await buildGuiScene(scanned.graph, scanned.files, input.windowName, stateScenario, catalog);
             stateScenes.push(stateScene);
-            const stateRender = await renderGuiScene(stateScene, ['full'], input.signal, budget);
-            const image = fullImage(stateRender);
+            const image = await renderFull(stateScene);
             stateItems.push({ label: state, png: image.png, width: image.width, height: image.height });
         }
         const resolutionScenes = [];
@@ -895,8 +961,7 @@ export class ScriptedGuiStudio {
             });
             const resolutionScene = await buildGuiScene(scanned.graph, scanned.files, input.windowName, resolutionScenario, catalog);
             resolutionScenes.push(resolutionScene);
-            const resolutionRender = await renderGuiScene(resolutionScene, ['full'], input.signal, budget);
-            const image = fullImage(resolutionRender);
+            const image = await renderFull(resolutionScene);
             resolutionItems.push({
                 label: `${resolution.width}×${resolution.height} · UI ${uiScale}`,
                 png: image.png,
@@ -905,8 +970,8 @@ export class ScriptedGuiStudio {
             });
         }
         const baselineScene = await buildGuiScene(scanned.graph, scanned.files, input.windowName, baselineScenario, catalog);
-        const baselineRender = await renderGuiScene(baselineScene, ['full'], input.signal, budget);
-        const comparison = await compareGuiImages(fullImage(baselineRender).png, fullImage(render).png, budget, input.signal);
+        const baselineImage = await renderFull(baselineScene);
+        const comparison = await compareGuiImages(baselineImage.png, fullImage(render).png, budget, input.signal);
         const renderedSourceIds = [
             ...scenarioScenes,
             ...stateScenes,

package/dist/hoi4_agent_tools/mcp/tools/gui.js

@@ -391,7 +391,7 @@ export function registerGuiTools(server, engine, context) {
     });
     server.registerTool('hoi4.gui_render', {
         title: 'Render scripted GUI artifacts',
-        description: 'Render GUI states, resolutions, generated or explicit scenarios, hierarchy, comparisons, and diagnostics.',
+        description: 'Render GUI states, resolutions, generated or explicit scenarios, dynamic flags and text icons, hierarchy, comparisons, and diagnostics.',
         inputSchema: renderInput,
         outputSchema: guiRenderOutputSchema,
         annotations: artifactProducing,

package/dist/hoi4_agent_tools/mcp/tools/probability.js

@@ -18,7 +18,7 @@ const candidatePool = z.array(z.string().min(1).max(512)).max(100_000).optional(
 const outputs = z.array(probabilityOutputSchema).max(10).optional();
 const commonShape = {
     workspaceId: workspaceIdSchema,
-    adapter: probabilityAdapterIdSchema,
+    adapter: probabilityAdapterIdSchema.optional(),
     scenarioSet: nestedScenarios,
     candidatePool,
     horizonDays: z.number().positive().max(1_000_000).optional(),
@@ -51,7 +51,9 @@ const inspectInput = z
             code: 'custom',
             message: 'An adapter requires a source; provide a source alone to discover compatible adapters',
         });
-    if (value.customPoolManifest !== undefined && value.adapter !== 'custom_weighted_pool')
+    if (value.customPoolManifest !== undefined &&
+        value.adapter !== undefined &&
+        value.adapter !== 'custom_weighted_pool')
         context.addIssue({
             code: 'custom',
             path: ['adapter'],
@@ -71,7 +73,9 @@ const evaluateInput = z
             code: 'custom',
             message: 'Provide exactly one source or customPoolManifest',
         });
-    if (value.customPoolManifest !== undefined && value.adapter !== 'custom_weighted_pool')
+    if (value.customPoolManifest !== undefined &&
+        value.adapter !== undefined &&
+        value.adapter !== 'custom_weighted_pool')
         context.addIssue({
             code: 'custom',
             path: ['adapter'],
@@ -120,7 +124,7 @@ const sequenceInput = z
 const compareInput = z
     .object({
     workspaceId: workspaceIdSchema,
-    adapter: probabilityAdapterIdSchema,
+    adapter: probabilityAdapterIdSchema.optional(),
     before: nestedSource.optional(),
     after: nestedSource.optional(),
     beforeManifest: nestedManifest.optional(),
@@ -149,7 +153,7 @@ const compareInput = z
             code: 'custom',
             message: 'Custom-pool comparison requires beforeManifest and afterManifest',
         });
-    if (manifestMode && value.adapter !== 'custom_weighted_pool')
+    if (manifestMode && value.adapter !== undefined && value.adapter !== 'custom_weighted_pool')
         context.addIssue({
             code: 'custom',
             path: ['adapter'],

package/dist/hoi4_agent_tools/probability/service.js

@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { canonicalJson, compareCodeUnits, hashCanonical } from '../core/canonical.js';
 import { ClausewitzEvaluationDefinitions } from '../core/clausewitz-evaluation.js';
-import { probabilityDomainScanPatterns } from '../core/domain-scan-patterns.js';
+import { probabilityDomainScanPatterns, probabilitySharedDefinitionPatterns, } from '../core/domain-scan-patterns.js';
 import { publicArtifactLink } from '../core/artifacts.js';
 import { ServiceError } from '../core/result.js';
 import { PACKAGE_VERSION } from '../version.js';
@@ -17,6 +17,43 @@ import { Rational } from './rational.js';
 import { discoverWeightedSurface, inventoryWeightedSurfaces, } from './source-analysis.js';
 import { sweepSurface } from './sweep.js';
 const states = new WeakMap();
+function resolveSourceBackedAdapter(snapshot, source, candidatePool, requested) {
+    if (requested !== undefined && requested !== 'custom_weighted_pool') {
+        try {
+            discoverWeightedSurface(snapshot, requested, source, candidatePool);
+            return requested;
+        }
+        catch (error) {
+            if (!(error instanceof ServiceError) ||
+                (error.code !== 'PROBABILITY_SURFACE_EMPTY' &&
+                    error.code !== 'PROBABILITY_IDENTIFIER_NOT_FOUND'))
+                throw error;
+        }
+    }
+    const inventory = inventoryWeightedSurfaces(snapshot, source, candidatePool);
+    const viable = inventory.adapters
+        .filter(({ candidateCount, identifierMatchCount, candidatePoolMatchCount }) => candidateCount > 0 &&
+        (source.identifier === undefined || identifierMatchCount > 0) &&
+        (candidatePool.length === 0 || candidatePoolMatchCount > 0))
+        .sort((left, right) => right.identifierMatchCount - left.identifierMatchCount ||
+        right.candidatePoolMatchCount - left.candidatePoolMatchCount ||
+        right.candidateCount - left.candidateCount ||
+        compareCodeUnits(left.adapterId, right.adapterId));
+    if (viable.length === 1)
+        return viable[0].adapterId;
+    if (viable.length === 0)
+        throw new ServiceError('PROBABILITY_SURFACE_EMPTY', 'No weighted blocks matched this request', {
+            requestedAdapter: requested,
+            source,
+            candidatePool,
+            availableAdapters: inventory.adapters.filter(({ candidateCount }) => candidateCount > 0),
+        });
+    throw new ServiceError('PROBABILITY_ADAPTER_AMBIGUOUS', 'Several weighted adapters match this source; select one adapter or narrow the source by identifier or line', {
+        requestedAdapter: requested,
+        source,
+        matchingAdapters: viable,
+    });
+}
 function analyzerState(engine) {
     let state = states.get(engine);
     if (state === undefined) {
@@ -649,12 +686,19 @@ export class ProbabilityAnalyzer {
         this.engine = engine;
         this.state = analyzerState(engine);
     }
-    async scan(context, sourcePaths = []) {
+    async scan(context, sourcePaths = [], emptyScope = 'domain') {
         if (context.refresh === true)
             this.engine.invalidate(context.workspaceId);
         const workspace = this.engine.resolver.get(context.workspaceId, context.principal);
+        const selectedSourcePaths = sourcePaths.filter((sourcePath) => sourcePath !== undefined);
         return this.engine.scan(context.workspaceId, {
-            patterns: probabilityDomainScanPatterns(workspace, sourcePaths.filter((sourcePath) => sourcePath !== undefined)),
+            patterns: selectedSourcePaths.length > 0
+                ? probabilityDomainScanPatterns(workspace, selectedSourcePaths)
+                : emptyScope === 'domain'
+                    ? probabilityDomainScanPatterns(workspace)
+                    : emptyScope === 'shared'
+                        ? probabilitySharedDefinitionPatterns()
+                        : [],
         }, context.principal, context.signal);
     }
     async verifyGameVersion(context, adapter) {
@@ -714,6 +758,14 @@ export class ProbabilityAnalyzer {
         return {
             workspaceId: context.workspaceId,
             workspaceIdentity: workspace.workspaceIdentity,
+            ...(typeof extra.sourceScope === 'string'
+                ? {
+                    sourceScope: extra.sourceScope,
+                }
+                : {}),
+            ...(Array.isArray(extra.sourcePaths) && extra.sourcePaths.length > 0
+                ? { sourcePaths: extra.sourcePaths }
+                : {}),
             sourceRevision: snapshot.revision,
             sourceHash: surface.sourceHash,
             scenarioHash,
@@ -838,9 +890,11 @@ export class ProbabilityAnalyzer {
             return { adapters: probabilityAdapters(), artifacts: [], filesScanned: [] };
         if (customPoolManifest !== undefined && source !== undefined)
             throw new ServiceError('PROBABILITY_INPUT_AMBIGUOUS', 'Provide either source or customPoolManifest for inspection');
-        if (customPoolManifest !== undefined && adapter !== 'custom_weighted_pool')
+        if (customPoolManifest !== undefined &&
+            adapter !== undefined &&
+            adapter !== 'custom_weighted_pool')
             throw new ServiceError('PROBABILITY_ADAPTER_MISMATCH', 'customPoolManifest inspection requires adapter custom_weighted_pool');
-        const snapshot = await this.scan(context, [source?.path]);
+        const snapshot = await this.scan(context, [source?.path], source === undefined ? 'none' : source.inlineClausewitz === undefined ? 'domain' : 'shared');
         if (customPoolManifest !== undefined) {
             const surface = customSurface(customPoolManifest, snapshot.revision);
             const gameVersionVerification = await this.verifyGameVersion(context, 'custom_weighted_pool');
@@ -1025,20 +1079,31 @@ export class ProbabilityAnalyzer {
         const usingManifest = request.customPoolManifest !== undefined;
         if (usingManifest !== (request.source === undefined))
             throw new ServiceError('PROBABILITY_INPUT_AMBIGUOUS', 'Provide exactly one source or customPoolManifest');
-        if (usingManifest && request.adapter !== 'custom_weighted_pool')
+        if (usingManifest &&
+            request.adapter !== undefined &&
+            request.adapter !== 'custom_weighted_pool')
             throw new ServiceError('PROBABILITY_ADAPTER_MISMATCH', 'customPoolManifest requires the custom_weighted_pool adapter');
-        if (!usingManifest && request.adapter === 'custom_weighted_pool')
-            throw new ServiceError('PROBABILITY_MANIFEST_REQUIRED', 'custom_weighted_pool requires customPoolManifest');
-        const gameVersionVerification = await this.verifyGameVersion(request, request.adapter);
-        const snapshot = await this.scan(request, [request.source?.path]);
+        const snapshot = await this.scan(request, [request.source?.path], usingManifest ? 'none' : request.source?.inlineClausewitz === undefined ? 'domain' : 'shared');
+        const resolvedAdapter = usingManifest
+            ? 'custom_weighted_pool'
+            : resolveSourceBackedAdapter(snapshot, request.source, request.candidatePool ?? [], request.adapter);
+        const gameVersionVerification = await this.verifyGameVersion(request, resolvedAdapter);
         const surface = usingManifest
             ? customSurface(request.customPoolManifest, snapshot.revision)
-            : discoverWeightedSurface(snapshot, request.adapter, request.source, request.candidatePool ?? []);
+            : discoverWeightedSurface(snapshot, resolvedAdapter, request.source, request.candidatePool ?? []);
         const definitions = ClausewitzEvaluationDefinitions.build(snapshot);
         const metadata = this.metadata(request, snapshot, surface, request.scenarioSet, usingManifest
             ? request.customPoolManifest.candidates.map(({ id }) => id)
             : (request.candidatePool ?? []), gameVersionVerification, {
             operation,
+            sourceScope: request.source?.path !== undefined
+                ? 'file'
+                : request.source?.inlineClausewitz !== undefined
+                    ? 'shared'
+                    : request.source !== undefined
+                        ? 'domain'
+                        : 'none',
+            sourcePaths: request.source?.path === undefined ? [] : [request.source.path],
             horizonDays: request.horizonDays,
             requestedMetrics: request.metrics,
             acceptanceBands: request.acceptanceBands,
@@ -1167,7 +1232,7 @@ export class ProbabilityAnalyzer {
     }
     async sequence(request) {
         request.signal?.throwIfAborted();
-        const snapshot = await this.scan(request);
+        const snapshot = await this.scan(request, [], 'none');
         const surface = customSurface(request.customPoolManifest, snapshot.revision);
         const gameVersionVerification = await this.verifyGameVersion(request, 'custom_weighted_pool');
         const metadata = this.metadata(request, snapshot, surface, request.scenarioSet, request.customPoolManifest.candidates.map(({ id }) => id), gameVersionVerification, {
@@ -1334,8 +1399,10 @@ export class ProbabilityAnalyzer {
             return this.store(stale, ['json'], false, request.signal, request.principal);
         }
         await this.verifyGameVersion(request, result.adapter.id);
-        const snapshot = await this.scan(request);
-        if (snapshot.revision !== result.metadata.sourceRevision) {
+        const snapshot = result.metadata.sourceScope === undefined || result.metadata.sourceScope === 'none'
+            ? undefined
+            : await this.scan(request, result.metadata.sourcePaths ?? [], result.metadata.sourceScope === 'shared' ? 'shared' : 'domain');
+        if (snapshot !== undefined && snapshot.revision !== result.metadata.sourceRevision) {
             const stale = {
                 ...result,
                 status: 'stale',

package/dist/hoi4_agent_tools/schemas/probability.js

@@ -737,6 +737,8 @@ const probabilityMetadataSchema = z
     .object({
     workspaceId: z.string(),
     workspaceIdentity: z.string(),
+    sourceScope: z.enum(['file', 'shared', 'domain', 'none']).optional(),
+    sourcePaths: z.array(z.string()).max(100_000).optional(),
     sourceRevision: z.string(),
     sourceHash: z.string(),
     scenarioHash: z.string(),

package/dist/hoi4_agent_tools/technology/compare.js

@@ -4,12 +4,17 @@ function byId(values) {
 }
 function placementSignature(values) {
     return hashCanonical(values
-        .map(({ folderId, x, y, xExpression, yExpression }) => ({
+        .map(({ folderId, x, y, xExpression, yExpression, layoutSize, layoutWidth, layoutHeight, layoutOffsetX, layoutOffsetY, }) => ({
         folderId,
         x: x ?? null,
         y: y ?? null,
         xExpression: xExpression ?? null,
         yExpression: yExpression ?? null,
+        layoutSize: layoutSize ?? null,
+        layoutWidth: layoutWidth ?? null,
+        layoutHeight: layoutHeight ?? null,
+        layoutOffsetX: layoutOffsetX ?? null,
+        layoutOffsetY: layoutOffsetY ?? null,
     }))
         .sort((left, right) => compareCodeUnits(left.folderId, right.folderId) ||
         (left.x ?? 0) - (right.x ?? 0) ||

package/dist/hoi4_agent_tools/technology/graph.js

@@ -155,7 +155,51 @@ function activeGridboxes(values) {
         .sort((left, right) => compareCodeUnits(left.folderId ?? '', right.folderId ?? '') ||
         compareCodeUnits(left.name, right.name));
 }
-function enrichPlacements(placements, edges, gridboxes, signal) {
+function activeItemLayouts(values) {
+    const groups = new Map();
+    for (const layout of values) {
+        const key = `${layout.folderId}\0${layout.layoutSize}`;
+        const group = groups.get(key) ?? [];
+        group.push(layout);
+        groups.set(key, group);
+    }
+    return [...groups.values()]
+        .map((group) => group.sort((left, right) => right.loadOrder - left.loadOrder ||
+        compareCodeUnits(left.sourcePath, right.sourcePath) ||
+        left.location.start.offset - right.location.start.offset)[0])
+        .sort((left, right) => compareCodeUnits(left.folderId, right.folderId) ||
+        compareCodeUnits(left.layoutSize, right.layoutSize));
+}
+function activeYearMarkers(values) {
+    const groups = new Map();
+    for (const marker of values) {
+        const key = `${marker.folderId}\0${marker.name}`;
+        const group = groups.get(key) ?? [];
+        group.push(marker);
+        groups.set(key, group);
+    }
+    return [...groups.values()]
+        .map((group) => group.sort((left, right) => right.loadOrder - left.loadOrder ||
+        compareCodeUnits(left.sourcePath, right.sourcePath) ||
+        left.location.start.offset - right.location.start.offset)[0])
+        .sort((left, right) => compareCodeUnits(left.folderId, right.folderId) ||
+        left.year - right.year ||
+        compareCodeUnits(left.name, right.name));
+}
+function enrichPlacements(placements, edges, gridboxes, technologies, unlocks, itemLayouts, signal) {
+    const technologyById = new Map(technologies.map((technology) => [technology.id, technology]));
+    const unlockKindsByTechnology = new Map();
+    for (const unlock of unlocks) {
+        const kinds = unlockKindsByTechnology.get(unlock.technologyId) ?? new Set();
+        kinds.add(unlock.kind);
+        unlockKindsByTechnology.set(unlock.technologyId, kinds);
+    }
+    const layoutsByFolder = new Map();
+    for (const layout of itemLayouts) {
+        const layouts = layoutsByFolder.get(layout.folderId) ?? new Map();
+        layouts.set(layout.layoutSize, layout);
+        layoutsByFolder.set(layout.folderId, layouts);
+    }
     const placementsByTechnology = new Map();
     for (const placement of placements) {
         const group = placementsByTechnology.get(placement.technologyId) ?? [];
@@ -198,6 +242,15 @@ function enrichPlacements(placements, edges, gridboxes, signal) {
             : gridboxes.filter(({ name, folderId }) => name === expectedGridbox &&
                 (folderId === undefined || folderId === placement.folderId));
         const gridbox = candidates[0];
+        const technology = technologyById.get(placement.technologyId);
+        const folderLayouts = layoutsByFolder.get(placement.folderId);
+        const unlockKinds = unlockKindsByTechnology.get(placement.technologyId) ?? new Set();
+        const unlocksEquipment = unlockKinds.has('equipment') || unlockKinds.has('equipment_module');
+        const layoutSize = technology?.layoutSize === 'small' ||
+            (folderLayouts?.has('small') === true && !unlocksEquipment)
+            ? 'small'
+            : 'large';
+        const itemLayout = folderLayouts?.get(layoutSize) ?? folderLayouts?.get('large');
         let pixelX;
         let pixelY;
         if (gridbox !== undefined &&
@@ -223,6 +276,12 @@ function enrichPlacements(placements, edges, gridboxes, signal) {
             ...(gridbox === undefined ? {} : { gridboxId: gridbox.id }),
             ...(pixelX === undefined ? {} : { pixelX }),
             ...(pixelY === undefined ? {} : { pixelY }),
+            layoutSize,
+            ...(itemLayout === undefined ? {} : { itemLayoutId: itemLayout.id }),
+            ...(itemLayout?.size.width === undefined ? {} : { layoutWidth: itemLayout.size.width }),
+            ...(itemLayout?.size.height === undefined ? {} : { layoutHeight: itemLayout.size.height }),
+            ...(itemLayout?.position.x === undefined ? {} : { layoutOffsetX: itemLayout.position.x }),
+            ...(itemLayout?.position.y === undefined ? {} : { layoutOffsetY: itemLayout.position.y }),
             geometryStatus: pixelX !== undefined && pixelY !== undefined
                 ? 'source_pixel'
                 : placement.x !== undefined && placement.y !== undefined
@@ -1093,6 +1152,8 @@ export function buildTechnologyGraph(snapshot, options) {
     const selectedFolders = activeDefinitions(fragments.flatMap(({ folders }) => folders));
     const folders = localiseFolders(selectedFolders.active, snapshot.index);
     const gridboxes = activeGridboxes(fragments.flatMap(({ gridboxes }) => gridboxes));
+    const itemLayouts = activeItemLayouts(fragments.flatMap(({ itemLayouts }) => itemLayouts));
+    const yearMarkers = activeYearMarkers(fragments.flatMap(({ yearMarkers }) => yearMarkers));
     const categories = activeCategories(fragments.flatMap(({ categories }) => categories));
     const selectedDoctrines = activeDefinitions(fragments.flatMap(({ doctrineDefinitions }) => doctrineDefinitions));
     const doctrineDefinitions = localiseDoctrines(selectedDoctrines.active, snapshot.index, assets);
@@ -1102,8 +1163,8 @@ export function buildTechnologyGraph(snapshot, options) {
     const unlockTargets = selectedTargets.active;
     const basePlacements = selectOwnedRecords(fragments.flatMap(({ placements }) => placements), ({ technologyId }) => technologyId, ({ location }) => location, technologyById).sort((left, right) => compareCodeUnits(left.id, right.id));
     const edges = selectOwnedRecords(fragments.flatMap(({ edges }) => edges), ({ from }) => from, ({ location }) => location, technologyById).sort((left, right) => compareCodeUnits(left.id, right.id));
-    const placements = enrichPlacements(basePlacements, edges, gridboxes, options.signal);
     const unlocks = resolveUnlocks(selectOwnedRecords(fragments.flatMap(({ unlocks }) => unlocks), ({ technologyId }) => technologyId, ({ location }) => location, technologyById).sort((left, right) => compareCodeUnits(left.id, right.id)), unlockTargets, snapshot.complete);
+    const placements = enrichPlacements(basePlacements, edges, gridboxes, technologies, unlocks, itemLayouts, options.signal);
     const unresolved = fragments.flatMap(({ unresolved }) => unresolved);
     const helperCalls = fragments.flatMap(({ helperCalls }) => helperCalls);
     const externalReferences = expandHelperReferences(fragments.flatMap(({ externalReferences }) => externalReferences), helperCalls, unresolved, options.analysisMode ?? 'full', options.signal);
@@ -1167,6 +1228,8 @@ export function buildTechnologyGraph(snapshot, options) {
         folders,
         placements,
         gridboxes,
+        itemLayouts,
+        yearMarkers,
         edges,
         categories,
         doctrineDefinitions,
@@ -1183,6 +1246,8 @@ export function buildTechnologyGraph(snapshot, options) {
             folderCount: folders.length,
             placementCount: placements.length,
             gridboxCount: gridboxes.length,
+            itemLayoutCount: itemLayouts.length,
+            yearMarkerCount: yearMarkers.length,
             prerequisiteCount: edges.filter(({ kind }) => kind === 'prerequisite').length,
             exclusiveCount: edges.filter(({ kind }) => kind === 'exclusive').length,
             categoryCount: categories.length,

package/dist/hoi4_agent_tools/technology/model.js

@@ -1,2 +1,2 @@
-export const TECHNOLOGY_GRAPH_SCHEMA_VERSION = 1;
+export const TECHNOLOGY_GRAPH_SCHEMA_VERSION = 2;
 export const TECHNOLOGY_PARSER_VERSION = 'clausewitz-cst.v1';

package/dist/hoi4_agent_tools/technology/queries.js

@@ -15,6 +15,8 @@ function technologyRecordCount(graph) {
         graph.categories.length +
         graph.placements.length +
         graph.gridboxes.length +
+        graph.itemLayouts.length +
+        graph.yearMarkers.length +
         graph.edges.length +
         graph.unlocks.length +
         graph.unlockTargets.length +
@@ -62,6 +64,8 @@ export function technologyScanReport(graph, fullGraphRecordLimit = TECHNOLOGY_SC
             categories: graph.categories.length,
             placements: graph.placements.length,
             gridboxes: graph.gridboxes.length,
+            itemLayouts: graph.itemLayouts.length,
+            yearMarkers: graph.yearMarkers.length,
             edges: graph.edges.length,
             unlocks: graph.unlocks.length,
             unlockTargets: graph.unlockTargets.length,