Merge branch 'main' into feat/voice-geometry

# Conflicts: # SECURITY.md # scripts/format-scope.json # src/app/constructCatalog.test.mjs # src/app/sourceComposition.test.mjs # src/firstRunExperience.test.mjs # src/i18n/locales/ar.json # src/i18n/locales/de.json # src/i18n/locales/es.json # src/i18n/locales/fr.json # src/i18n/locales/it.json # src/i18n/locales/ja.json # src/i18n/locales/pt.json # src/i18n/locales/ru.json # src/i18n/locales/uk.json # src/i18n/locales/zh-CN.json # src/i18n/locales/zh-Hant.json # src/voice/actionSchemas.test.mjs
2026-11-05 10:53:59 +00:00 · 2026-11-03 09:07:16 -08:00
commit 51637a5e96
@@ -1104,6 +1104,7 @@
  "scripts/qa-anime-sky.mjs",
  "scripts/qa-sky-model-lighting.mjs",
  "server/providers/overpass/requestAdmission.test.mjs",
+  "src/tooling/trackArrivalObservation.mjs",
  "src/tooling/trackArrivalObservation.test.mjs",
  "src/ui/styles/status-badge.css",
  "src/ui/cctvBadges.test.mjs",
@@ -1218,5 +1219,6 @@
  "src/voice/areaActions.test.mjs",
  "src/voice/imageryActions.test.mjs",
  "src/voice/osmActions.test.mjs",
-  "src/voice/realtimeProtocol.test.mjs"
+  "src/voice/realtimeProtocol.test.mjs",
+  "server/providers/common/rateLimitKeys.test.mjs"
 ]
@@ -2359,6 +2359,7 @@
      "src/data/groundSnap.js",
      "src/data/iconOrientation.js",
      "src/data/infrastructure.js",
+      "src/data/osmOverlays.js",
      "src/data/installationFeedback.js",
      "src/data/labelArbiter.js",
      "src/data/idSwitches.js",
@@ -3302,6 +3303,7 @@
      "src/data/geoid.js",
      "src/data/iconOrientation.js",
      "src/data/infrastructure.js",
+      "src/data/osmOverlays.js",
      "src/data/installationFeedback.js",
      "src/data/satellitePass.js",
      "src/data/labelArbiter.js",
@@ -94,7 +94,7 @@

 import fs from 'node:fs';
 import puppeteer from 'puppeteer';
-import { arrivalRotationPassed } from '../src/tooling/trackArrivalObservation.mjs';
+import { arrivalAngleViolated, arrivalRotationPassed } from '../src/tooling/trackArrivalObservation.mjs';
 import { classifyAircraft, CLASS_SCALE_3D, CLASS_MODEL_REAL } from '../src/data/aircraftClass.js';
 import { ensureGeoidReady, geoidHeight } from '../src/data/geoid.js';

@@ -2698,16 +2698,18 @@ async function main() {
    // Staged deterministically: park the camera nadir over the synthetic
    // cluster, let rotations settle, TAMPER a billboard's rotation, then
    // trigger each path with the camera idle. The fleet runs every 80 ms,
-    // independently of rendered FPS. Observe the first completed settle and
-    // reveal frames within 500 ms of forcing moveEnd, before the 1 s idle
-    // rotation refresh can repair an incorrect first reveal.
+    // independently of rendered FPS. Observe the first completed settle frame
+    // within 500 ms of forcing moveEnd and the first reveal frame within
+    // 500 ms of that settle frame: each budget sits inside the 1 s idle
+    // rotation refresh that could otherwise repair an incorrect first reveal,
+    // and a ~300 ms headless SwiftShader frame fits inside each of them.
    // ============================================================
    console.log('\nChange 4 — arrival rotation: moveEnd settle pass + horizon-reveal pass');
    const arrival = await evalPage(async () => {
      const v = window.__godsEyeView.viewer;
      const dm = window.__godsEyeView.dataManager;
      const { screenProjectedRotation } = await import(`${window.__gevQaSourceBase || '/src'}/data/iconOrientation.js`);
-      const { observeArrivalRotation } = await import(`${window.__gevQaSourceBase || '/src'}/tooling/trackArrivalObservation.mjs`);
+      const { observeArrivalRotationWithRetry } = await import(`${window.__gevQaSourceBase || '/src'}/tooling/trackArrivalObservation.mjs`);
      // 3D models OFF for this phase: a model-handed-off billboard is hidden
      // and skips rotation updates entirely — the probes need live billboards
      // (this is also the app's default state the field report came from).
@@ -2769,7 +2771,23 @@ async function main() {
        const bb = findBB(id);
        if (!bb || !bb.show) return { error: `${id} missing/hidden` };
        const r0 = bb.rotation; // settled tamper origin; correctness uses a fresh projection below
-        const observed = await observeArrivalRotation({
+        const hasModel = !!(window.__g3dFindModel && window.__g3dFindModel(id));
+        // A wall-clock timeout is inconclusive, not a wrong angle: the frame
+        // landed where the 1 s idle refresh could already have repaired it
+        // (seen once on headless SwiftShader: a 926 ms first frame). Such an
+        // observation gets one more attempt; one that measured a wrong angle —
+        // a wrong first reveal, or a wrong settle frame before a reveal
+        // timeout — never does.
+        const observed = await observeArrivalRotationWithRetry({
+          async prepare() {
+            // Freshen both layers' rotation passes right before the probe, so
+            // the settle frame is measured against a pass that just ran rather
+            // than one left over from the previous probe — with the camera
+            // idle, a layer otherwise runs a pass only every
+            // ROTATION_REFRESH_MS.
+            v.camera.moveEnd.raiseEvent();
+            await nextFrames(1);
+          },
          scene: v.scene,
          startMoveEnd() {
            // Only moveEnd can repair the tampered angle at the idle pose.
@@ -2790,7 +2808,6 @@ async function main() {
            };
          },
        });
-        const hasModel = !!(window.__g3dFindModel && window.__g3dFindModel(id));
        return { r0, ...observed, hasModel };
      };
      const flightCourse = window.__SYNTH.flights.find((f) => f.icao === 'aaa002')?.track ?? 0;
@@ -2800,8 +2817,8 @@ async function main() {
        military: await probe('bbb101', militaryCourse),
      };
    });
-    const fmtArr = (a) => (!a ? `no result (${arrival?.error || 'phase error'})` : a.error ? `${a.error}; elapsed=${Number(a.elapsedMs).toFixed(1)} ms`
-      : `settle-err=${(a.dMoveEnd * 180 / Math.PI).toFixed(1)}° reveal-err=${(a.dReveal * 180 / Math.PI).toFixed(1)}° shown=${a.shown} flipFrame=${a.flipFrame} settle=${a.moveEndMs.toFixed(1)} ms reveal=${a.revealMs.toFixed(1)} ms total=${a.elapsedMs.toFixed(1)} ms hasModel=${a.hasModel}`);
+    const fmtArr = (a) => (!a ? `no result (${arrival?.error || 'phase error'})` : a.error ? `${a.error}; ${arrivalAngleViolated(a) ? 'angle violation (not retried); ' : ''}${Number.isFinite(a.dMoveEnd) ? `settle-err=${(a.dMoveEnd * 180 / Math.PI).toFixed(1)}° ` : ''}${Number.isFinite(a.dReveal) ? `reveal-err=${(a.dReveal * 180 / Math.PI).toFixed(1)}° ` : ''}elapsed=${Number(a.elapsedMs).toFixed(1)} ms attempts=${a.attempts}`
+      : `settle-err=${(a.dMoveEnd * 180 / Math.PI).toFixed(1)}° reveal-err=${(a.dReveal * 180 / Math.PI).toFixed(1)}° shown=${a.shown} flipFrame=${a.flipFrame} settle=${a.moveEndMs.toFixed(1)} ms reveal=${a.revealMs.toFixed(1)} ms total=${a.elapsedMs.toFixed(1)} ms attempts=${a.attempts} hasModel=${a.hasModel}`);
    const TAMPER_DEG = 1.5 * 180 / Math.PI; // ≈ 86° — an uncorrected nose stays this far off
    record(`arrival: moveEnd + first reveal both re-aim before idle refresh, flights (tamper was ${TAMPER_DEG.toFixed(0)}°)`,
      arrivalRotationPassed(arrival.flights), fmtArr(arrival.flights));