Merge main into feat/voice-outlines

Adopts main's loadBundledJson(url, {signal}) and builds the Census and Who's On First pack URLs when they are read, not at import.
2026-11-05 19:04:02 +00:00 · 2026-10-03 23:09:03 -07:00
commit 41b2475362
@@ -402,10 +402,10 @@ async function build() {
 function filesModule(list) {
  const lines = [
    '// Generated by scripts/build-census-places.mjs; do not edit.',
-    "export const INDEX_URL = new URL('./index.json', import.meta.url);",
+    "export const INDEX_URL = () => new URL('./index.json', import.meta.url);",
    'export const STATE_URLS = {',
    ...list.map(
-      (s) => `  ${s.st}: new URL('./${s.st}.json', import.meta.url),`,
+      (s) => `  ${s.st}: () => new URL('./${s.st}.json', import.meta.url),`,
    ),
    '};',
  ];
@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+/**
+ * Build the MCP Apps panel: the app under dist/panel, served at /panel/.
+ * See build/panel.js.
+ */
+
+import { readFile, rename, rm, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { build } from 'vite';
+import standaloneConfig from '../server/standalone/vite.config.js';
+import {
+  PANEL_BASE,
+  PANEL_OUT_DIR,
+  PANEL_WORKER_FILES,
+  PANEL_WORKER_PRELUDE_PATH,
+  panelBuildConfig,
+  workerFilesPrelude,
+} from '../build/panel.js';
+
+const root = fileURLToPath(new URL('../', import.meta.url));
+const outDir = join(root, PANEL_OUT_DIR);
+
+const config = standaloneConfig({ command: 'build', mode: 'production' });
+await build({
+  configFile: false,
+  root,
+  ...panelBuildConfig(config),
+});
+
+// Cesium's plugin copies its files under the base path inside outDir.
+const nested = join(outDir, PANEL_BASE, 'cesium');
+await rm(join(outDir, 'cesium'), { recursive: true, force: true });
+await rename(nested, join(outDir, 'cesium'));
+await rm(join(outDir, PANEL_BASE.split('/')[1]), { recursive: true });
+
+// Cesium's workers load these files themselves; embed them in a prelude the
+// panel runs ahead of Cesium's workers script.
+const files = {};
+for (const name of PANEL_WORKER_FILES)
+  files[name] = await readFile(join(outDir, 'cesium', name), 'utf8');
+await writeFile(
+  join(outDir, PANEL_WORKER_PRELUDE_PATH),
+  workerFilesPrelude(files),
+);
+console.log(`Panel build written to ${PANEL_OUT_DIR}`);
@@ -352,9 +352,9 @@ def main():
    # Literal URLs, so a bundler emits every tile as an asset.
    out['files.js'] = '\n'.join([
        '// Generated by scripts/build-wof-neighborhoods.py; do not edit.',
-        "export const INDEX_URL = new URL('./index.json', import.meta.url);",
+        "export const INDEX_URL = () => new URL('./index.json', import.meta.url);",
        'export const TILE_URLS = {',
-        *[f"  t{t['key']}: new URL('./{t['key']}.json', import.meta.url)," for t in tile_list],
+        *[f"  t{t['key']}: () => new URL('./{t['key']}.json', import.meta.url)," for t in tile_list],
        '};',
    ]) + '\n'
    if args.verify:
@@ -37,6 +37,10 @@ const portableExport = (key) =>
  ) ||
  [
    './director',
+    './tools',
+    './tools/mcp',
+    './tools/services',
+    './view',
    './voice/action-schemas',
    './voice/session',
    './data/lifecycle',
@@ -60,6 +60,7 @@
  "server/standalone/vite.config.js",
  "vite.config.js",
  "src/tooling/viteBuild.test.mjs",
+  "src/tooling/allowedHosts.test.mjs",
  "server/providers/common/http.js",
  "server/providers/common/query.js",
  "server/providers/aircraft/opensky.js",
@@ -81,6 +82,7 @@
  "server/providers/places/routes.js",
  "src/data/placeProviderPayloads.js",
  "src/tooling/placeProviders.test.mjs",
+  "server/providers/common/same-site.js",
  "server/providers/space.js",
  "server/providers/space/celestrak.js",
  "server/providers/space/launch-library.js",
@@ -869,5 +871,34 @@
  "src/layers/traffic/motion.test.mjs",
  "scripts/qa-journey-recorder.mjs",
  "scripts/qa-alpr-journey.mjs",
-  "scripts/qa-context-arrivals.mjs"
+  "scripts/qa-context-arrivals.mjs",
+  "src/tools/catalog.test.mjs",
+  "src/tools/area.test.mjs",
+  "src/tools/queries/queries.test.mjs",
+  "src/tools/mcp/mcp.test.mjs",
+  "src/tools/localServer.test.mjs",
+  "src/tools/queries/aviation.test.mjs",
+  "src/tools/queries/space.test.mjs",
+  "src/tools/queries/media.test.mjs",
+  "src/tools/queries/places.test.mjs",
+  "src/layers/transit/source.test.mjs",
+  "src/tools/queries/mobility.test.mjs",
+  "src/tools/queries/environment.test.mjs",
+  "src/tools/queries/maritime.test.mjs",
+  "src/tools/queries/share.test.mjs",
+  "src/tools/localRoute.test.mjs",
+  "src/tools/queries/atmosphere.test.mjs",
+  "src/tools/queries/imagery.test.mjs",
+  "src/tools/queries/cables.test.mjs",
+  "src/tools/queries/surveillance.test.mjs",
+  "src/tools/queries/infrastructure.test.mjs",
+  "src/tools/queries/events.test.mjs",
+  "src/tools/functions.test.mjs",
+  "src/tools/surfaces.test.mjs",
+  "src/tools/places.test.mjs",
+  "src/view/index.test.mjs",
+  "src/tools/views.test.mjs",
+  "src/app/embed.test.mjs",
+  "src/tools/globePanel.test.mjs",
+  "src/costEndpointThrottle.test.mjs"
 ]
@@ -10,7 +10,8 @@
      "src/data/localGeojsonCore.js",
      "src/data/localGeojsonLod.js",
      "src/data/inputOwnership.js",
-      "src/data/infrastructureOverlayEntry.js"
+      "src/data/infrastructureOverlayEntry.js",
+      "src/sources/infrastructureData.js"
    ],
    "external": ["cesium"]
  },
@@ -27,7 +28,13 @@
  "vite-build": {
    "runtime": "node",
    "exports": ["./build/vite", "./build/html"],
-    "modules": ["build/vite.js", "build/application-html.js"],
+    "modules": [
+      "build/vite.js",
+      "build/application-html.js",
+      "build/allowedHosts.js",
+      "build/embed-framing.js",
+      "build/panel.js"
+    ],
    "external": ["vite-plugin-cesium"]
  },
  "live-providers": {
@@ -68,6 +75,8 @@
      "server/providers/common/http.js",
      "scripts/google-server-key.mjs",
      "src/data/placeProviderPayloads.js",
+      "server/providers/common/same-site.js",
+      "src/localRequestGate.mjs",
      "src/data/routeSteps.js",
      "src/sources/httpBody.js",
      "src/sources/rateLimit.js"
@@ -284,6 +293,8 @@
      "src/loadingFeedback.js",
      "src/data/installationFeedback.js",
      "src/voice/voiceCost.js",
+      "server/providers/common/same-site.js",
+      "src/localRequestGate.mjs",
      "src/voice/actionSchemas.js",
      "server/providers/openai/toolDescriptions.js",
      "src/sources/rateLimit.js"
@@ -298,6 +309,7 @@
      "server/providers/common/source-root.js",
      "server/standalone/key-setup.js",
      "src/keySetupCore.mjs",
+      "src/localRequestGate.mjs",
      "server/standalone/key-setup-hardening.mjs"
    ],
    "external": []
@@ -382,7 +394,8 @@
      "src/ui/mapSource.js",
      "src/ui/mapSourceControls.js",
      "src/mapStackChips.js",
-      "src/keySetupCore.mjs"
+      "src/keySetupCore.mjs",
+      "src/localRequestGate.mjs"
    ],
    "external": []
  },
@@ -401,6 +414,7 @@
      "src/loadingFeedback.js",
      "src/data/installationFeedback.js",
      "src/keySetupCore.mjs",
+      "src/localRequestGate.mjs",
      "src/data/feedState.js",
      "src/data/layerSnapshot.js"
    ],
@@ -516,10 +530,12 @@
      "src/data/detectionPolicy.js",
      "src/data/installationFeedback.js",
      "src/data/layerState.js",
+      "src/data/layerStateCoordinator.js",
      "src/data/layerStateTokenReservations.json",
      "src/data/militaryAwarenessEngine.js",
      "src/data/scenePick.js",
      "src/keySetupCore.mjs",
+      "src/localRequestGate.mjs",
      "src/loadingFeedback.js",
      "src/locationStatus.js",
      "src/mapStackChips.js",
@@ -837,6 +853,7 @@
      "src/data/contactMatch.js",
      "src/data/iconOrientation.js",
      "src/data/layerState.js",
+      "src/data/layerStateCoordinator.js",
      "src/data/layerStateTokenReservations.json",
      "src/data/modelVisualAnchor.js",
      "src/data/motionModel.js",
@@ -857,6 +874,8 @@
      "src/layers/vessels/evidence.js",
      "src/layers/vessels/index.js",
      "src/layers/vessels/ingestion.js",
+      "src/layers/vessels/cameraArea.js",
+      "src/layers/vessels/viewArea.js",
      "src/layers/vessels/lifecycle.js",
      "src/layers/vessels/policy.js",
      "src/layers/vessels/queries.js",
@@ -925,6 +944,7 @@
      "src/data/issPass.js",
      "src/data/satelliteClass.js",
      "src/data/satellitePass.js",
+      "src/sources/tle.js",
      "src/layers/satellites/catalog.js",
      "src/layers/satellites/controls.js",
      "src/layers/satellites/index.js",
@@ -1082,6 +1102,7 @@
      "src/layers/bikeshare/ingestion.js",
      "src/layers/bikeshare/lifecycle.js",
      "src/layers/bikeshare/model.js",
+      "src/sources/gbfsStations.js",
      "src/layers/bikeshare/policy.js",
      "src/layers/bikeshare/queries.js",
      "src/layers/bikeshare/registry.js",
@@ -1254,6 +1275,7 @@
      "src/maps/terrain.js",
      "src/maps/terrainRetry.js",
      "src/keySetupCore.mjs",
+      "src/localRequestGate.mjs",
      "src/maps/imageryHost.js"
    ],
    "external": ["cesium"]
@@ -1439,6 +1461,7 @@
      "src/data/issPass.js",
      "src/data/labelArbiter.js",
      "src/data/layerState.js",
+      "src/data/layerStateCoordinator.js",
      "src/data/layerStateTokenReservations.json",
      "src/data/lifecycle.js",
      "src/data/localGeojson.js",
@@ -1504,6 +1527,7 @@
      "src/hudSummaryResponse.js",
      "src/keySetup.js",
      "src/keySetupCore.mjs",
+      "src/localRequestGate.mjs",
      "src/keylessGeocoder.js",
      "src/layers/aircraft/classification.js",
      "src/layers/alpr/index.js",
@@ -1534,6 +1558,7 @@
      "src/layers/bikeshare/ingestion.js",
      "src/layers/bikeshare/lifecycle.js",
      "src/layers/bikeshare/model.js",
+      "src/sources/gbfsStations.js",
      "src/layers/bikeshare/policy.js",
      "src/layers/bikeshare/queries.js",
      "src/layers/bikeshare/registry.js",
@@ -1668,6 +1693,7 @@
      "src/layers/satellites/labels.js",
      "src/layers/satellites/lifecycle.js",
      "src/layers/satellites/orbits.js",
+      "src/sources/tle.js",
      "src/layers/satellites/records.js",
      "src/layers/satellites/policy.js",
      "src/layers/satellites/rendering.js",
@@ -1709,7 +1735,9 @@
      "src/layers/vessels/cards.js",
      "src/layers/vessels/evidence.js",
      "src/layers/vessels/index.js",
+      "src/layers/vessels/cameraArea.js",
      "src/layers/vessels/ingestion.js",
+      "src/layers/vessels/viewArea.js",
      "src/layers/vessels/lifecycle.js",
      "src/layers/vessels/policy.js",
      "src/layers/vessels/queries.js",
@@ -2036,7 +2064,12 @@
      "src/sources/requestDeadline.js",
      "src/data/local_data/osm_military_names/names.json",
      "src/layers/installations/namedMarkers.js",
-      "src/data/infrastructureOverlayEntry.js"
+      "src/data/infrastructureOverlayEntry.js",
+      "src/sources/infrastructureData.js",
+      "src/tools/functions.js",
+      "src/voice/actionSchemas.js",
+      "src/view/index.js",
+      "src/app/embed.js"
    ],
    "external": [
      "hls.js",
@@ -2204,6 +2237,7 @@
      "src/layers/bikeshare/ingestion.js",
      "src/layers/bikeshare/lifecycle.js",
      "src/layers/bikeshare/model.js",
+      "src/sources/gbfsStations.js",
      "src/layers/bikeshare/policy.js",
      "src/layers/bikeshare/queries.js",
      "src/layers/bikeshare/registry.js",
@@ -2338,6 +2372,7 @@
      "src/layers/satellites/labels.js",
      "src/layers/satellites/lifecycle.js",
      "src/layers/satellites/orbits.js",
+      "src/sources/tle.js",
      "src/layers/satellites/records.js",
      "src/layers/satellites/policy.js",
      "src/layers/satellites/rendering.js",
@@ -2378,7 +2413,9 @@
      "src/layers/vessels/cards.js",
      "src/layers/vessels/evidence.js",
      "src/layers/vessels/index.js",
+      "src/layers/vessels/cameraArea.js",
      "src/layers/vessels/ingestion.js",
+      "src/layers/vessels/viewArea.js",
      "src/layers/vessels/lifecycle.js",
      "src/layers/vessels/policy.js",
      "src/layers/vessels/queries.js",
@@ -2526,7 +2563,8 @@
      "src/sources/requestDeadline.js",
      "src/data/local_data/osm_military_names/names.json",
      "src/layers/installations/namedMarkers.js",
-      "src/data/infrastructureOverlayEntry.js"
+      "src/data/infrastructureOverlayEntry.js",
+      "src/sources/infrastructureData.js"
    ],
    "external": [
      "hls.js",
@@ -2631,6 +2669,7 @@
    "modules": [
      "src/data/installationFeedback.js",
      "src/data/layerState.js",
+      "src/data/layerStateCoordinator.js",
      "src/data/layerStateTokenReservations.json",
      "src/loadingFeedback.js",
      "src/navigationPolicy.js",
@@ -2736,6 +2775,7 @@
    "exports": ["./layers/vessels/ingestion"],
    "modules": [
      "src/layers/vessels/ingestion.js",
+      "src/layers/vessels/viewArea.js",
      "src/layers/vessels/recordPolicy.js"
    ],
    "external": []
@@ -3098,5 +3138,151 @@
      "src/layers/perimeters/source.js"
    ],
    "external": []
+  },
+  "tools": {
+    "exports": ["./tools"],
+    "modules": [
+      "src/tools/index.js",
+      "src/tools/catalog.js",
+      "src/tools/schema.js",
+      "src/tools/area.js",
+      "src/tools/results.js",
+      "src/tools/places.js",
+      "src/tools/queries/hazards.js",
+      "src/tools/queries/space.js",
+      "src/tools/queries/aviation.js",
+      "src/tools/queries/media.js",
+      "src/tools/queries/places.js",
+      "src/tools/queries/mobility.js",
+      "src/tools/queries/environment.js",
+      "src/tools/queries/brief.js",
+      "src/tools/queries/maritime.js",
+      "src/tools/queries/share.js",
+      "src/data/layerState.js",
+      "src/data/layerStateTokenReservations.json",
+      "src/sources/gbfsStations.js",
+      "src/sources/tle.js",
+      "src/data/satellitePass.js",
+      "src/tools/queries/atmosphere.js",
+      "src/layers/wind/inspection.js",
+      "src/layers/wind/model.js",
+      "src/layers/wind/fields.js",
+      "src/tools/queries/imagery.js",
+      "src/tools/queries/cables.js",
+      "src/tools/queries/surveillance.js",
+      "src/tools/queries/infrastructure.js",
+      "src/tools/queries/events.js",
+      "src/data/bhoteKoshiFloodPath.js",
+      "src/tools/functions.js",
+      "src/tools/surfaces.js",
+      "src/layers/transit/policy.js",
+      "src/data/transitFeeds.js",
+      "src/layers/transit/movement.js",
+      "src/data/contactPlayback.js",
+      "src/data/layerSnapshot.js",
+      "src/data/feedState.js",
+      "src/loadingFeedback.js",
+      "src/data/installationFeedback.js",
+      "src/view/index.js",
+      "src/tools/views.js",
+      "src/tools/globePanel.js",
+      "src/tools/queries/panelRequest.js"
+    ],
+    "external": ["satellite.js"]
+  },
+  "tools-mcp": {
+    "exports": ["./tools/mcp"],
+    "modules": [
+      "src/tools/mcp/index.js",
+      "src/tools/mcp/protocol.js",
+      "src/tools/mcp/http.js",
+      "src/tools/catalog.js",
+      "src/tools/schema.js"
+    ],
+    "external": []
+  },
+  "tools-panel": {
+    "exports": ["./tools/panel"],
+    "modules": [
+      "src/tools/panel.js",
+      "src/tools/globePanel.js",
+      "src/app/globePanelRuntime.js"
+    ],
+    "external": []
+  },
+  "tools-services": {
+    "exports": ["./tools/services"],
+    "modules": [
+      "src/tools/services.js",
+      "src/layers/bikeshare/registry.js",
+      "src/layers/bikeshare/source.js",
+      "src/layers/cctv/source.js",
+      "src/layers/cctv/sourcePolicy.js",
+      "src/layers/cyclones/source.js",
+      "src/sources/httpBody.js",
+      "src/layers/earthquakes/source.js",
+      "src/layers/earthquakes/records.js",
+      "src/layers/firms/source.js",
+      "src/layers/installations/source.js",
+      "src/sources/requestDeadline.js",
+      "src/data/militaryNames.js",
+      "src/sources/militaryTileGeometry.js",
+      "src/data/bundledJson.js",
+      "src/data/retryableLoad.js",
+      "src/data/local_data/osm_military_names/names.json",
+      "src/sources/openFreeMap.js",
+      "src/sources/vectorTiles.js",
+      "src/sources/phaseTiming.js",
+      "src/data/tomtomTiles.js",
+      "src/sources/capability.js",
+      "src/data/militaryInstallationData.js",
+      "src/layers/launches/source.js",
+      "src/layers/perimeters/source.js",
+      "src/layers/radio/source.js",
+      "src/layers/radio/policy.js",
+      "src/layers/satellites/source.js",
+      "src/layers/traffic/source.js",
+      "src/layers/traffic/roadModes.js",
+      "src/data/flowMatch.js",
+      "src/layers/traffic/flowSource.js",
+      "src/layers/traffic/flowDecode.js",
+      "src/sources/overpassRoads.js",
+      "src/layers/transit/source.js",
+      "src/sources/transitHistory.js",
+      "src/services/requests.js",
+      "src/sources/overpassFeatures.js",
+      "src/sources/featureSource.js",
+      "src/sources/overpassFeaturesRecords.js",
+      "src/sources/featureGeometry.js",
+      "src/sources/live/standalone.js",
+      "src/sources/live/contract.js",
+      "src/sources/live/aircraft.js",
+      "src/sources/live/vessels.js",
+      "src/tools/places.js",
+      "src/tools/catalog.js",
+      "src/tools/schema.js",
+      "src/layers/weather/source.js",
+      "src/layers/wind/source.js",
+      "src/sources/windBody.js",
+      "src/layers/recentImagery/catalog.js",
+      "src/layers/recentImagery/model.js",
+      "src/layers/submarineCables/bundledSource.js",
+      "src/layers/alpr/source.js",
+      "src/layers/alpr/policy.js",
+      "src/layers/alpr/records.js",
+      "src/layers/alpr/tileRecords.js",
+      "src/sources/infrastructureData.js",
+      "src/sources/eventPacks.js"
+    ],
+    "external": ["@mapbox/vector-tile", "pbf"]
+  },
+  "view": {
+    "exports": ["./view"],
+    "modules": [
+      "src/view/index.js",
+      "src/data/layerState.js",
+      "src/data/layerStateTokenReservations.json"
+    ],
+    "external": []
  }
 }
@@ -1572,6 +1572,10 @@ try {
    const cockpit = manager.cockpitView;
    const current = document.getElementById('cockpit-vision-current');
    const label = document.getElementById('cockpit-vision-current-label');
+    const settle = (ms = 900) => new Promise((resolve) => setTimeout(resolve, ms));
+    const intensities = () => Object.fromEntries(
+      Object.entries(manager.stages || {}).map(([name, stage]) => [name, stage.uniforms?.intensity]),
+    );
    const read = () => ({
      mode: current?.dataset.cockpitVision,
      label: label?.textContent?.trim(),
@@ -1582,62 +1586,106 @@ try {
      parametersCollapsed: document.getElementById('param-slider-panel')?.classList.contains('collapsed'),
      signalCollapsed: cockpit.signalCollapsed,
      focusRetained: document.activeElement === current,
+      activeStyle: manager.activeStyle,
+      intensities: intensities(),
    });
+    const reenter = async () => {
+      cockpit.exit({ restoreTracking: true });
+      await settle();
+      for (let attempt = 0; attempt < 40; attempt += 1) {
+        if (cockpit.enter() === true) return true;
+        await settle(200);
+      }
+      return false;
+    };
    manager._setCockpitDisclosure('display', false);
    manager._setCockpitDisclosure('radio', false);
    cockpit.setVisionMode('optical');
    current.focus({ preventScroll: true });
    const states = [read()];
-    for (let index = 0; index < 5; index += 1) {
+    for (let index = 0; index < 7; index += 1) {
      current.click();
      states.push(read());
    }
    const originalStyle = manager.activeStyle;
+    // A Noir map preset: Cockpit enters on Noir, Normal clears every shader
+    // without changing the map preset, and Exit Cockpit restores Noir.
+    cockpit.exit({ restoreTracking: true });
    manager.setStyle('noir');
-    await new Promise((resolve) => setTimeout(resolve, 900));
+    await settle();
+    const enteredOnNoir = await reenter();
+    const entryNoir = read();
    cockpit.setVisionMode('optical');
-    const inheritedNoir = read();
-    cockpit.setVisionMode('noir');
-    const explicitNoir = read();
-    cockpit.setVisionMode('optical');
-    const restoredNoir = {
-      ...read(),
-      activeStyle: manager.activeStyle,
-      intensity: manager.stages.noir?.uniforms?.intensity,
-    };
+    const normalInsideNoir = read();
+    cockpit.setVisionMode('crt');
+    const cockpitOnlyCrt = read();
+    const exitedNoir = cockpit.exit({ restoreTracking: true }) === true;
+    await settle();
+    const restoredNoir = { ...read(), cockpitActive: cockpit.active };
    manager.setStyle(originalStyle);
-    await new Promise((resolve) => setTimeout(resolve, 900));
+    await settle();
+    const reentered = await reenter();
    cockpit.setVisionMode('optical');
-    return { states, inheritedNoir, explicitNoir, restoredNoir };
+    return {
+      states,
+      enteredOnNoir,
+      entryNoir,
+      normalInsideNoir,
+      cockpitOnlyCrt,
+      exitedNoir,
+      restoredNoir,
+      reentered,
+    };
  });
+  const cycleModes = ['optical', 'crt', 'nvg', 'thermal', 'anime', 'noir', 'snow', 'optical'];
+  const cycleLabels = ['NORMAL', 'CRT', 'NVG', 'FLIR', 'ANIME', 'NOIR', 'SNOW', 'NORMAL'];
  check(
-    'Cockpit vision control exposes inherited, CRT, NVG, FLIR, and NOIR before wrapping',
-    JSON.stringify(visionCycle.states.map((state) => state.mode))
-      === JSON.stringify(['optical', 'crt', 'nvg', 'thermal', 'noir', 'optical'])
-      && visionCycle.states[4]?.label === 'NOIR'
-      && visionCycle.states[4]?.aria === 'Current cockpit vision style: Noir. Activate for next style.',
-    JSON.stringify(visionCycle),
+    'Cockpit vision control exposes Normal, CRT, NVG, FLIR, Anime, Noir and Snow before wrapping',
+    JSON.stringify(visionCycle.states.map((state) => state.mode)) === JSON.stringify(cycleModes)
+      && JSON.stringify(visionCycle.states.map((state) => state.label)) === JSON.stringify(cycleLabels)
+      && visionCycle.states[5]?.aria === 'Current cockpit vision style: Noir. Activate for next style.'
+      && visionCycle.states[7]?.aria === 'Current cockpit vision style: Normal. Activate for next style.',
+    JSON.stringify(visionCycle.states.map(({ mode, label, aria }) => ({ mode, label, aria }))),
  );
  check(
    'user vision changes open Display for every temporary treatment and retain selector focus',
-    visionCycle.states[1]?.mode === 'crt'
-      && visionCycle.states.slice(1, 5).every((state) => state.displayOpen === 'true')
-      && visionCycle.states.slice(1, 5).every((state) => state.radioOpen === 'false')
-      && visionCycle.states.slice(1, 5).every((state) => state.parametersActive)
-      && visionCycle.states.slice(1, 5).every((state) => !state.parametersCollapsed)
-      && visionCycle.states.slice(1, 5).every((state) => state.signalCollapsed)
+    visionCycle.states.slice(1, 7).every((state) => state.displayOpen === 'true')
+      && visionCycle.states.slice(1, 7).every((state) => state.radioOpen === 'false')
+      && visionCycle.states.slice(1, 7).every((state) => state.parametersActive)
+      && visionCycle.states.slice(1, 7).every((state) => !state.parametersCollapsed)
+      && visionCycle.states.slice(1, 7).every((state) => state.signalCollapsed)
      && visionCycle.states.every((state) => state.focusRetained),
    JSON.stringify(visionCycle.states),
  );
  check(
-    'inherited Noir and explicit Noir keep distinct ownership and restore the Noir map preset',
-    visionCycle.inheritedNoir?.mode === 'optical'
-      && visionCycle.inheritedNoir?.label === 'NOIR'
-      && visionCycle.explicitNoir?.mode === 'noir'
-      && visionCycle.explicitNoir?.label === 'NOIR'
-      && visionCycle.restoredNoir?.mode === 'optical'
+    'each Cockpit vision mode drives only its own shader and Normal clears them all',
+    visionCycle.states.slice(1, 7).every((state) => {
+      const target = {
+        crt: 'retro', nvg: 'surveillance', thermal: 'thermal', anime: 'anime', noir: 'noir', snow: 'snow',
+      }[state.mode];
+      return Object.entries(state.intensities).every(([name, value]) =>
+        name === target ? value > 0 : value === 0);
+    })
+      && Object.values(visionCycle.states[7].intensities).every((value) => value === 0),
+    JSON.stringify(visionCycle.states.map(({ mode, intensities }) => ({ mode, intensities }))),
+  );
+  check(
+    'Cockpit enters on the Noir map preset, Normal clears it, and Exit Cockpit restores it',
+    visionCycle.enteredOnNoir
+      && visionCycle.entryNoir?.mode === 'noir'
+      && visionCycle.entryNoir?.label === 'NOIR'
+      && visionCycle.normalInsideNoir?.mode === 'optical'
+      && visionCycle.normalInsideNoir?.label === 'NORMAL'
+      && visionCycle.normalInsideNoir?.activeStyle === 'noir'
+      && Object.values(visionCycle.normalInsideNoir?.intensities || {}).every((value) => value === 0)
+      && visionCycle.cockpitOnlyCrt?.mode === 'crt'
+      && visionCycle.cockpitOnlyCrt?.activeStyle === 'noir'
+      && visionCycle.exitedNoir
+      && !visionCycle.restoredNoir?.cockpitActive
      && visionCycle.restoredNoir?.activeStyle === 'noir'
-      && visionCycle.restoredNoir?.intensity === 1,
+      && visionCycle.restoredNoir?.intensities?.noir === 1
+      && visionCycle.restoredNoir?.intensities?.retro === 0
+      && visionCycle.reentered,
    JSON.stringify(visionCycle),
  );
  await page.evaluate(() => window.__godsEyeView.styleManager.cockpitView.setVisionMode('noir'));
@@ -2266,10 +2314,16 @@ try {
    // Both the UI and compatibility facade delegate to this navigation owner.
    const manager = window.__godsEyeView.styleManager._locationNavigation;
    const awareness = window.__godsEyeView.dataManager.layers.get('military-awareness')?.module;
+    const styleManager = window.__godsEyeView.styleManager;
+    const styleBefore = styleManager.activeStyle;
+    // A Cockpit-only choice that Reset must undo.
+    styleManager.cockpitView.setVisionMode('snow');
    window.__qaCockpitReset = {
      calls: 0,
      original: manager.resetToGlobeView,
      subjectId: awareness?.getContextSnapshot?.()?.subject?.id || null,
+      styleBefore,
+      snowDuringCockpit: styleManager.stages?.snow?.uniforms?.intensity,
    };
    manager.resetToGlobeView = function qaCountedCockpitReset(...args) {
      window.__qaCockpitReset.calls += 1;
@@ -2305,16 +2359,26 @@ try {
      resetHidden: document.getElementById('cockpit-reset-globe')?.hidden,
      height,
      subjectPreserved: Boolean(qa.subjectId && subjectId === qa.subjectId),
+      styleRestored: gev.styleManager.activeStyle === qa.styleBefore,
+      snowDuringCockpit: qa.snowDuringCockpit,
+      // Cockpit-time intensities are Cockpit's own, so check against the map preset.
+      visionRestored: Object.entries(gev.styleManager.stages || {}).every(([name, stage]) =>
+        name === gev.styleManager.activeStyle
+          ? stage.uniforms?.intensity > 0
+          : stage.uniforms?.intensity === 0),
    };
  });
  check(
-    'keyboard Cockpit Reset uses one canonical route and preserves Contact selection',
+    'keyboard Cockpit Reset uses one canonical route, preserves Contact selection and restores the map style',
    resetState.calls === 1
      && !resetState.cockpitActive
      && !resetState.trackedEntity
      && resetState.resetHidden
      && Math.abs(resetState.height - 18_000_000) < 150_000
-      && resetState.subjectPreserved,
+      && resetState.subjectPreserved
+      && resetState.snowDuringCockpit > 0
+      && resetState.styleRestored
+      && resetState.visionRestored,
    JSON.stringify(resetState),
  );
  check('runtime console remains clean', consoleErrors.length === 0 && localHttpErrors.length === 0,