mirror of
https://github.com/koala73/worldmonitor.git
synced 2026-04-25 17:14:57 +02:00
08a5eb77a5
* fix(intelligence): region-scope signals and chokepoint evidence Two review findings on PR #2940 caused MENA/SSA snapshots to silently drop broad cross-source signals and leak foreign chokepoint events into every region's evidence chain. P1 - theater label matching seed-cross-source-signals.mjs normalizes raw values to broad display labels like "Middle East" and "Sub-Saharan Africa". The consumer side compared these against region.theaters kebab IDs (levant, persian-gulf, horn-of-africa). "middle east" does not substring-match any of those, so every MENA signal emitted with the broad label was silently dropped from coercive_pressure and the evidence chain. Same for SSA. Added signalAliases per region and a shared isSignalInRegion helper in shared/geography.js. Both balance-vector.mjs and evidence-collector.mjs now route signals through the helper, which normalizes both sides and matches against theater IDs or region aliases. P2 - chokepoint region leak evidence-collector.mjs:62 iterated every chokepoint in the payload without filtering by regionId, so Taiwan Strait, Baltic, and Panama threat events surfaced in MENA and SSA evidence chains. Now derives the allowed chokepoint ID set from getRegionCorridors(regionId) and skips anything not owned by the region. Added 15 unit tests covering: broad-label matching, kebab/spaced input, cross-region rejection, and the chokepoint filter for MENA/East Asia/ Europe/SSA. * fix(intelligence): address Greptile P2 review findings on #2952 Two P2 findings from Greptile on the region-scoping PR. 1) Drop 'eu' short alias from europe.signalAliases `isSignalInRegion` uses substring matching, and bare 'eu' would match any theater label containing those two letters ('fuel', 'neutral zone', 'feudal'). Replaced with 'european union' which is long enough to be unambiguous. No seed currently emits a bare 'eu' label, so this is pure hardening. 2) Make THEATERS.corridorIds live data via getRegionCorridors union horn-of-africa declared corridorIds: ['babelm'] and caribbean declared corridorIds: ['panama'], but `getRegionCorridors` only consulted CORRIDORS.theaterId — so those entries were dead data. After yesterday's region-scoped chokepoint filter, Bab el-Mandeb threat events landed ONLY in MENA evidence (via the primary red-sea theater), never in SSA, even though the corridor physically borders Djibouti/Eritrea. Same for Panama missing from LatAm. `getRegionCorridors` now unions direct theater membership (via CORRIDORS.theaterId) with indirect claims (via THEATERS.corridorIds), de-duplicated by corridor id. This reflects geopolitical reality: - MENA + SSA both see babelm threat events - NA + LatAm both see panama threat events Scoring impact: SSA maritime_access now weighs babelm (weight 0.9), LatAm maritime_access now weighs panama (weight 0.6). These were missing buffers under the pre-fix model. Added regression tests for both new paths. The existing "SSA evidence has no chokepoints" test was inverted to assert SSA now DOES include babelm (and excludes MENA/East Asia corridors).
69 lines
2.3 KiB
TypeScript
69 lines
2.3 KiB
TypeScript
// Type declarations for shared/geography.js.
|
|
// See shared/regions.types.d.ts for the snapshot model types.
|
|
|
|
import type { RegionId } from './regions.types.js';
|
|
|
|
export interface RegionDef {
|
|
id: RegionId;
|
|
label: string;
|
|
forecastLabel: string;
|
|
wbCode: string;
|
|
theaters: string[];
|
|
/**
|
|
* Broad display labels emitted by cross-source feeds that do not substring-
|
|
* match any fine-grained theater ID. Lowercased so the matching helper can
|
|
* compare directly. Example: MENA includes "middle east", SSA includes
|
|
* "sub-saharan africa".
|
|
*/
|
|
signalAliases: string[];
|
|
feedRegion: string;
|
|
mapView: string;
|
|
keyCountries: string[];
|
|
}
|
|
|
|
export interface TheaterDef {
|
|
id: string;
|
|
label: string;
|
|
regionId: RegionId;
|
|
corridorIds: string[];
|
|
}
|
|
|
|
export interface CorridorDef {
|
|
id: string;
|
|
label: string;
|
|
theaterId: string;
|
|
/** Maps to existing chokepoint IDs in supply_chain:chokepoints:v4. Null for non-chokepoint corridors (Cape route, English Channel). */
|
|
chokepointId: string | null;
|
|
/** 1 = critical global, 2 = major regional, 3 = secondary/reroute */
|
|
tier: 1 | 2 | 3;
|
|
/** 0-1 normalized weight for maritime_access scoring */
|
|
weight: number;
|
|
}
|
|
|
|
export const REGION_IDS: RegionId[];
|
|
export const GEOGRAPHY_VERSION: string;
|
|
export const REGIONS: readonly RegionDef[];
|
|
export const THEATERS: readonly TheaterDef[];
|
|
export const CORRIDORS: readonly CorridorDef[];
|
|
export const COUNTRY_CRITICALITY: Record<string, number>;
|
|
export const DEFAULT_COUNTRY_CRITICALITY: number;
|
|
|
|
export function getRegion(regionId: string): RegionDef | null;
|
|
export function getRegionCountries(regionId: string): string[];
|
|
export function regionForCountry(iso2: string): RegionId | null;
|
|
export function getRegionTheaters(regionId: string): TheaterDef[];
|
|
export function getTheaterCorridors(theaterId: string): CorridorDef[];
|
|
export function getRegionCorridors(regionId: string): CorridorDef[];
|
|
export function countryCriticality(iso2: string): number;
|
|
|
|
/**
|
|
* Returns true when a cross-source signal's raw `theater` label belongs to
|
|
* the given region. Case-insensitive, tolerates kebab-case or spaced labels,
|
|
* and matches against both fine-grained theater IDs and the region's
|
|
* `signalAliases` for broad display labels.
|
|
*/
|
|
export function isSignalInRegion(
|
|
theater: string | null | undefined,
|
|
regionOrId: string | RegionDef,
|
|
): boolean;
|