From 079b261757f31c4f0254ffd455083cefd4793852 Mon Sep 17 00:00:00 2001
From: Lakshman Turlapati <lakshmantvnm@gmail.com>
Date: Thu, 17 Sep 2026 19:20:31 -0500
Subject: [PATCH] feat(showcase): persist anonymous users-by-location and fix
 IPv6 geo

Keep a k-anonymized 365-day last-known region on daily rollups so the stats globe survives the 7-day event wipe, resolve client IPs via Fly-Client-IP with a sibling IPv6 DB-IP table, and stop Chrome from painting the footer language select white-on-white.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .gitignore                                    |   1 +
 fly.toml                                      |   8 +-
 package.json                                  |   2 +-
 .../src/app/core/stats/fsb-telemetry.types.ts |   6 +
 .../language-picker.component.scss            |   5 +-
 .../app/pages/stats/stats-page.component.ts   |  15 +-
 showcase/angular/src/styles.scss              |   6 +-
 showcase/server/data/README.md                |  65 ++-
 .../data/dbip-city-lite.ipv6.fixture.csv      |  12 +
 .../server/scripts/refresh-dbip-dataset.mjs   | 173 ++++++--
 showcase/server/src/db/queries.js             |  48 +-
 showcase/server/src/db/schema.js              |  24 +-
 .../src/middleware/telemetry-rate-limit.js    |  19 +-
 showcase/server/src/routes/public-stats.js    |  11 +
 showcase/server/src/routes/telemetry.js       |  60 ++-
 showcase/server/src/telemetry/housekeeper.js  |  42 +-
 showcase/server/src/utils/client-ip.js        |  31 ++
 showcase/server/src/utils/ip-geo.js           | 409 ++++++++++++++++--
 tests/server-client-ip-geo.test.js            | 161 +++++++
 tests/server-ip-geo-merge.test.js             |  20 +-
 tests/server-ip-geo.test.js                   |  56 ++-
 tests/server-no-ip-leak.test.js               |  67 +--
 tests/server-public-stats-headline.test.js    |   3 +-
 tests/server-region-aggregation.test.js       |  73 +++-
 tests/server-telemetry-housekeeper.test.js    |  12 +-
 tests/showcase-angular-foundation.test.js     |  14 +
 tests/stats-chart-overhaul.test.js            |   8 +-
 27 files changed, 1170 insertions(+), 181 deletions(-)
 create mode 100644 showcase/server/data/dbip-city-lite.ipv6.fixture.csv
 create mode 100644 showcase/server/src/utils/client-ip.js
 create mode 100644 tests/server-client-ip-geo.test.js

diff --git a/.gitignore b/.gitignore
index 9b0d3fa8b..4dc4fd145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ Research/
 # NEVER committed. The tiny committed test fixture (*.fixture.csv) is kept.
 showcase/server/data/dbip-city-lite.*
 !showcase/server/data/dbip-city-lite.fixture.csv
+!showcase/server/data/dbip-city-lite.ipv6.fixture.csv
 .claude/worktrees/
 BUG-REPORT-*.md
 dist/skill/
diff --git a/fly.toml b/fly.toml
index 22ea25277..a22ce1410 100644
--- a/fly.toml
+++ b/fly.toml
@@ -10,10 +10,12 @@ primary_region = 'sjc'
   NODE_ENV = 'production'
   # Worldwide IP->region dataset (DB-IP IP-to-City Lite, generated by
   # showcase/server/scripts/refresh-dbip-dataset.mjs). Lives on the mounted
-  # /data volume (NOT baked into the image). Safe to set before the file exists:
-  # ip-geo.js degrades to 'unknown' until it is uploaded, then restart the
-  # machine so the lazy loader re-reads. See showcase/server/data/README.md.
+  # /data volume (NOT baked into the image). Safe to set before the files exist:
+  # ip-geo.js degrades to 'unknown' until they are uploaded, then restart the
+  # machine so the lazy loader re-reads. IPv4 + sibling IPv6. See
+  # showcase/server/data/README.md.
   DBIP_DATASET_PATH = '/data/dbip-city-lite.csv'
+  DBIP_IPV6_DATASET_PATH = '/data/dbip-city-lite.ipv6.csv'
 
 [http_service]
   internal_port = 3847
diff --git a/package.json b/package.json
index 64015a9b7..b1b139c7c 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "version:check": "node scripts/sync-product-version.mjs --check",
     "build": "node esbuild.config.js",
     "build:cfworker": "node_modules/.bin/esbuild node_modules/@cfworker/json-schema/dist/esm/index.js --bundle --format=iife --global-name=CfworkerJsonSchema --platform=browser --target=chrome120 --legal-comments=none --outfile=extension/lib/cfworker-json-schema.min.js",
-    "test": "node tests/test-overlay-state.js && node tests/cost-tracker-ordering.test.js && node tests/runtime-contracts.test.js && node tests/ai-integration-analytics.test.js && node tests/dashboard-runtime-state.test.js && node tests/task-router.test.js && node tests/agent-provider-forbidden-flags.test.js && node tests/phase60-full-tests-harness.test.js && node tests/phase64-full-tests-harness.test.js && node tests/phase65-full-tests-harness.test.js && node tests/delegation-routing.test.js && node tests/delegation-consent.test.js && npm --prefix mcp run build && node tests/delegation-event-store.test.js && node tests/delegation-controller.test.js && node tests/delegation-sidepanel-ui.test.js && node tests/delegation-phase-contract.test.js && node tests/mcp-native-host-packaging.test.js --section workflow-and-pack && node tests/mcp-native-host-protocol.test.js && node tests/mcp-native-host-daemon.test.js && node tests/mcp-native-host-registry-helper.test.js && node tests/mcp-native-host-install.test.js && node tests/native-host-background-wake.test.js && node tests/mcp-bridge-client-lifecycle.test.js && node tests/mcp-bridge-topology.test.js && node tests/mcp-reverse-channel-contract.test.js && node tests/mcp-bridge-auth.test.js && node tests/mcp-bridge-background-dispatch.test.js && node tests/agent-protocol-drift-diagnostics.test.js && node tests/mcp-tool-routing-contract.test.js && node tests/mcp-visual-session-contract.test.js && node tests/mcp-restricted-tab.test.js && node tests/mcp-recovery-messaging.test.js && node tests/mcp-in-flight-session-lookup.test.js && node tests/mcp-version-parity.test.js && node tests/mcp-agent-provider-contract.test.js && node tests/mcp-adapter-compatibility.test.js && node tests/mcp-agent-connection-test.test.js && node tests/mcp-claude-code-adapter.test.js && node tests/mcp-agent-drift-smoke.test.js && node tests/mcp-agent-stream-fixture.test.js && node tests/mcp-spawn-supervisor.test.js && node tests/mcp-agent-orphan-recovery.test.js && node tests/mcp-diagnostics-status.test.js && node tests/mcp-install-platforms.test.js && node tests/mcp-setup-guidance.test.js && node tests/mcp-client-identity.test.js && node tests/mcp-client-inventory.test.js && node tests/mcp-agent-providers-storage.test.js && node tests/onboarding-agent-provider-clicks.test.js && node tests/mcp-client-merged-view.test.js && node tests/mcp-client-identity-integration.test.js && node tests/providers-panel-logic.test.js && node tests/providers-panel-ui.test.js && node tests/turn-result.test.js && node tests/action-history.test.js && node tests/universal-provider-lmstudio.test.js && node tests/lmstudio-agent-request.test.js && node tests/lmstudio-startup-preflight.test.js && node tests/lmstudio-settings-persistence.test.js && node tests/onboarding-lmstudio.test.js && node tests/config-lmstudio.test.js && node tests/cost-tracker.test.js && node tests/install-identity.test.js && node tests/mcp-pricing.test.js && node tests/mcp-pricing-data-parity.test.js && node tests/mcp-metrics-recorder.test.js && node tests/mcp-dispatcher-client-label.test.js && node tests/mcp-session-recorder.test.js && node tests/automation-logger-mcp-retention.test.js && node tests/mcp-session-settings-ui.test.js && node tests/knowledge-graph-dedup.test.js && node tests/mcp-metrics-no-pii-leak.test.js && node tests/telemetry-collector.test.js && node tests/telemetry-collector-strips-internal-fields.test.js && node tests/telemetry-payload-allowlist.test.js && node tests/telemetry-registry-bootstrap.test.js && node tests/extension-record-dispatch-serializes.test.js && node tests/server-trust-proxy.test.js && node tests/server-telemetry-salt-rotation.test.js && node tests/server-telemetry-rate-limit.test.js && node tests/server-telemetry-body-cap.test.js && node tests/server-telemetry-parser-rate-limit.test.js && node tests/server-telemetry-batch-cap.test.js && node tests/server-telemetry-allowlist.test.js && node tests/server-telemetry-event-id-dedup.test.js && node tests/server-telemetry-timestamp-tolerance.test.js && node tests/server-telemetry-daily-budget.test.js && node tests/server-telemetry-ip-daily-budget.test.js && node tests/server-telemetry-sec-gpc.test.js && node tests/server-telemetry-optout-forget.test.js && node tests/telemetry-active-tracker-bounds.test.js && node tests/telemetry-uuid-budget-memory.test.js && node tests/server-telemetry-housekeeper.test.js && node tests/server-public-stats-headline.test.js && node tests/server-public-stats-series.test.js && node tests/server-public-stats-cache.test.js && node tests/server-public-stats-no-auth.test.js && node tests/server-github-cache.test.js && node tests/server-github-poller.test.js && node tests/fsb-telemetry-service.test.js && node tests/stats-view-state.test.js && node tests/showcase-build-smoke.test.js && node tests/showcase-route-fallback.test.js && node tests/stats-chart-overhaul.test.js && node scripts/verify-store-listing.mjs && node tests/verify-store-listing.test.js && node tests/cumulative-commits-aggregator.test.js && node tests/dashboard-stream-readiness-ping.test.js && node tests/dashboard-stream-pending-intent.test.js && node tests/dashboard-stream-recovery-parity.test.js && node tests/server-ws-backpressure.test.js && node tests/server-ws-phantomstream-relay-compat.test.js && node tests/showcase-privacy-page.test.js && node tests/server-no-ip-leak.test.js && node tests/server-ip-geo.test.js && node tests/server-ip-geo-merge.test.js && node tests/server-ip-geo-scale.test.js && node tests/server-region-aggregation.test.js && node tests/transcript-store.test.js && node tests/hook-pipeline.test.js && node tests/session-schema.test.js && node tests/state-emitter.test.js && node tests/secure-config-credential-vault.test.js && node tests/qr-pairing.test.js && node tests/ws-client-decompress.test.js && node tests/dashboard-task-direct-start.test.js && node tests/phantom-stream-protocol-envelope.test.js && node tests/phantom-stream-differential-parity.test.js && node tests/phantom-stream-remote-control-parity.test.js && node tests/phantom-stream-public-package.test.js && node tests/phantom-stream-exports.test.js && node tests/phantom-stream-content-bundle.test.js && node tests/phantom-stream-capture-adapter.test.js && node tests/phantom-stream-sidechannels.test.js && node tests/phantom-stream-security-masking.test.js && node tests/phantom-stream-dashboard-viewer-bundle.test.js && node tests/phantom-stream-static-viewer.test.js && node tests/phantom-stream-dashboard-parity.test.js && node tests/phantom-stream-dashboard-sidechannels.test.js && node tests/phantom-stream-media-sync.test.js && node tests/phantom-stream-media-wiring.test.js && node tests/dom-stream-perf.test.js && node tests/extension-content-script-files-completeness.test.js && node tests/dom-analysis-viewport-priority.test.js && node tests/redact-for-log.test.js && node tests/diagnostics-ring-buffer.test.js && node tests/agent-sunset-back-end.test.js && node tests/agent-sunset-control-panel.test.js && node tests/agent-sunset-showcase.test.js && node tests/sync-tab-runtime.test.js && node tests/remote-control-rebrand.test.js && node tests/server-accept-language.test.js && node tests/server-legacy-html-redirects.test.js && node tests/metrics-wireup.test.js && node tests/dashboard-metrics-render.test.js && node tests/stuck-action-repetition.test.js && node tests/goal-progress-tracker.test.js && node tests/model-discovery.test.js && node tests/model-discovery-ui.test.js && node tests/model-combobox-ui.test.js && node tests/settings-card-select-clipping.test.js && node tests/control-panel-scroll-containment.test.js && node tests/model-discovery-runtime.test.js && node tests/overlay-stability-cadence.test.js && node tests/overlay-content-audit.test.js && node tests/action-icon-behavior.test.js && node tests/meta-cognitive-tracker.test.js && node tests/agent-cap-recommendation.test.js && node tests/agent-cap-storage.test.js && node tests/agent-cap-ui.test.js && node tests/agent-registry.test.js && node tests/selected-tab-state.test.js && node tests/change-report-builder.test.js && node tests/change-report-size-cap.test.js && node tests/change-report-cross-origin.test.js && node tests/change-report-dispatcher.test.js && node tests/change-report-read-tools-excluded.test.js && node tests/change-report-toggle.test.js && node tests/change-report-settings-ui.test.js && node tests/agent-tab-resolver.test.js && node tests/read-tool-tab-resolution.test.js && node tests/open-tab-background-default.test.js && node tests/visual-session-agent-scoped.test.js && node tests/action-tool-agent-scoped.test.js && node tests/recovery-tools-bootstrap.test.js && node tests/legacy-agent-synthesis.test.js && node tests/visual-session-reentry.test.js && node tests/ownership-error-codes.test.js && node tests/multi-agent-regression.test.js && node tests/tool-definitions-parity.test.js && node tests/mcp-numeric-param-coercion.test.js && node tests/visual-session-schema-lock.test.js && node tests/mcp-visual-tick-lifecycle.test.js && node tests/agent-id-threading.test.js && node tests/skill-fsb-spec.test.js && node tests/agent-loop-empty-contents.test.js && node --test tests/google-sheets-session.test.js tests/google-sheets-content-actions.test.js tests/gsheets-handler.test.js tests/google-sheets-wiring.test.js tests/spreadsheet-record-redaction.test.js && node tests/lattice-public-package.test.js && node tests/lattice-smoke.test.js && node tests/lattice-tripwire-smoke.test.js && node tests/lattice-checkpoint-smoke.test.js && node tests/lattice-providers-smoke.test.js && node tests/lattice-survivability-smoke.test.js && node tests/lattice-provider-bridge-smoke.test.js && node tests/lattice-host-step-transition-smoke.test.js && node tests/lattice-session-replay.test.js && node tests/lattice-replay-background-contract.test.js && node tests/lattice-step-emitter-smoke.test.js && node tests/mcp-philosophy-parity-smoke.test.js && node tests/sidepanel-tab-aware-smoke.test.js && node tests/sidepanel-message-log-smoke.test.js && node tests/sidepanel-mcpvisualsession-listener.test.js && node tests/delegation-sidepanel-tab-follow.test.js && node tests/sidepanel-tab-scoping-fix-redo-smoke.test.js && node tests/sidepanel-progress-tick-setter-routing.test.js && node tests/sidepanel-background-tab-completion.test.js && node tests/sidepanel-multi-document-fanout.test.js && node tests/sidepanel-automation-runner.test.js && node tests/trigger-store.test.js && node tests/trigger-lifecycle.test.js && node tests/value-extractor.test.js && node tests/trigger-manager.test.js && node tests/trigger-cap.test.js && node tests/trigger-observe.test.js && node tests/trigger-observe-pulse.test.js && node tests/trigger-refresh-poll.test.js && node tests/trigger-tool-dispatcher.test.js && node tests/trigger-blocking-reporting.test.js && node tests/capability-recipe-schema.test.js && node tests/capability-interpreter.test.js && node tests/recipe-path-guard.test.js && node tests/capability-fetch.test.js && node tests/capability-search-eval.test.js && node tests/capability-mcp-surface.test.js && node tests/capability-router.test.js && node tests/capability-autopilot-parity.test.js && node tests/capability-head-handlers.test.js && node tests/consent-policy-store.test.js && node tests/consent-gate.test.js && node tests/consent-mutation-gate.test.js && node tests/consent-chokepoint.test.js && node tests/audit-log.test.js && node tests/audit-log-no-secret.test.js && node tests/recipe-signature.test.js && node tests/recipe-signature-interpreter-hook.test.js && node tests/service-denylist.test.js && node tests/classification-gate.test.js && node tests/provenance-scaffold.test.js && node tests/upload-file-route.test.js && node tests/upload-path-denylist.test.js && node tests/consent-audit-settings-ui.test.js && node tests/agent-loop-iterator-guard.test.js && node tests/network-capture.test.js && node tests/network-capture-consent.test.js && node tests/network-capture-redaction.test.js && node tests/recipe-synthesizer.test.js && node tests/learned-recipe-store.test.js && node tests/learned-search-add.test.js && node tests/learned-t2-outranking.test.js && node tests/learned-promote-after-replay.test.js && node tests/discovery-seeds-load.test.js && node tests/seed-resolve-t2.test.js && node tests/recipe-learn-pending-affordance.test.js && node tests/learned-local-provenance-exempt.test.js && node tests/provider-parity.test.js && node tests/recipe-schema-lock.test.js && node tests/capability-rot-detector.test.js && node tests/relearn-coalescing.test.js && node tests/rot-recurrence-classify.test.js && node tests/app-degraded-surfacing.test.js && node tests/relearn-router-wiring.test.js && node tests/import-extraction.test.js && node tests/import-forbidden-prescan.test.js && node tests/import-classify-gate-call.test.js && node tests/catalog-crosscheck.test.js && node tests/no-dead-entry.test.js && node tests/catalog-inline-shape.test.js && node tests/head-handler-cap.test.js && node tests/head-handler-upgrade.test.js && node tests/confluence-t1-handler.test.js && node tests/verify-origin-classification.test.js && node tests/guarded-write-failclosed.test.js && node tests/breadth-search-return.test.js && node tests/breadth-batch-gate.test.js && node tests/backing-status-annotation.test.js && node tests/t1-port-contract.test.js && node tests/t1-port-contract-gate.test.js && node tests/dom-only-default.test.js && node tests/sensitive-write-import-gate.test.js && node tests/coverage-report.test.js && node tests/payment-op-guard.test.js && node tests/vendor-augment-preserved.test.js && node tests/no-duplicate-stem.test.js && node tests/full-corpus-screen.test.js && node tests/full-corpus-scale.test.js && node tests/keyboard-attach-robustness.test.js && node --import tsx tests/no-orphan-descriptor.test.js",
+    "test": "node tests/test-overlay-state.js && node tests/cost-tracker-ordering.test.js && node tests/runtime-contracts.test.js && node tests/ai-integration-analytics.test.js && node tests/dashboard-runtime-state.test.js && node tests/task-router.test.js && node tests/agent-provider-forbidden-flags.test.js && node tests/phase60-full-tests-harness.test.js && node tests/phase64-full-tests-harness.test.js && node tests/phase65-full-tests-harness.test.js && node tests/delegation-routing.test.js && node tests/delegation-consent.test.js && npm --prefix mcp run build && node tests/delegation-event-store.test.js && node tests/delegation-controller.test.js && node tests/delegation-sidepanel-ui.test.js && node tests/delegation-phase-contract.test.js && node tests/mcp-native-host-packaging.test.js --section workflow-and-pack && node tests/mcp-native-host-protocol.test.js && node tests/mcp-native-host-daemon.test.js && node tests/mcp-native-host-registry-helper.test.js && node tests/mcp-native-host-install.test.js && node tests/native-host-background-wake.test.js && node tests/mcp-bridge-client-lifecycle.test.js && node tests/mcp-bridge-topology.test.js && node tests/mcp-reverse-channel-contract.test.js && node tests/mcp-bridge-auth.test.js && node tests/mcp-bridge-background-dispatch.test.js && node tests/agent-protocol-drift-diagnostics.test.js && node tests/mcp-tool-routing-contract.test.js && node tests/mcp-visual-session-contract.test.js && node tests/mcp-restricted-tab.test.js && node tests/mcp-recovery-messaging.test.js && node tests/mcp-in-flight-session-lookup.test.js && node tests/mcp-version-parity.test.js && node tests/mcp-agent-provider-contract.test.js && node tests/mcp-adapter-compatibility.test.js && node tests/mcp-agent-connection-test.test.js && node tests/mcp-claude-code-adapter.test.js && node tests/mcp-agent-drift-smoke.test.js && node tests/mcp-agent-stream-fixture.test.js && node tests/mcp-spawn-supervisor.test.js && node tests/mcp-agent-orphan-recovery.test.js && node tests/mcp-diagnostics-status.test.js && node tests/mcp-install-platforms.test.js && node tests/mcp-setup-guidance.test.js && node tests/mcp-client-identity.test.js && node tests/mcp-client-inventory.test.js && node tests/mcp-agent-providers-storage.test.js && node tests/onboarding-agent-provider-clicks.test.js && node tests/mcp-client-merged-view.test.js && node tests/mcp-client-identity-integration.test.js && node tests/providers-panel-logic.test.js && node tests/providers-panel-ui.test.js && node tests/turn-result.test.js && node tests/action-history.test.js && node tests/universal-provider-lmstudio.test.js && node tests/lmstudio-agent-request.test.js && node tests/lmstudio-startup-preflight.test.js && node tests/lmstudio-settings-persistence.test.js && node tests/onboarding-lmstudio.test.js && node tests/config-lmstudio.test.js && node tests/cost-tracker.test.js && node tests/install-identity.test.js && node tests/mcp-pricing.test.js && node tests/mcp-pricing-data-parity.test.js && node tests/mcp-metrics-recorder.test.js && node tests/mcp-dispatcher-client-label.test.js && node tests/mcp-session-recorder.test.js && node tests/automation-logger-mcp-retention.test.js && node tests/mcp-session-settings-ui.test.js && node tests/knowledge-graph-dedup.test.js && node tests/mcp-metrics-no-pii-leak.test.js && node tests/telemetry-collector.test.js && node tests/telemetry-collector-strips-internal-fields.test.js && node tests/telemetry-payload-allowlist.test.js && node tests/telemetry-registry-bootstrap.test.js && node tests/extension-record-dispatch-serializes.test.js && node tests/server-trust-proxy.test.js && node tests/server-telemetry-salt-rotation.test.js && node tests/server-telemetry-rate-limit.test.js && node tests/server-telemetry-body-cap.test.js && node tests/server-telemetry-parser-rate-limit.test.js && node tests/server-telemetry-batch-cap.test.js && node tests/server-telemetry-allowlist.test.js && node tests/server-telemetry-event-id-dedup.test.js && node tests/server-telemetry-timestamp-tolerance.test.js && node tests/server-telemetry-daily-budget.test.js && node tests/server-telemetry-ip-daily-budget.test.js && node tests/server-telemetry-sec-gpc.test.js && node tests/server-telemetry-optout-forget.test.js && node tests/telemetry-active-tracker-bounds.test.js && node tests/telemetry-uuid-budget-memory.test.js && node tests/server-telemetry-housekeeper.test.js && node tests/server-public-stats-headline.test.js && node tests/server-public-stats-series.test.js && node tests/server-public-stats-cache.test.js && node tests/server-public-stats-no-auth.test.js && node tests/server-github-cache.test.js && node tests/server-github-poller.test.js && node tests/fsb-telemetry-service.test.js && node tests/stats-view-state.test.js && node tests/showcase-build-smoke.test.js && node tests/showcase-route-fallback.test.js && node tests/stats-chart-overhaul.test.js && node scripts/verify-store-listing.mjs && node tests/verify-store-listing.test.js && node tests/cumulative-commits-aggregator.test.js && node tests/dashboard-stream-readiness-ping.test.js && node tests/dashboard-stream-pending-intent.test.js && node tests/dashboard-stream-recovery-parity.test.js && node tests/server-ws-backpressure.test.js && node tests/server-ws-phantomstream-relay-compat.test.js && node tests/showcase-privacy-page.test.js && node tests/server-no-ip-leak.test.js && node tests/server-ip-geo.test.js && node tests/server-client-ip-geo.test.js && node tests/server-ip-geo-merge.test.js && node tests/server-ip-geo-scale.test.js && node tests/server-region-aggregation.test.js && node tests/transcript-store.test.js && node tests/hook-pipeline.test.js && node tests/session-schema.test.js && node tests/state-emitter.test.js && node tests/secure-config-credential-vault.test.js && node tests/qr-pairing.test.js && node tests/ws-client-decompress.test.js && node tests/dashboard-task-direct-start.test.js && node tests/phantom-stream-protocol-envelope.test.js && node tests/phantom-stream-differential-parity.test.js && node tests/phantom-stream-remote-control-parity.test.js && node tests/phantom-stream-public-package.test.js && node tests/phantom-stream-exports.test.js && node tests/phantom-stream-content-bundle.test.js && node tests/phantom-stream-capture-adapter.test.js && node tests/phantom-stream-sidechannels.test.js && node tests/phantom-stream-security-masking.test.js && node tests/phantom-stream-dashboard-viewer-bundle.test.js && node tests/phantom-stream-static-viewer.test.js && node tests/phantom-stream-dashboard-parity.test.js && node tests/phantom-stream-dashboard-sidechannels.test.js && node tests/phantom-stream-media-sync.test.js && node tests/phantom-stream-media-wiring.test.js && node tests/dom-stream-perf.test.js && node tests/extension-content-script-files-completeness.test.js && node tests/dom-analysis-viewport-priority.test.js && node tests/redact-for-log.test.js && node tests/diagnostics-ring-buffer.test.js && node tests/agent-sunset-back-end.test.js && node tests/agent-sunset-control-panel.test.js && node tests/agent-sunset-showcase.test.js && node tests/sync-tab-runtime.test.js && node tests/remote-control-rebrand.test.js && node tests/server-accept-language.test.js && node tests/server-legacy-html-redirects.test.js && node tests/metrics-wireup.test.js && node tests/dashboard-metrics-render.test.js && node tests/stuck-action-repetition.test.js && node tests/goal-progress-tracker.test.js && node tests/model-discovery.test.js && node tests/model-discovery-ui.test.js && node tests/model-combobox-ui.test.js && node tests/settings-card-select-clipping.test.js && node tests/control-panel-scroll-containment.test.js && node tests/model-discovery-runtime.test.js && node tests/overlay-stability-cadence.test.js && node tests/overlay-content-audit.test.js && node tests/action-icon-behavior.test.js && node tests/meta-cognitive-tracker.test.js && node tests/agent-cap-recommendation.test.js && node tests/agent-cap-storage.test.js && node tests/agent-cap-ui.test.js && node tests/agent-registry.test.js && node tests/selected-tab-state.test.js && node tests/change-report-builder.test.js && node tests/change-report-size-cap.test.js && node tests/change-report-cross-origin.test.js && node tests/change-report-dispatcher.test.js && node tests/change-report-read-tools-excluded.test.js && node tests/change-report-toggle.test.js && node tests/change-report-settings-ui.test.js && node tests/agent-tab-resolver.test.js && node tests/read-tool-tab-resolution.test.js && node tests/open-tab-background-default.test.js && node tests/visual-session-agent-scoped.test.js && node tests/action-tool-agent-scoped.test.js && node tests/recovery-tools-bootstrap.test.js && node tests/legacy-agent-synthesis.test.js && node tests/visual-session-reentry.test.js && node tests/ownership-error-codes.test.js && node tests/multi-agent-regression.test.js && node tests/tool-definitions-parity.test.js && node tests/mcp-numeric-param-coercion.test.js && node tests/visual-session-schema-lock.test.js && node tests/mcp-visual-tick-lifecycle.test.js && node tests/agent-id-threading.test.js && node tests/skill-fsb-spec.test.js && node tests/agent-loop-empty-contents.test.js && node --test tests/google-sheets-session.test.js tests/google-sheets-content-actions.test.js tests/gsheets-handler.test.js tests/google-sheets-wiring.test.js tests/spreadsheet-record-redaction.test.js && node tests/lattice-public-package.test.js && node tests/lattice-smoke.test.js && node tests/lattice-tripwire-smoke.test.js && node tests/lattice-checkpoint-smoke.test.js && node tests/lattice-providers-smoke.test.js && node tests/lattice-survivability-smoke.test.js && node tests/lattice-provider-bridge-smoke.test.js && node tests/lattice-host-step-transition-smoke.test.js && node tests/lattice-session-replay.test.js && node tests/lattice-replay-background-contract.test.js && node tests/lattice-step-emitter-smoke.test.js && node tests/mcp-philosophy-parity-smoke.test.js && node tests/sidepanel-tab-aware-smoke.test.js && node tests/sidepanel-message-log-smoke.test.js && node tests/sidepanel-mcpvisualsession-listener.test.js && node tests/delegation-sidepanel-tab-follow.test.js && node tests/sidepanel-tab-scoping-fix-redo-smoke.test.js && node tests/sidepanel-progress-tick-setter-routing.test.js && node tests/sidepanel-background-tab-completion.test.js && node tests/sidepanel-multi-document-fanout.test.js && node tests/sidepanel-automation-runner.test.js && node tests/trigger-store.test.js && node tests/trigger-lifecycle.test.js && node tests/value-extractor.test.js && node tests/trigger-manager.test.js && node tests/trigger-cap.test.js && node tests/trigger-observe.test.js && node tests/trigger-observe-pulse.test.js && node tests/trigger-refresh-poll.test.js && node tests/trigger-tool-dispatcher.test.js && node tests/trigger-blocking-reporting.test.js && node tests/capability-recipe-schema.test.js && node tests/capability-interpreter.test.js && node tests/recipe-path-guard.test.js && node tests/capability-fetch.test.js && node tests/capability-search-eval.test.js && node tests/capability-mcp-surface.test.js && node tests/capability-router.test.js && node tests/capability-autopilot-parity.test.js && node tests/capability-head-handlers.test.js && node tests/consent-policy-store.test.js && node tests/consent-gate.test.js && node tests/consent-mutation-gate.test.js && node tests/consent-chokepoint.test.js && node tests/audit-log.test.js && node tests/audit-log-no-secret.test.js && node tests/recipe-signature.test.js && node tests/recipe-signature-interpreter-hook.test.js && node tests/service-denylist.test.js && node tests/classification-gate.test.js && node tests/provenance-scaffold.test.js && node tests/upload-file-route.test.js && node tests/upload-path-denylist.test.js && node tests/consent-audit-settings-ui.test.js && node tests/agent-loop-iterator-guard.test.js && node tests/network-capture.test.js && node tests/network-capture-consent.test.js && node tests/network-capture-redaction.test.js && node tests/recipe-synthesizer.test.js && node tests/learned-recipe-store.test.js && node tests/learned-search-add.test.js && node tests/learned-t2-outranking.test.js && node tests/learned-promote-after-replay.test.js && node tests/discovery-seeds-load.test.js && node tests/seed-resolve-t2.test.js && node tests/recipe-learn-pending-affordance.test.js && node tests/learned-local-provenance-exempt.test.js && node tests/provider-parity.test.js && node tests/recipe-schema-lock.test.js && node tests/capability-rot-detector.test.js && node tests/relearn-coalescing.test.js && node tests/rot-recurrence-classify.test.js && node tests/app-degraded-surfacing.test.js && node tests/relearn-router-wiring.test.js && node tests/import-extraction.test.js && node tests/import-forbidden-prescan.test.js && node tests/import-classify-gate-call.test.js && node tests/catalog-crosscheck.test.js && node tests/no-dead-entry.test.js && node tests/catalog-inline-shape.test.js && node tests/head-handler-cap.test.js && node tests/head-handler-upgrade.test.js && node tests/confluence-t1-handler.test.js && node tests/verify-origin-classification.test.js && node tests/guarded-write-failclosed.test.js && node tests/breadth-search-return.test.js && node tests/breadth-batch-gate.test.js && node tests/backing-status-annotation.test.js && node tests/t1-port-contract.test.js && node tests/t1-port-contract-gate.test.js && node tests/dom-only-default.test.js && node tests/sensitive-write-import-gate.test.js && node tests/coverage-report.test.js && node tests/payment-op-guard.test.js && node tests/vendor-augment-preserved.test.js && node tests/no-duplicate-stem.test.js && node tests/full-corpus-screen.test.js && node tests/full-corpus-scale.test.js && node tests/keyboard-attach-robustness.test.js && node --import tsx tests/no-orphan-descriptor.test.js",
     "test:openai-request": "node tests/openai-agent-request.test.js",
     "test:grok-build": "npm --prefix mcp run build && node tests/mcp-grok-build-adapter.test.js",
     "test:lattice": "node tests/lattice-public-package.test.js && node tests/lattice-smoke.test.js && node tests/lattice-tripwire-smoke.test.js && node tests/lattice-checkpoint-smoke.test.js && node tests/lattice-providers-smoke.test.js && node tests/lattice-survivability-smoke.test.js && node tests/lattice-provider-bridge-smoke.test.js && node tests/lattice-host-step-transition-smoke.test.js && node tests/lattice-session-replay.test.js && node --test tests/lattice-replay-playback.test.js && node tests/lattice-replay-background-contract.test.js && node tests/lattice-step-emitter-smoke.test.js",
diff --git a/showcase/angular/src/app/core/stats/fsb-telemetry.types.ts b/showcase/angular/src/app/core/stats/fsb-telemetry.types.ts
index a90681f95..defdc73d1 100644
--- a/showcase/angular/src/app/core/stats/fsb-telemetry.types.ts
+++ b/showcase/angular/src/app/core/stats/fsb-telemetry.types.ts
@@ -63,6 +63,12 @@ export interface FSBTelemetryHeadline {
   popular_agents: Array<{ label: string; uniq: number }>;
   /** Latest day's coarse region aggregate with a k>=5 floor. */
   popular_regions: Array<{ label: string; uniq: number }>;
+  /**
+   * Last-known coarse region per install across the retained 365-day rollups,
+   * k>=5 floored. Anonymous (country / US-state labels only). Powers the globe
+   * so location survives the 7-day raw-event wipe.
+   */
+  users_by_region_365d?: Array<{ label: string; uniq: number }>;
   /** Compatibility alias for avg_agents_per_reporting_user. */
   avg_agents_per_user: number;
   /** active_agents_now / active_agents_reporting_users_now. */
diff --git a/showcase/angular/src/app/layout/language-picker/language-picker.component.scss b/showcase/angular/src/app/layout/language-picker/language-picker.component.scss
index b17fcd1f7..fe4712d0f 100644
--- a/showcase/angular/src/app/layout/language-picker/language-picker.component.scss
+++ b/showcase/angular/src/app/layout/language-picker/language-picker.component.scss
@@ -67,9 +67,12 @@
   appearance: none;
   -webkit-appearance: none;
   -moz-appearance: none;
-  background: transparent;
+  /* Blink ignores a fully transparent select background and keeps UA Field
+   * (white unless color-scheme is dark). --bg-card is opaque and matches the footer. */
+  background-color: var(--bg-card);
   border: 0;
   color: inherit;
+  color-scheme: inherit;
   font: inherit;
   padding: 0.25rem 1.25rem 0.25rem 0.5rem;
   cursor: pointer;
diff --git a/showcase/angular/src/app/pages/stats/stats-page.component.ts b/showcase/angular/src/app/pages/stats/stats-page.component.ts
index 256cebafd..719ce2958 100644
--- a/showcase/angular/src/app/pages/stats/stats-page.component.ts
+++ b/showcase/angular/src/app/pages/stats/stats-page.component.ts
@@ -298,7 +298,7 @@ export class StatsPageComponent implements OnInit, OnDestroy {
   }
 
   get accessibleGlobeData(): readonly AccessibleDatum[] {
-    return (this.latestFsbHeadline?.popular_regions ?? []).map((item) => ({
+    return this.globeRegionList.map((item) => ({
       label: this.displayLabel(item.label),
       value: this.fmtNum(item.uniq),
     }));
@@ -415,8 +415,13 @@ export class StatsPageComponent implements OnInit, OnDestroy {
   // an explicit "still gathering data" message when this is false rather
   // than silently showing a globe with no nodes.
   get hasPlottableRegions(): boolean {
-    const regions = this.latestFsbHeadline?.popular_regions ?? [];
-    return regions.some((r) => regionCentroid(r.label) !== null);
+    return this.globeRegionList.some((r) => regionCentroid(r.label) !== null);
+  }
+
+  private get globeRegionList(): readonly { label: string; uniq: number }[] {
+    const persistent = this.latestFsbHeadline?.users_by_region_365d;
+    if (persistent && persistent.length > 0) return persistent;
+    return this.latestFsbHeadline?.popular_regions ?? [];
   }
 
   get fanItemsLeft(): readonly FanItem[] {
@@ -793,7 +798,7 @@ export class StatsPageComponent implements OnInit, OnDestroy {
 
     if (this.selectedView === 'fsb-active-now') {
       const key = JSON.stringify({
-        regions: this.latestFsbHeadline?.popular_regions ?? [],
+        regions: this.globeRegionList,
         reducedMotion: this.prefersReducedMotion,
         theme: typeof document === 'undefined'
           ? ''
@@ -888,7 +893,7 @@ export class StatsPageComponent implements OnInit, OnDestroy {
   // moderate jitter radius since we only have a single centroid per label,
   // not a real distribution.
   private buildGlobeRegions(): GlobeRegion[] {
-    const list = this.latestFsbHeadline?.popular_regions ?? [];
+    const list = this.globeRegionList;
     const regions: GlobeRegion[] = [];
     for (const { label, uniq } of list) {
       const centroid = regionCentroid(label);
diff --git a/showcase/angular/src/styles.scss b/showcase/angular/src/styles.scss
index c1ecb4f33..fcd7cf72f 100644
--- a/showcase/angular/src/styles.scss
+++ b/showcase/angular/src/styles.scss
@@ -1,8 +1,11 @@
 @import url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css');
 @import url('https://unpkg.com/@phosphor-icons/web@2.1.1/src/regular/style.css');
 
-/* Shared showcase foundation: tokens, reset, typography, and utilities only. */
+/* Shared showcase foundation: tokens, reset, typography, and utilities only.
+ * color-scheme is required so native form controls (the footer <select> especially)
+ * use a dark Field palette instead of light-on-light in Blink/Gecko. */
 :root {
+  color-scheme: dark;
   --primary: #ff6b35;
   --primary-hover: #e55a2b;
   --primary-gradient: linear-gradient(135deg, #ff6b35, #ff8c42);
@@ -45,6 +48,7 @@
 }
 
 [data-theme="light"] {
+  color-scheme: light;
   --bg-body: #ffffff;
   --bg-card: #f8f9fa;
   --bg-elevated: #f1f5f9;
diff --git a/showcase/server/data/README.md b/showcase/server/data/README.md
index 2cfeb50b3..0afaa34f9 100644
--- a/showcase/server/data/README.md
+++ b/showcase/server/data/README.md
@@ -18,8 +18,10 @@ live third-party geo API.**
 
 | File | Committed? | Purpose |
 | --- | --- | --- |
-| `dbip-city-lite.csv` | **NO** (gitignored) | The real **worldwide** production artifact (~70 MB; ~2.1 M merged IPv4 ranges, all countries, state/subdivision granularity). Generated by the refresh script; never committed. In production it lives on the Fly `/data` volume, pointed at by `DBIP_DATASET_PATH` (see below). |
-| `dbip-city-lite.fixture.csv` | **YES** | Tiny deterministic fixture (a handful of reserved IPv4 ranges) for offline geo + aggregation tests. |
+| `dbip-city-lite.csv` | **NO** (gitignored) | The real **worldwide** production IPv4 artifact (~70 MB; ~2.1 M merged ranges). Generated by the refresh script; never committed. In production it lives on the Fly `/data` volume, pointed at by `DBIP_DATASET_PATH`. |
+| `dbip-city-lite.ipv6.csv` | **NO** (gitignored) | Sibling IPv6 artifact (`start_hi,start_lo,end_hi,end_lo,country,subdivision`). Generate **off the 256 MB Fly VM** (the source CSV is ~685 MB). Pointed at by `DBIP_IPV6_DATASET_PATH`. |
+| `dbip-city-lite.fixture.csv` | **YES** | Tiny deterministic IPv4 fixture for offline geo + aggregation tests. |
+| `dbip-city-lite.ipv6.fixture.csv` | **YES** | Tiny IPv6 fixture (`2001:db8::/32`, `2405:201::/32`) so native IPv6 (Jio-like) lookups are tested offline. |
 | `README.md` | YES | This file. |
 
 `.gitignore` ignores `showcase/server/data/dbip-city-lite.*` **except**
@@ -28,16 +30,25 @@ ships.
 
 ## Dataset format
 
-`ip-geo.js` reads a compact, sorted range table (`#`/blank lines ignored):
+`ip-geo.js` reads two compact, sorted range tables (`#`/blank lines ignored):
+
+IPv4 (`dbip-city-lite.csv`):
 
 ```
 start_ip_int,end_ip_int,country,subdivision
 ```
 
-where `start_ip_int`/`end_ip_int` are the inclusive **uint32** forms of the
-IPv4 range bounds, sorted ascending by `start_ip_int` (the module binary-searches
-on that key). The lookup is **coarse IPv4-only**: IPv6 or unparseable input
-resolves to `'unknown'`.
+IPv6 (`dbip-city-lite.ipv6.csv`):
+
+```
+start_hi,start_lo,end_hi,end_lo,country,subdivision
+```
+
+`start_ip_int`/`end_ip_int` are inclusive **uint32** IPv4 bounds. IPv6 bounds are
+inclusive **uint64** halves of the 128-bit address (big-endian). Each file is
+sorted ascending by start. IPv4-mapped IPv6 (`::ffff:a.b.c.d`) unwraps to IPv4
+before lookup. Native IPv6 uses the sibling table. Unparseable input, Fly 6PN
+ULA, and CIDR `/56` rate-limit keys resolve to `'unknown'`.
 
 ## Dataset path / env var
 
@@ -45,10 +56,11 @@ resolves to `'unknown'`.
 
 ```
 process.env.DBIP_DATASET_PATH || <this dir>/dbip-city-lite.csv
+process.env.DBIP_IPV6_DATASET_PATH || sibling of the IPv4 path (*.ipv6.csv / *.ipv6.fixture.csv)
 ```
 
-Set `DBIP_DATASET_PATH` to point at the fixture in tests, or at an alternate
-production path in deployment.
+Set `DBIP_DATASET_PATH` to point at the fixture in tests (the IPv6 sibling is
+resolved automatically), or set both paths in deployment.
 
 ## Graceful degradation (hard requirement)
 
@@ -67,16 +79,18 @@ curl -L -o /tmp/dbip-city-lite.csv.gz \
   https://download.db-ip.com/free/dbip-city-lite-YYYY-MM.csv.gz   # ~85 MB gz
 gunzip -k /tmp/dbip-city-lite.csv.gz                              # ~685 MB
 
-# 2. Transform -> compact, sorted, IPv4-only, ADJACENT-SAME-REGION-MERGED table:
+# 2. Transform -> compact, sorted, ADJACENT-SAME-REGION-MERGED IPv4 + IPv6 tables.
+#    Do this on a machine with RAM to spare (not the 256 MB Fly VM):
 node showcase/server/scripts/refresh-dbip-dataset.mjs --in /tmp/dbip-city-lite.csv
-#    (optional: --out <path>; defaults to DBIP_DATASET_PATH or <this dir>/dbip-city-lite.csv)
+#    (optional: --out <path> --ipv6-out <path>; defaults to DBIP_DATASET_PATH /
+#     a sibling *.ipv6.csv, or <this dir>/dbip-city-lite.csv and .ipv6.csv)
 ```
 
-The transform is worldwide (all countries) and emits IPv4 ranges only; it merges
-consecutive same-`(country, subdivision)` adjacent ranges (a ~40%+ row reduction)
-so the output stays small. A 2026-06 run produced ~2.1 M ranges / ~70 MB from
-~3.7 M raw IPv4 rows. Running the script with no `--in` prints the download URL +
-the format spec (and the DB-IP attribution) and exits non-zero.
+The transform is worldwide (all countries). It merges consecutive
+same-`(country, subdivision)` adjacent ranges so the output stays small. A 2026-06
+IPv4 run produced ~2.1 M ranges / ~70 MB from ~3.7 M raw IPv4 rows. IPv6 is
+written to the sibling file. Running the script with no `--in` prints the
+download URL + the format spec (and the DB-IP attribution) and exits non-zero.
 
 The loader reads this file in 1 MiB chunks into compact typed arrays (no
 whole-file Buffer/string), so even the worldwide dataset loads with a ~25–30 MB
@@ -84,19 +98,24 @@ footprint — comfortably within the 256 MB Fly VM, and robust as the dataset gr
 
 ## Production deployment (Fly `/data` volume)
 
-`DBIP_DATASET_PATH = '/data/dbip-city-lite.csv'` is set in `fly.toml`. The dataset
-is **not** baked into the Docker image (it would bloat every deploy); it lives on
-the existing `fsb_data` volume mounted at `/data`. To deploy/refresh:
+`DBIP_DATASET_PATH = '/data/dbip-city-lite.csv'` and
+`DBIP_IPV6_DATASET_PATH = '/data/dbip-city-lite.ipv6.csv'` are set in `fly.toml`.
+The datasets are **not** baked into the Docker image (they would bloat every
+deploy); they live on the existing `fsb_data` volume mounted at `/data`. To
+deploy/refresh:
 
 ```bash
-# After generating the file (above), deploy the app (env var already set):
+# After generating both files (above), deploy the app (env vars already set):
 fly deploy
 
-# Upload the generated dataset (written to this dir by the refresh script) to the volume:
-fly ssh sftp shell -a fsb-server        # then:  put showcase/server/data/dbip-city-lite.csv /data/dbip-city-lite.csv
+# Upload the generated datasets to the volume:
+fly ssh sftp shell -a fsb-server
+# then:
+#   put showcase/server/data/dbip-city-lite.csv /data/dbip-city-lite.csv
+#   put showcase/server/data/dbip-city-lite.ipv6.csv /data/dbip-city-lite.ipv6.csv
 
 # The lazy loader caches a "no dataset" result on first miss, so restart the
-# machine once after the upload so it re-reads the now-present file:
+# machine once after the upload so it re-reads the now-present files:
 fly machine restart -a fsb-server
 ```
 
diff --git a/showcase/server/data/dbip-city-lite.ipv6.fixture.csv b/showcase/server/data/dbip-city-lite.ipv6.fixture.csv
new file mode 100644
index 000000000..1ba4c637a
--- /dev/null
+++ b/showcase/server/data/dbip-city-lite.ipv6.fixture.csv
@@ -0,0 +1,12 @@
+# dbip-city-lite.ipv6.fixture.csv -- TINY committed IPv6 test fixture.
+#
+# Format: start_hi,start_lo,end_hi,end_lo,country,subdivision
+# hi/lo are inclusive uint64 halves of the 128-bit IPv6 address (big-endian).
+# Sorted ascending by (start_hi, start_lo).
+#
+# 2001:db8::/32  -> AU/Victoria     (docs prefix; not a real geo)
+# 2405:201::/32  -> IN/Maharashtra  (synthetic stand-in for Indian IPv6 / Jio)
+#
+# Attribution for the real dataset: IP Geolocation by DB-IP (https://db-ip.com), CC-BY-4.0.
+2306139568115548160,0,2306139572410515455,18446744073709551615,AU,Victoria
+2595482963567181824,0,2595482967862149119,18446744073709551615,IN,Maharashtra
diff --git a/showcase/server/scripts/refresh-dbip-dataset.mjs b/showcase/server/scripts/refresh-dbip-dataset.mjs
index a51f69b98..118c2b203 100644
--- a/showcase/server/scripts/refresh-dbip-dataset.mjs
+++ b/showcase/server/scripts/refresh-dbip-dataset.mjs
@@ -8,15 +8,17 @@
  * This script transforms the upstream DB-IP IP-to-City Lite CSV into the
  * compact range table that showcase/server/src/utils/ip-geo.js reads:
  *
- *     start_ip_int,end_ip_int,country,subdivision
+ *     start_ip_int,end_ip_int,country,subdivision          (IPv4)
+ *     start_hi,start_lo,end_hi,end_lo,country,subdivision  (IPv6 uint64 halves)
  *
- * (inclusive uint32 IPv4 bounds, sorted ascending by start_ip_int). The output
- * is written to the production dataset path consumed by ip-geo.js
+ * (inclusive bounds, each file sorted ascending). The IPv4 output is written to
+ * the production dataset path consumed by ip-geo.js
  * (process.env.DBIP_DATASET_PATH || showcase/server/data/dbip-city-lite.csv).
+ * IPv6 goes to --ipv6-out or a sibling `*.ipv6.csv` (DBIP_IPV6_DATASET_PATH).
  *
- * The real artifact is ~100MB and is NOT committed (see data/README.md +
+ * The real artifacts are tens of MB and are NOT committed (see data/README.md +
  * .gitignore -- the data/dbip-city-lite.* glob is ignored EXCEPT *.fixture.csv).
- * Production data is generated here (or at Docker build) and dropped in.
+ * Production data is generated here (off the 256 MB Fly VM) and dropped in.
  *
  * Usage:
  *   1. Download the free monthly "IP to City Lite" CSV from DB-IP:
@@ -28,13 +30,7 @@
  *
  *   2. Run:
  *        node showcase/server/scripts/refresh-dbip-dataset.mjs --in <downloaded.csv>
- *      optionally with --out <path> (defaults to DBIP_DATASET_PATH or the
- *      production path under showcase/server/data/).
- *
- * Only IPv4 rows are emitted (ip-geo.js is coarse IPv4-only; IPv6 -> 'unknown').
- * If --in is omitted the script prints the download URL + this format spec and
- * exits non-zero, so it is self-documenting but still runnable against a real
- * downloaded source CSV.
+ *      optionally with --out <path> and --ipv6-out <path>.
  *
  * Run: node showcase/server/scripts/refresh-dbip-dataset.mjs --in dbip-city-lite.csv
  */
@@ -51,15 +47,31 @@ const __dirname = dirname(__filename);
 
 // Default production artifact path (mirrors ip-geo.js DEFAULT_DATASET_PATH).
 const DEFAULT_OUT = join(__dirname, '..', 'data', 'dbip-city-lite.csv');
+const DEFAULT_IPV6_OUT = join(__dirname, '..', 'data', 'dbip-city-lite.ipv6.csv');
 
 const DOWNLOAD_URL = 'https://db-ip.com/db/download/ip-to-city-lite';
 const ATTRIBUTION = 'IP Geolocation by DB-IP (https://db-ip.com), CC-BY-4.0';
+const UINT64_MAX_PLUS_ONE = 1n << 64n;
+
+function siblingIpv6Path(ipv4Path) {
+  if (typeof ipv4Path !== 'string' || ipv4Path === '') return DEFAULT_IPV6_OUT;
+  if (ipv4Path.endsWith('.fixture.csv')) {
+    return ipv4Path.replace(/\.fixture\.csv$/, '.ipv6.fixture.csv');
+  }
+  if (ipv4Path.endsWith('.csv')) return ipv4Path.slice(0, -4) + '.ipv6.csv';
+  return ipv4Path + '.ipv6';
+}
 
 function parseArgs(argv) {
-  const args = { in: null, out: process.env.DBIP_DATASET_PATH || DEFAULT_OUT };
+  const args = {
+    in: null,
+    out: process.env.DBIP_DATASET_PATH || DEFAULT_OUT,
+    ipv6Out: process.env.DBIP_IPV6_DATASET_PATH || null,
+  };
   for (let i = 0; i < argv.length; i++) {
     if (argv[i] === '--in') args.in = argv[++i];
     else if (argv[i] === '--out') args.out = argv[++i];
+    else if (argv[i] === '--ipv6-out') args.ipv6Out = argv[++i];
   }
   return args;
 }
@@ -79,6 +91,67 @@ function ipv4ToInt(ip) {
   return acc >>> 0;
 }
 
+/**
+ * Native IPv6 -> big-endian uint64 halves, or null. Same rules as ip-geo.js
+ * (reject CIDR, zone IDs, dotted mixed form).
+ *
+ * @param {unknown} ip
+ * @returns {{hi:bigint, lo:bigint}|null}
+ */
+function ipv6ToHalves(ip) {
+  if (typeof ip !== 'string') return null;
+  const s = ip.trim().toLowerCase();
+  if (s === '' || s.includes('/') || s.includes('%') || s.includes('.')) return null;
+  if (!s.includes(':')) return null;
+
+  const sides = s.split('::');
+  if (sides.length > 2) return null;
+
+  const parseSide = (side) => {
+    if (side === '') return [];
+    const parts = side.split(':');
+    const out = [];
+    for (const p of parts) {
+      if (!/^[0-9a-f]{1,4}$/.test(p)) return null;
+      out.push(parseInt(p, 16));
+    }
+    return out;
+  };
+
+  let groups;
+  if (sides.length === 1) {
+    groups = parseSide(sides[0]);
+    if (!groups || groups.length !== 8) return null;
+  } else {
+    const head = parseSide(sides[0]);
+    const tail = parseSide(sides[1]);
+    if (!head || !tail) return null;
+    const missing = 8 - head.length - tail.length;
+    if (missing < 1) return null;
+    groups = head.concat(new Array(missing).fill(0), tail);
+  }
+
+  let hi = 0n;
+  let lo = 0n;
+  for (let i = 0; i < 4; i++) hi = (hi << 16n) + BigInt(groups[i]);
+  for (let i = 4; i < 8; i++) lo = (lo << 16n) + BigInt(groups[i]);
+  return { hi, lo };
+}
+
+function cmpU128(aHi, aLo, bHi, bLo) {
+  if (aHi < bHi) return -1;
+  if (aHi > bHi) return 1;
+  if (aLo < bLo) return -1;
+  if (aLo > bLo) return 1;
+  return 0;
+}
+
+function addOneU128(hi, lo) {
+  const nlo = lo + 1n;
+  if (nlo === UINT64_MAX_PLUS_ONE) return [hi + 1n, 0n];
+  return [hi, nlo];
+}
+
 /**
  * Split one upstream CSV line on commas, honouring simple double-quoted fields
  * (DB-IP quotes city/stateprov values that may contain commas). Good enough for
@@ -114,11 +187,14 @@ function printSpecAndExit() {
   console.error('  1. Download the free "IP to City Lite" CSV from DB-IP:');
   console.error(`       ${DOWNLOAD_URL}`);
   console.error('     (gunzip the .csv.gz first).');
-  console.error('  2. Re-run with: --in <downloaded.csv> [--out <path>]');
+  console.error('  2. Re-run with: --in <downloaded.csv> [--out <path>] [--ipv6-out <path>]');
   console.error('');
-  console.error('  Output format (consumed by src/utils/ip-geo.js):');
+  console.error('  IPv4 output (consumed by src/utils/ip-geo.js):');
   console.error('     start_ip_int,end_ip_int,country,subdivision');
-  console.error('     (inclusive uint32 IPv4 bounds, sorted ascending; IPv4 rows only)');
+  console.error('     (inclusive uint32 IPv4 bounds, sorted ascending)');
+  console.error('  IPv6 output (sibling *.ipv6.csv unless --ipv6-out / DBIP_IPV6_DATASET_PATH):');
+  console.error('     start_hi,start_lo,end_hi,end_lo,country,subdivision');
+  console.error('     (inclusive uint64 halves, sorted ascending by start)');
   process.exit(2);
 }
 
@@ -133,12 +209,15 @@ async function main() {
   }
 
   const outPath = resolve(args.out);
+  const ipv6OutPath = resolve(args.ipv6Out || siblingIpv6Path(outPath));
   mkdirSync(dirname(outPath), { recursive: true });
+  mkdirSync(dirname(ipv6OutPath), { recursive: true });
 
-  // Stream-transform: read upstream rows, emit IPv4 range rows. We collect into
-  // memory to sort by start_ip_int before writing (ip-geo.js binary-searches a
-  // sorted table). The IP-to-City Lite CSV is large but fits comfortably.
+  // Stream-transform: read upstream rows, emit IPv4 and IPv6 range rows. We
+  // collect into memory to sort before writing (ip-geo.js binary-searches a
+  // sorted table). Run this OFF the 256 MB Fly VM -- the source CSV is ~685 MB.
   const rows = [];
+  const v6rows = [];
   const rl = createInterface({ input: createReadStream(inPath, 'utf8'), crlfDelay: Infinity });
 
   let lineNo = 0;
@@ -148,18 +227,29 @@ async function main() {
     const cols = splitCsvLine(line);
     // Expected upstream order: ip_start, ip_end, continent, country, stateprov, ...
     if (cols.length < 5) continue;
-    const startInt = ipv4ToInt(cols[0]);
-    const endInt = ipv4ToInt(cols[1]);
-    if (startInt === null || endInt === null) continue; // skip IPv6 / malformed
-    if (endInt < startInt) continue;
     const country = (cols[3] || '').trim();
     const subdivision = (cols[4] || '').trim();
     if (country === '') continue;
-    // Strip commas from labels defensively so the compact 4-field format stays parseable.
-    rows.push([startInt, endInt, country.replace(/,/g, ' '), subdivision.replace(/,/g, ' ')]);
+    const countrySafe = country.replace(/,/g, ' ');
+    const subSafe = subdivision.replace(/,/g, ' ');
+
+    const startInt = ipv4ToInt(cols[0]);
+    const endInt = ipv4ToInt(cols[1]);
+    if (startInt !== null && endInt !== null) {
+      if (endInt < startInt) continue;
+      rows.push([startInt, endInt, countrySafe, subSafe]);
+      continue;
+    }
+
+    const startV6 = ipv6ToHalves(cols[0]);
+    const endV6 = ipv6ToHalves(cols[1]);
+    if (!startV6 || !endV6) continue;
+    if (cmpU128(endV6.hi, endV6.lo, startV6.hi, startV6.lo) < 0) continue;
+    v6rows.push([startV6.hi, startV6.lo, endV6.hi, endV6.lo, countrySafe, subSafe]);
   }
 
   rows.sort((a, b) => a[0] - b[0]);
+  v6rows.sort((a, b) => cmpU128(a[0], a[1], b[0], b[1]));
 
   // Range-merge: collapse CONSECUTIVE rows that share country+subdivision AND
   // whose ranges are contiguous or overlapping (nextStart <= lastEnd + 1) into a
@@ -172,13 +262,26 @@ async function main() {
   for (const r of rows) {
     const last = merged.length > 0 ? merged[merged.length - 1] : null;
     if (last && last[2] === r[2] && last[3] === r[3] && r[0] <= last[1] + 1) {
-      // Same label + adjacent/overlapping -> extend the end (max handles a
-      // fully-contained range without shrinking the span). Different
-      // subdivisions within one country stay distinct (US/California vs US/Nevada).
       if (r[1] > last[1]) last[1] = r[1];
     } else {
-      merged.push([r[0], r[1], r[2], r[3]]); // copy so last[1] is safe to mutate
+      merged.push([r[0], r[1], r[2], r[3]]);
+    }
+  }
+
+  const mergedV6 = [];
+  for (const r of v6rows) {
+    const last = mergedV6.length > 0 ? mergedV6[mergedV6.length - 1] : null;
+    if (last && last[4] === r[4] && last[5] === r[5]) {
+      const next = addOneU128(last[2], last[3]);
+      if (cmpU128(r[0], r[1], next[0], next[1]) <= 0) {
+        if (cmpU128(r[2], r[3], last[2], last[3]) > 0) {
+          last[2] = r[2];
+          last[3] = r[3];
+        }
+        continue;
+      }
     }
+    mergedV6.push([r[0], r[1], r[2], r[3], r[4], r[5]]);
   }
 
   const ws = createWriteStream(outPath, 'utf8');
@@ -190,9 +293,21 @@ async function main() {
   }
   await new Promise((res, rej) => { ws.end((err) => (err ? rej(err) : res())); });
 
+  const ws6 = createWriteStream(ipv6OutPath, 'utf8');
+  ws6.write(`# Generated by refresh-dbip-dataset.mjs from a DB-IP IP-to-City Lite source CSV.\n`);
+  ws6.write(`# ${ATTRIBUTION}\n`);
+  ws6.write(`# Format: start_hi,start_lo,end_hi,end_lo,country,subdivision (uint64 IPv6 halves, sorted ascending; adjacent same-region ranges merged).\n`);
+  for (const r of mergedV6) {
+    ws6.write(`${r[0]},${r[1]},${r[2]},${r[3]},${r[4]},${r[5]}\n`);
+  }
+  await new Promise((res, rej) => { ws6.end((err) => (err ? rej(err) : res())); });
+
   const reduction = rows.length > 0 ? Math.round((1 - merged.length / rows.length) * 100) : 0;
+  const reduction6 = v6rows.length > 0 ? Math.round((1 - mergedV6.length / v6rows.length) * 100) : 0;
   console.log(`refresh-dbip-dataset: wrote ${merged.length} IPv4 ranges to ${outPath}`);
   console.log(`  Merged from ${rows.length} raw IPv4 ranges (${reduction}% reduction).`);
+  console.log(`refresh-dbip-dataset: wrote ${mergedV6.length} IPv6 ranges to ${ipv6OutPath}`);
+  console.log(`  Merged from ${v6rows.length} raw IPv6 ranges (${reduction6}% reduction).`);
   console.log(`  Source lines read: ${lineNo}`);
   console.log(`  ${ATTRIBUTION}`);
 }
diff --git a/showcase/server/src/db/queries.js b/showcase/server/src/db/queries.js
index 6e627e9db..4e3e37fdb 100644
--- a/showcase/server/src/db/queries.js
+++ b/showcase/server/src/db/queries.js
@@ -164,6 +164,9 @@ class Queries {
     this.insertTelemetryEventWithRegionV2 = this.db.prepare(
       'INSERT OR IGNORE INTO telemetry_events (event_id, install_uuid, ts_minute, mcp_client, model, tokens_in, tokens_out, active_agent_count, active_count_version, event_type, ip_hash, received_at, region) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
     );
+    this.insertTelemetryEventWithRegionV3 = this.db.prepare(
+      'INSERT OR IGNORE INTO telemetry_events (event_id, install_uuid, ts_minute, mcp_client, model, tokens_in, tokens_out, active_agent_count, active_count_version, event_type, ip_hash, received_at, region, geo_kind) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
+    );
 
     this.upsertRollupDaily = this.db.prepare(`
       INSERT INTO telemetry_rollups_daily (install_uuid, day_utc, tokens_in, tokens_out, max_active_agents, event_count)
@@ -186,6 +189,24 @@ class Queries {
         trusted_active_sample_count = excluded.trusted_active_sample_count,
         event_count = excluded.event_count
     `);
+    this.upsertRollupDailyV3 = this.db.prepare(`
+      INSERT INTO telemetry_rollups_daily (
+        install_uuid, day_utc, tokens_in, tokens_out, max_active_agents,
+        trusted_active_sample_count, event_count, region, geo_kind
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+      ON CONFLICT(install_uuid, day_utc) DO UPDATE SET
+        tokens_in = excluded.tokens_in,
+        tokens_out = excluded.tokens_out,
+        max_active_agents = excluded.max_active_agents,
+        trusted_active_sample_count = excluded.trusted_active_sample_count,
+        event_count = excluded.event_count,
+        region = excluded.region,
+        geo_kind = excluded.geo_kind
+    `);
+    this.updateRollupRegion = this.db.prepare(`
+      UPDATE telemetry_rollups_daily SET region = ?, geo_kind = ?
+      WHERE install_uuid = ? AND day_utc = ?
+    `);
 
     this.upsertGlobalAggregate = this.db.prepare(`
       INSERT INTO telemetry_global_aggregates (day_utc, unique_installs, tokens_in_sum, tokens_out_sum, agents_active_sum, popular_mcp_json, popular_agent_json)
@@ -343,10 +364,11 @@ class Queries {
     // exceed the day's unique-install population and can fabricate k-sized
     // cohorts. UUIDs remain internal and never enter the aggregate JSON.
     this.selectRegionInstallMembershipsForDayRange = this.db.prepare(
-      `SELECT region, install_uuid
+      `SELECT region, geo_kind, install_uuid
        FROM (
          SELECT
            region,
+           geo_kind,
            install_uuid,
            ROW_NUMBER() OVER (
              PARTITION BY install_uuid
@@ -358,6 +380,26 @@ class Queries {
        WHERE membership_rank = 1
        ORDER BY install_uuid ASC`
     );
+    // Last-known coarse region per install across the 365-day rollup window.
+    // One row per install_uuid; used for the persistent anonymous census.
+    // Recency ranks only successful geo: a newer 'unknown' (dataset miss, Fly
+    // 6PN ULA, failed lookup) must not replace an older real region the globe
+    // is meant to keep. Installs that never resolved stay out of the census.
+    this.selectLastKnownRollupRegions = this.db.prepare(
+      `SELECT region, install_uuid
+       FROM (
+         SELECT
+           region,
+           install_uuid,
+           ROW_NUMBER() OVER (
+             PARTITION BY install_uuid
+             ORDER BY day_utc DESC
+           ) AS recency_rank
+         FROM telemetry_rollups_daily
+         WHERE region IS NOT NULL AND region != '' AND region != 'unknown'
+       )
+       WHERE recency_rank = 1`
+    );
 
     this.selectTodaySalt = this.db.prepare('SELECT salt_hex, minted_at FROM telemetry_daily_salt WHERE day_utc = ?');
     this.insertTodaySalt = this.db.prepare('INSERT INTO telemetry_daily_salt (day_utc, salt_hex, minted_at) VALUES (?, ?, ?)');
@@ -664,6 +706,10 @@ class Queries {
     return this.selectRegionInstallMembershipsForDayRange.all(startMs, endMs);
   }
 
+  lastKnownRollupRegions() {
+    return this.selectLastKnownRollupRegions.all();
+  }
+
   upsertGlobalAggregateRow(dayUtc, uniqueInstalls, tokensInSum, tokensOutSum, agentsActiveSum, popularMcpJson, popularAgentJson, popularRegionJson) {
     // Quick task 260630-hct -- route through the 8-arg region-bearing statement so
     // the region breakdown round-trips; popularRegionJson defaults to '[]'.
diff --git a/showcase/server/src/db/schema.js b/showcase/server/src/db/schema.js
index 39a41599b..6220c5195 100644
--- a/showcase/server/src/db/schema.js
+++ b/showcase/server/src/db/schema.js
@@ -241,9 +241,11 @@ function initializeDatabase(db) {
     --   so INSERT OR IGNORE satisfies BEAT-04 (client-side replay-dedup). ip_hash stores ONLY the
     --   HMAC-SHA256(plaintext_ip, todays_salt); plaintext IP never persisted.
     -- Quick task 260630-hct -- short-lived region column (coarse country/US-state
-    -- label, e.g. US-CA, DEFAULT 'unknown'). Derived from req.ip at ingest, rolled
-    -- up daily by the housekeeper behind a k>=5 floor, and dropped by the existing
-    -- 7-day retention. It is NOT a durable per-UUID location profile.
+    -- label, e.g. US-CA, DEFAULT 'unknown'). Derived at ingest from Fly-Client-IP,
+    -- copied onto 365-day rollups (durable anonymous last-known location), and
+    -- the raw event row is still dropped by 7-day retention. geo_kind stores
+    -- only the address family that produced the label (ipv4 / ipv6 / ...), never
+    -- the IP, so 'unknown' is diagnosable after events expire.
     CREATE TABLE IF NOT EXISTS telemetry_events (
       event_id TEXT PRIMARY KEY,
       install_uuid TEXT NOT NULL,
@@ -257,7 +259,8 @@ function initializeDatabase(db) {
       event_type TEXT NOT NULL,
       ip_hash TEXT NOT NULL,
       received_at INTEGER NOT NULL,
-      region TEXT NOT NULL DEFAULT 'unknown'
+      region TEXT NOT NULL DEFAULT 'unknown',
+      geo_kind TEXT NOT NULL DEFAULT 'unknown'
     );
 
     CREATE INDEX IF NOT EXISTS idx_telemetry_events_uuid_ts ON telemetry_events(install_uuid, ts_minute);
@@ -266,6 +269,8 @@ function initializeDatabase(db) {
     CREATE INDEX IF NOT EXISTS idx_telemetry_events_received_at ON telemetry_events(received_at);
 
     -- telemetry_rollups_daily: per-UUID per-day aggregates; 365-day retention; powers Phase 274.
+    -- region / geo_kind are the install's latest coarse location for that UTC day
+    -- (anonymous: country or US-state label + address family, never an IP).
     CREATE TABLE IF NOT EXISTS telemetry_rollups_daily (
       install_uuid TEXT NOT NULL,
       day_utc TEXT NOT NULL,
@@ -274,6 +279,8 @@ function initializeDatabase(db) {
       max_active_agents INTEGER NOT NULL DEFAULT 0,
       trusted_active_sample_count INTEGER NOT NULL DEFAULT 0,
       event_count INTEGER NOT NULL DEFAULT 0,
+      region TEXT NOT NULL DEFAULT 'unknown',
+      geo_kind TEXT NOT NULL DEFAULT 'unknown',
       UNIQUE(install_uuid, day_utc)
     );
 
@@ -367,6 +374,15 @@ function initializeDatabase(db) {
   try {
     db.exec(`ALTER TABLE telemetry_global_aggregates ADD COLUMN trusted_active_installs INTEGER NOT NULL DEFAULT 0`);
   } catch { /* column already exists */ }
+  try {
+    db.exec(`ALTER TABLE telemetry_events ADD COLUMN geo_kind TEXT NOT NULL DEFAULT 'unknown'`);
+  } catch { /* column already exists */ }
+  try {
+    db.exec(`ALTER TABLE telemetry_rollups_daily ADD COLUMN region TEXT NOT NULL DEFAULT 'unknown'`);
+  } catch { /* column already exists */ }
+  try {
+    db.exec(`ALTER TABLE telemetry_rollups_daily ADD COLUMN geo_kind TEXT NOT NULL DEFAULT 'unknown'`);
+  } catch { /* column already exists */ }
 
   // Existing GitHub cache rows predate traversal-completeness metadata. They
   // intentionally migrate as incomplete so the poller performs a full walk
diff --git a/showcase/server/src/middleware/telemetry-rate-limit.js b/showcase/server/src/middleware/telemetry-rate-limit.js
index 10b491737..0f42d6be0 100644
--- a/showcase/server/src/middleware/telemetry-rate-limit.js
+++ b/showcase/server/src/middleware/telemetry-rate-limit.js
@@ -3,9 +3,11 @@
  *
  * LAYER 1: createTelemetryRateLimiter(db) wraps express-rate-limit@^8.3.0
  * (CVE-2026-30827 IPv4-mapped-IPv6 collision fix) with a CUSTOM keyGenerator
- * that returns hashIp(req.ip, db). The rate-limit bucket and the storage
- * identifier are therefore the same value -- an attacker cannot rotate one
- * without also rotating the other (BLOCKER #2 alignment).
+ * that returns hashIp(ipKeyGenerator(clientIp(req)), db). clientIp prefers
+ * Fly-Client-IP so the bucket is the real peer, not Fly's SJC anycast. The
+ * rate-limit bucket and the storage identifier are therefore the same value
+ * -- an attacker cannot rotate one without also rotating the other
+ * (BLOCKER #2 alignment).
  *
  *   - windowMs:           60 * 1000 (1 minute)
  *   - max:                30 batches/min (env-overridable for tests)
@@ -33,6 +35,7 @@
 const rateLimit = require('express-rate-limit');
 const { ipKeyGenerator } = require('express-rate-limit');
 const { hashIp } = require('../utils/telemetry-hash');
+const { clientIp } = require('../utils/client-ip');
 
 /**
  * @param {Database} db better-sqlite3 instance
@@ -51,13 +54,15 @@ function createTelemetryRateLimiter(db) {
     // BLOCKER #2 alignment: bucket key = HMAC-SHA256(canonicalised_ip, todays_salt).
     // The canonicalisation runs through express-rate-limit's ipKeyGenerator helper
     // which collapses IPv6 to a /56 subnet and resolves IPv4-mapped-IPv6 forms
-    // (CVE-2026-30827 fix; req.ip alone would let dual-stack users escape buckets).
+    // (CVE-2026-30827 fix). clientIp(req) prefers Fly-Client-IP so we do not
+    // hash Fly's shared/anycast address (which collapsed every install into two
+    // daily buckets at the UUID cap of 20).
     // The hashIp() output becomes the same identifier we store as ip_hash in
     // telemetry_events, so an attacker cannot rotate the rate-limit identity
     // without also rotating the storage identity.
-    // PRIVACY: req.ip is referenced exactly here, immediately canonicalised then
-    // hashed; the canonical form is discarded after the digest.
-    keyGenerator: (req) => hashIp(ipKeyGenerator(req.ip), db),
+    // PRIVACY: the plaintext IP is referenced exactly here, immediately
+    // canonicalised then hashed; the canonical form is discarded after the digest.
+    keyGenerator: (req) => hashIp(ipKeyGenerator(clientIp(req)), db),
     handler: (req, res) => {
       res.status(429).json({ error: 'rate_limited' });
     },
diff --git a/showcase/server/src/routes/public-stats.js b/showcase/server/src/routes/public-stats.js
index 1a63c6291..a2a4f36a8 100644
--- a/showcase/server/src/routes/public-stats.js
+++ b/showcase/server/src/routes/public-stats.js
@@ -34,6 +34,7 @@
 const express = require('express');
 const crypto = require('crypto');
 const activeTracker = require('../telemetry/active-tracker');
+const { applyDistinctKFloor, REGION_K_FLOOR } = require('../telemetry/housekeeper');
 
 // 30-second in-process memo TTL.
 const MEMO_TTL_MS = 30 * 1000;
@@ -129,6 +130,15 @@ function buildHeadlineJson(queries) {
          : 'unknown',
     uniq: Number.isInteger(r.uniq) ? r.uniq : 0,
   }));
+  const users_by_region_365d = applyDistinctKFloor(
+    queries.lastKnownRollupRegions(),
+    'region',
+    'install_uuid',
+    REGION_K_FLOOR
+  ).map((r) => ({
+    label: typeof r.region === 'string' ? r.region : 'unknown',
+    uniq: Number.isInteger(r.uniq) ? r.uniq : 0,
+  }));
 
   const avg_agents_per_reporting_user = active_agents_reporting_users_now > 0
     ? Math.round((active_agents_now / active_agents_reporting_users_now) * 10) / 10
@@ -169,6 +179,7 @@ function buildHeadlineJson(queries) {
     popular_mcp_clients,
     popular_agents,
     popular_regions,
+    users_by_region_365d,
     avg_agents_per_reporting_user,
     // Compatibility alias now uses the only valid denominator: installs that
     // supplied a v2 active count in the same ten-minute cohort.
diff --git a/showcase/server/src/routes/telemetry.js b/showcase/server/src/routes/telemetry.js
index a4eb8f5c3..264b29173 100644
--- a/showcase/server/src/routes/telemetry.js
+++ b/showcase/server/src/routes/telemetry.js
@@ -29,9 +29,11 @@ const { ipKeyGenerator } = require('express-rate-limit');
 const { isValidUuidV4 } = require('../utils/telemetry-hash');
 // Quick task 260630-hct -- coarse IP -> region derive. Required directly as a
 // sibling util (NOT passed through the router factory) so the factory signature
-// stays stable. Posture mirrors hashIp: req.ip is an inline argument, used once
-// then discarded; only the k>=5-floored aggregate region label is retained.
-const { deriveRegion } = require('../utils/ip-geo');
+// stays stable. Posture mirrors hashIp: the plaintext client IP is an inline
+// argument, used once then discarded; only the k>=5-floored aggregate region
+// label is retained.
+const { deriveRegion, classifyIp } = require('../utils/ip-geo');
+const { clientIp } = require('../utils/client-ip');
 const {
   createTelemetryRateLimiter,
   checkPerUuidBudget,
@@ -211,34 +213,48 @@ function createTelemetryRouter(db, queries, hashIp) {
     }
 
     // PRIVACY INVARIANT -- Per CONTEXT D-09 + INGEST-13 + quick task 260630-hct:
-    //   req.ip is referenced EXACTLY TWICE per request, on the next two lines:
-    //     1. hashIp(ipKeyGenerator(req.ip), db)      -- rate-limit/HMAC hash
-    //     2. deriveRegion(ipKeyGenerator(req.ip))    -- coarse country/US-state geo
-    //   BOTH references are inline arguments to an immediately-evaluated call. In
-    //   neither case is req.ip (or the canonical form ipKeyGenerator returns)
-    //   assigned to a local variable that escapes this scope, NEVER logged, NEVER
-    //   stored. Plaintext IP is discarded at end-of-function. Only the derived
-    //   ip_hash and the k>=5-floored AGGREGATE region label are retained; the raw
-    //   per-event region is rolled up daily and dropped by the 7-day retention --
-    //   there is no durable (install_uuid -> region) profile.
+    //   the plaintext client IP is referenced EXACTLY THREE times per request, on
+    //   the next three lines, via clientIp(req) (Fly-Client-IP, else req.ip):
+    //     1. hashIp(ipKeyGenerator(clientIp(req)), db)  -- rate-limit/HMAC hash
+    //     2. deriveRegion(clientIp(req))                -- coarse country/US-state geo
+    //     3. classifyIp(clientIp(req))                  -- address family enum, never the IP
+    //   BOTH references are inline arguments to an immediately-evaluated call. The
+    //   IP is NEVER assigned to a local that escapes this scope, NEVER logged,
+    //   NEVER stored. Only the derived ip_hash and the k>=5-floored AGGREGATE
+    //   region label are retained; the raw per-event region is rolled up daily
+    //   and dropped by the 7-day retention -- there is no durable
+    //   (install_uuid -> region) profile.
     //   Test: tests/server-no-ip-leak.test.js (positively asserts the 2-inline count).
     //
+    // Why clientIp() instead of req.ip: Fly's X-Forwarded-For chain is two hops
+    // (client + shared/anycast). trust proxy 1 therefore hashes/geolocates the
+    // SJC anycast IPv4 (everyone → US-CA) or a 6PN IPv6 (everyone → unknown),
+    // and the per-IP UUID cap of 20 silently drops the rest of the world.
+    // Fly-Client-IP is the TCP peer Fly accepted. Geo uses the raw address, NOT
+    // ipKeyGenerator's IPv6 /56 form -- that string is not an IPv4 and would
+    // force every IPv6 client (most of India) into 'unknown'.
+    //
     // WR-02 alignment (Phase 273 review): ipKeyGenerator is the CVE-2026-30827 fix
     // from express-rate-limit. It collapses IPv6 addresses to a /56 subnet and
     // normalises IPv4-mapped-IPv6 forms so dual-stack users cannot escape buckets
-    // by switching address families. middleware/telemetry-rate-limit.js:54 already
+    // by switching address families. middleware/telemetry-rate-limit.js already
     // applies it to the rate-limit bucket key; applying the same canonicalisation
     // here makes the stored ip_hash equal to the rate-limit bucket key for every
     // request (the "same identifier" invariant claimed by that middleware's
     // docstring). For IPv6 clients this slightly widens anonymity (same /56 ->
     // same stored hash); for IPv4 it is a no-op since ipKeyGenerator returns the
     // address unchanged.
-    const clientHash = hashIp(ipKeyGenerator(req.ip), db);
-    // Second (and only other) inline req.ip touch: coarse geo derive. deriveRegion
-    // returns {country, subdivision} | 'unknown'; regionLabel() collapses it to a
-    // compact state-granularity STRING (e.g. 'US-CA' or 'unknown'). The plaintext
-    // IP is consumed inline here exactly as in the hashIp call above and discarded.
-    const regionTag = regionLabel(deriveRegion(ipKeyGenerator(req.ip)));
+    const clientHash = hashIp(ipKeyGenerator(clientIp(req)), db);
+    // Second inline client-IP touch: coarse geo derive. Pass the raw client
+    // address, not the rate-limit key. deriveRegion unwraps IPv4-mapped IPv6,
+    // returns {country, subdivision} | 'unknown'; regionLabel() collapses it to
+    // a compact state-granularity STRING (e.g. 'US-CA' or 'unknown').
+    const regionTag = regionLabel(deriveRegion(clientIp(req)));
+    // Third inline client-IP touch: address-family enum only (never the IP).
+    // Persisted beside region so 'unknown' is diagnosable after 7-day event
+    // expiry (ipv6-ula = Fly 6PN, ipv6-cidr = /56 rate-limit key, ipv6 = native
+    // IPv6 with no city table, ipv4 = dataset miss).
+    const geoKind = classifyIp(clientIp(req));
 
     const body = req.body;
     if (!body || !Array.isArray(body.events)) {
@@ -345,11 +361,11 @@ function createTelemetryRouter(db, queries, hashIp) {
             ? ACTIVE_COUNT_VERSION : 0;
           const trustedActiveCount = activeCountVersion === ACTIVE_COUNT_VERSION
             ? e.active_agent_count : 0;
-          const r = queries.insertTelemetryEventWithRegionV2.run(
+          const r = queries.insertTelemetryEventWithRegionV3.run(
             e.event_id, e.install_uuid, e.ts_minute,
             e.mcp_client, e.model || null,
             e.tokens_in, e.tokens_out, trustedActiveCount,
-            activeCountVersion, e.event_type, clientHash, now, regionTag
+            activeCountVersion, e.event_type, clientHash, now, regionTag, geoKind
           );
           n += r.changes;
         }
diff --git a/showcase/server/src/telemetry/housekeeper.js b/showcase/server/src/telemetry/housekeeper.js
index 3135e492e..d5f0c0d76 100644
--- a/showcase/server/src/telemetry/housekeeper.js
+++ b/showcase/server/src/telemetry/housekeeper.js
@@ -5,7 +5,11 @@
  *   1. DELETE telemetry_events older than 7 days (retention policy).
  *   2. Enforce 365-day retention on per-UUID telemetry_rollups_daily rows;
  *      pre-v2 active values remain quarantined as untrusted history.
- *   3. Re-aggregate today + yesterday per install_uuid into telemetry_rollups_daily.
+ *   3. Re-aggregate today + yesterday per install_uuid into telemetry_rollups_daily,
+ *      including the install's latest coarse region + geo_kind (anonymous,
+ *      365-day durable last-known location; never an IP).
+ *   3b. Copy region/geo_kind onto existing rollup rows for the rest of the
+ *       7-day event window so a deploy backfills whatever raw events remain.
  *   4. Recompute telemetry_global_aggregates for today + yesterday, applying
  *      a k>=K_ANONYMITY_FLOOR anonymity floor on the mcp_client popular list
  *      (below-k labels bucket as "Other"). Floor history:
@@ -114,17 +118,29 @@ function runHousekeeperTick(db, queries, nowMs = Date.now()) {
       const dayKey = dayUtcKey(dayStart);
 
       const uuids = queries.selectUuidsForDayRange.all(dayStart, dayEnd);
+      const regionMemberships = queries.selectRegionInstallMembershipsForDayRange.all(dayStart, dayEnd);
+      const locationByUuid = new Map();
+      for (const row of regionMemberships) {
+        if (!row || typeof row.install_uuid !== 'string') continue;
+        locationByUuid.set(row.install_uuid, {
+          region: typeof row.region === 'string' && row.region ? row.region : 'unknown',
+          geo_kind: typeof row.geo_kind === 'string' && row.geo_kind ? row.geo_kind : 'unknown',
+        });
+      }
       for (const u of uuids) {
         const row = queries.aggregateRollupForUuidDay.get(dayStart, dayEnd, u.install_uuid);
         if (!row) continue;
-        queries.upsertRollupDailyV2.run(
+        const loc = locationByUuid.get(u.install_uuid) || { region: 'unknown', geo_kind: 'unknown' };
+        queries.upsertRollupDailyV3.run(
           u.install_uuid,
           dayKey,
           row.tokens_in || 0,
           row.tokens_out || 0,
           row.max_active_agents || 0,
           row.trusted_active_sample_count || 0,
-          row.event_count || 0
+          row.event_count || 0,
+          loc.region,
+          loc.geo_kind
         );
       }
 
@@ -158,7 +174,6 @@ function runHousekeeperTick(db, queries, nowMs = Date.now()) {
       // Region rollup uses each install's latest membership for the day.
       // Assigning one region before applying the floor prevents a roaming
       // install from appearing in both a named region and the Other bucket.
-      const regionMemberships = queries.selectRegionInstallMembershipsForDayRange.all(dayStart, dayEnd);
       const popularRegion = applyDistinctKFloor(
         regionMemberships,
         'region',
@@ -181,6 +196,25 @@ function runHousekeeperTick(db, queries, nowMs = Date.now()) {
       );
     }
 
+    // Copy last-known region onto rollups for the rest of the 7-day event
+    // window without recomputing (and possibly zeroing) those days' global
+    // aggregates. Today + yesterday already wrote region via upsertRollupDailyV3.
+    for (let dayOffset = 2; dayOffset <= 7; dayOffset += 1) {
+      const dayStart = floorToUtcDayMs(nowMs - dayOffset * ONE_DAY_MS);
+      const dayEnd = dayStart + ONE_DAY_MS;
+      const dayKey = dayUtcKey(dayStart);
+      const regionMemberships = queries.selectRegionInstallMembershipsForDayRange.all(dayStart, dayEnd);
+      for (const row of regionMemberships) {
+        if (!row || typeof row.install_uuid !== 'string') continue;
+        queries.updateRollupRegion.run(
+          typeof row.region === 'string' && row.region ? row.region : 'unknown',
+          typeof row.geo_kind === 'string' && row.geo_kind ? row.geo_kind : 'unknown',
+          row.install_uuid,
+          dayKey
+        );
+      }
+    }
+
     // Step 5: nudge salt rotation. The '0.0.0.0' literal is a throwaway value
     // that never reaches storage; hashIp's side effect is the lazy
     // getOrMintTodaySalt() which we want to fire on every tick so the salt
diff --git a/showcase/server/src/utils/client-ip.js b/showcase/server/src/utils/client-ip.js
new file mode 100644
index 000000000..e578ca1eb
--- /dev/null
+++ b/showcase/server/src/utils/client-ip.js
@@ -0,0 +1,31 @@
+/**
+ * Resolve the connecting client IP for anonymous telemetry (hash + geo).
+ *
+ * Fly Proxy always sets `Fly-Client-IP` to the TCP peer it accepted. Express
+ * `trust proxy: 1` walks X-Forwarded-For from the right and, on Fly, lands on
+ * the app's shared/anycast address (SJC → US-CA) or a 6PN IPv6 (unparseable
+ * as IPv4 → 'unknown'). Production evidence: every retained day collapsed onto
+ * exactly two ip_hash values, each pinned at the per-IP UUID cap of 20.
+ *
+ * PRIVACY: the returned string is plaintext IP. Callers must pass it straight
+ * into hashIp / deriveRegion and MUST NOT assign it to a long-lived binding,
+ * log it, or persist it. This helper itself retains nothing.
+ */
+
+'use strict';
+
+/**
+ * @param {import('express').Request|null|undefined} req
+ * @returns {string}
+ */
+function clientIp(req) {
+  if (!req) return '';
+  const fly = typeof req.get === 'function' ? req.get('Fly-Client-IP') : '';
+  if (typeof fly === 'string') {
+    const trimmed = fly.trim();
+    if (trimmed) return trimmed;
+  }
+  return typeof req.ip === 'string' ? req.ip : '';
+}
+
+module.exports = { clientIp };
diff --git a/showcase/server/src/utils/ip-geo.js b/showcase/server/src/utils/ip-geo.js
index 315474467..6be7a981b 100644
--- a/showcase/server/src/utils/ip-geo.js
+++ b/showcase/server/src/utils/ip-geo.js
@@ -12,11 +12,12 @@
  *
  * Only the *dataset* is third-party (DB-IP IP-to-City Lite, CC-BY-4.0); the
  * lookup logic here is ours -- a sorted-range binary search over uint32 IPv4
- * forms. No live third-party geo API is contacted (that would leak every user's
- * raw IP to a third party, which is worse than the existing hashed-IP posture).
+ * forms and uint128 IPv6 halves. No live third-party geo API is contacted
+ * (that would leak every user's raw IP to a third party, which is worse than
+ * the existing hashed-IP posture).
  *
  * WORLDWIDE / 256 MB MEMORY MODEL:
- *   The production dataset is WORLDWIDE (all countries, IPv4-only) and can be a
+ *   The production dataset is WORLDWIDE (all countries, IPv4 + IPv6) and can be a
  *   few hundred thousand to a few million ranges. To stay within the 256 MB Fly
  *   VM (binding limit is process RSS) the parsed table is a struct-of-arrays:
  *
@@ -47,18 +48,22 @@
  *   there is NO load-time sort; the binary search relies on that ordering (the
  *   committed fixture is likewise kept sorted ascending by start_ip_int).
  *
+ *   IPv6 uses a sibling table of uint64 halves (start_hi/lo, end_hi/lo + labelId)
+ *   loaded the same chunked way from DBIP_IPV6_DATASET_PATH (or a sibling of the
+ *   IPv4 path: `*.ipv6.csv` / `*.ipv6.fixture.csv`). Native IPv6 (Jio / 2405:201::
+ *   and similar) looks up here. Fly 6PN ULA (`fd`/`fc`) and CIDR `/56` keys miss
+ *   and stay 'unknown'. IPv4-mapped IPv6 (`::ffff:a.b.c.d`) still unwraps to IPv4.
+ *
  * GRACEFUL DEGRADATION (HARD requirement): if the production dataset file is
  * absent, unreadable, empty, or pathologically large (Buffer/file size limits),
  * every call returns the literal string 'unknown' and this module NEVER throws.
  * The server boots and ingests with no dataset present. The real artifact is
- * generated by scripts/refresh-dbip-dataset.mjs and is NOT committed; only a tiny
- * fixture (data/dbip-city-lite.fixture.csv) ships for tests.
+ * generated by scripts/refresh-dbip-dataset.mjs and is NOT committed; only tiny
+ * fixtures (data/dbip-city-lite.fixture.csv and .ipv6.fixture.csv) ship for tests.
  *
  * Dataset path resolution: process.env.DBIP_DATASET_PATH || the default
- * production artifact path under showcase/server/data/.
- *
- * Coarse IPv4-only is acceptable for this task: IPv6 or unparseable input
- * returns 'unknown'.
+ * production artifact path under showcase/server/data/. IPv6: DBIP_IPV6_DATASET_PATH
+ * or a sibling of the IPv4 path.
  *
  * tests/server-ip-geo.test.js exercises hit / miss / absent-dataset / malformed;
  * tests/server-ip-geo-scale.test.js exercises a large synthetic dataset.
@@ -72,22 +77,89 @@ const path = require('path');
 // Default production artifact path. The refresh script writes here; .gitignore
 // excludes it (but keeps *.fixture.csv). Overridable via DBIP_DATASET_PATH.
 const DEFAULT_DATASET_PATH = path.join(__dirname, '..', '..', 'data', 'dbip-city-lite.csv');
+const DEFAULT_IPV6_DATASET_PATH = path.join(__dirname, '..', '..', 'data', 'dbip-city-lite.ipv6.csv');
 
-// Lazily-populated parsed table. Three states:
+// Lazily-populated parsed tables. Three states each:
 //   undefined -> not yet loaded (load on first call)
 //   null      -> load attempted and failed/absent/empty (graceful 'unknown')
-//   object    -> struct-of-arrays { n, starts, ends, labelId, labels } (see header)
+//   object    -> struct-of-arrays (see header)
 let _table;
+let _ipv6Table;
+
+/** Sibling IPv6 artifact for an IPv4 compact-CSV path. */
+function siblingIpv6Path(ipv4Path) {
+  if (typeof ipv4Path !== 'string' || ipv4Path === '') return DEFAULT_IPV6_DATASET_PATH;
+  if (ipv4Path.endsWith('.fixture.csv')) {
+    return ipv4Path.replace(/\.fixture\.csv$/, '.ipv6.fixture.csv');
+  }
+  if (ipv4Path.endsWith('.csv')) return ipv4Path.slice(0, -4) + '.ipv6.csv';
+  return ipv4Path + '.ipv6';
+}
+
+function resolveIpv6DatasetPath() {
+  if (process.env.DBIP_IPV6_DATASET_PATH) return process.env.DBIP_IPV6_DATASET_PATH;
+  return siblingIpv6Path(process.env.DBIP_DATASET_PATH || DEFAULT_DATASET_PATH);
+}
+
+/**
+ * If `ip` is an IPv4-mapped IPv6 address, return the dotted-quad IPv4 form.
+ * Node and Fly both emit `::ffff:a.b.c.d` (and occasionally `:ffff:a.b.c.d`)
+ * for IPv4 clients on an IPv6 socket. Unmapped IPv4 and native IPv6 are
+ * returned unchanged so the IPv4 parser / IPv6-unknown path can decide.
+ *
+ * @param {string} ip
+ * @returns {string}
+ */
+function unwrapIpv4Mapped(ip) {
+  const mapped = /(?:^|:)ffff:(\d{1,3}(?:\.\d{1,3}){3})$/i.exec(ip.trim());
+  return mapped ? mapped[1] : ip;
+}
+
+/** Coarse IP family for diagnosing 'unknown' region. Never the address itself. */
+const GEO_KIND = Object.freeze({
+  IPV4: 'ipv4',
+  IPV4_MAPPED: 'ipv4-mapped',
+  IPV6: 'ipv6',
+  IPV6_ULA: 'ipv6-ula',
+  IPV6_CIDR: 'ipv6-cidr',
+  EMPTY: 'empty',
+  OTHER: 'other',
+});
+
+/**
+ * Classify an address family without retaining it. Used to persist *why*
+ * region is 'unknown' (Fly 6PN IPv6 vs native IPv6 vs unparseable) so we can
+ * tell lookup-misses from "geo is IPv4-only".
+ *
+ * @param {unknown} ip
+ * @returns {string} one of GEO_KIND values
+ */
+function classifyIp(ip) {
+  if (typeof ip !== 'string') return GEO_KIND.EMPTY;
+  const s = ip.trim();
+  if (s === '') return GEO_KIND.EMPTY;
+  const unwrapped = unwrapIpv4Mapped(s);
+  const mapped = unwrapped !== s;
+  if (ipv4ToInt(unwrapped) !== null) return mapped ? GEO_KIND.IPV4_MAPPED : GEO_KIND.IPV4;
+  if (s.includes(':')) {
+    if (s.includes('/')) return GEO_KIND.IPV6_CIDR;
+    const head = s.toLowerCase();
+    if (head.startsWith('fd') || head.startsWith('fc')) return GEO_KIND.IPV6_ULA;
+    return GEO_KIND.IPV6;
+  }
+  return GEO_KIND.OTHER;
+}
 
 /**
- * Convert a dotted-quad IPv4 string to its uint32 form, or null if it is not a
- * well-formed IPv4 address (covers IPv6, IPv4-mapped-IPv6, garbage, empty).
+ * Convert a dotted-quad IPv4 string (or IPv4-mapped IPv6) to its uint32 form,
+ * or null if it is not a well-formed IPv4 address (native IPv6, garbage, empty).
  *
  * @param {unknown} ip
  * @returns {number|null}
  */
 function ipv4ToInt(ip) {
   if (typeof ip !== 'string') return null;
+  ip = unwrapIpv4Mapped(ip);
   const parts = ip.split('.');
   if (parts.length !== 4) return null;
   let acc = 0;
@@ -105,6 +177,90 @@ function ipv4ToInt(ip) {
   return acc >>> 0;
 }
 
+/**
+ * Parse a native IPv6 address into big-endian uint64 halves, or null.
+ * Rejects CIDR (`/56` rate-limit keys), zone IDs, dotted mixed form, and
+ * anything that is not exactly 8 hextets after `::` expansion.
+ *
+ * @param {unknown} ip
+ * @returns {{hi:bigint, lo:bigint}|null}
+ */
+function ipv6ToHalves(ip) {
+  if (typeof ip !== 'string') return null;
+  const s = ip.trim().toLowerCase();
+  if (s === '' || s.includes('/') || s.includes('%') || s.includes('.')) return null;
+  if (!s.includes(':')) return null;
+
+  const sides = s.split('::');
+  if (sides.length > 2) return null;
+
+  const parseSide = (side) => {
+    if (side === '') return [];
+    const parts = side.split(':');
+    const out = [];
+    for (let i = 0; i < parts.length; i++) {
+      const p = parts[i];
+      if (!/^[0-9a-f]{1,4}$/.test(p)) return null;
+      out.push(parseInt(p, 16));
+    }
+    return out;
+  };
+
+  let groups;
+  if (sides.length === 1) {
+    groups = parseSide(sides[0]);
+    if (!groups || groups.length !== 8) return null;
+  } else {
+    const head = parseSide(sides[0]);
+    const tail = parseSide(sides[1]);
+    if (!head || !tail) return null;
+    const missing = 8 - head.length - tail.length;
+    if (missing < 1) return null;
+    groups = head.concat(new Array(missing).fill(0), tail);
+  }
+
+  let hi = 0n;
+  let lo = 0n;
+  for (let i = 0; i < 4; i++) hi = (hi << 16n) + BigInt(groups[i]);
+  for (let i = 4; i < 8; i++) lo = (lo << 16n) + BigInt(groups[i]);
+  return { hi, lo };
+}
+
+/** Compare two uint128 values given as uint64 halves. */
+function cmpU128(aHi, aLo, bHi, bLo) {
+  if (aHi < bHi) return -1;
+  if (aHi > bHi) return 1;
+  if (aLo < bLo) return -1;
+  if (aLo > bLo) return 1;
+  return 0;
+}
+
+const UINT64_MAX = 0xffffffffffffffffn;
+
+/**
+ * Parse an ASCII decimal uint64 at buf[p..). Returns { n, p } after the digits
+ * or null. Never uses Number() -- uint64 exceeds JS safe-integer range.
+ *
+ * @param {Buffer} buf
+ * @param {number} p
+ * @param {number} end
+ * @returns {{n:bigint, p:number}|null}
+ */
+function _parseDecUint64(buf, p, end) {
+  let n = 0n;
+  let saw = false;
+  let digits = 0;
+  while (p < end && buf[p] >= 48 && buf[p] <= 57) {
+    n = n * 10n + BigInt(buf[p] - 48);
+    p++;
+    saw = true;
+    digits++;
+    if (digits > 20) return null;
+  }
+  if (!saw || n > UINT64_MAX) return null;
+  return { n, p };
+}
+
 /**
  * Parse ONE compact-CSV line, given as the byte-range buf[start, end), into the
  * mutable accumulator `acc` ({ starts, ends, labelId, labels, labelMap, w }).
@@ -279,36 +435,162 @@ function loadTable() {
 }
 
 /**
- * Derive a coarse { country, subdivision } region from a plaintext IP, or the
- * literal string 'unknown' when the IP is non-IPv4, falls outside every range,
- * or no dataset is loaded. NEVER throws; NEVER retains or logs the IP.
+ * Parse ONE compact IPv6 CSV line: start_hi,start_lo,end_hi,end_lo,country,subdivision
+ * with inclusive uint64 halves. Blank/'#'/malformed lines are skipped.
  *
- * @param {string} ip plaintext request IP (e.g. req.ip with trust proxy=1)
- * @returns {{country:string, subdivision:string}|'unknown'}
+ * @param {Buffer} buf
+ * @param {number} start
+ * @param {number} end
+ * @param {{startHi:BigUint64Array,startLo:BigUint64Array,endHi:BigUint64Array,endLo:BigUint64Array,labelId:Uint32Array,labels:Array,labelMap:Map,w:number}} acc
  */
-function deriveRegion(ip) {
-  const key = ipv4ToInt(ip);
-  if (key === null) return 'unknown';
+function _parseIpv6LineBytes(buf, start, end, acc) {
+  if (end > start && buf[end - 1] === 13) end--;
+
+  let p = start;
+  while (p < end && (buf[p] === 32 || buf[p] === 9)) p++;
+  if (p >= end || buf[p] === 35) return;
+
+  const startHi = _parseDecUint64(buf, p, end);
+  if (!startHi || startHi.p >= end || buf[startHi.p] !== 44) return;
+  p = startHi.p + 1;
+
+  const startLo = _parseDecUint64(buf, p, end);
+  if (!startLo || startLo.p >= end || buf[startLo.p] !== 44) return;
+  p = startLo.p + 1;
+
+  const endHi = _parseDecUint64(buf, p, end);
+  if (!endHi || endHi.p >= end || buf[endHi.p] !== 44) return;
+  p = endHi.p + 1;
+
+  const endLo = _parseDecUint64(buf, p, end);
+  if (!endLo || endLo.p >= end || buf[endLo.p] !== 44) return;
+  p = endLo.p + 1;
+
+  const cStart = p;
+  while (p < end && buf[p] !== 44) p++;
+  if (p >= end) return;
+  const cEnd = p;
+  p++;
+
+  if (cmpU128(endHi.n, endLo.n, startHi.n, startLo.n) < 0) return;
+  if (cEnd <= cStart) return;
+
+  const country = buf.toString('utf8', cStart, cEnd).trim();
+  if (country === '') return;
+  const subdivision = buf.toString('utf8', p, end).trim();
+
+  const key = country + '\x1F' + subdivision;
+  let id = acc.labelMap.get(key);
+  if (id === undefined) {
+    id = acc.labels.length;
+    acc.labels.push({ country, subdivision });
+    acc.labelMap.set(key, id);
+  }
+
+  acc.startHi[acc.w] = startHi.n;
+  acc.startLo[acc.w] = startLo.n;
+  acc.endHi[acc.w] = endHi.n;
+  acc.endLo[acc.w] = endLo.n;
+  acc.labelId[acc.w] = id;
+  acc.w += 1;
+}
 
-  const t = loadTable();
+/**
+ * Lazy, once-only IPv6 dataset load. Same chunked two-pass scan as loadTable.
+ * Path: DBIP_IPV6_DATASET_PATH or a sibling of the IPv4 compact CSV.
+ *
+ * @returns {{n:number, startHi:BigUint64Array, startLo:BigUint64Array, endHi:BigUint64Array, endLo:BigUint64Array, labelId:Uint32Array, labels:Array}|null}
+ */
+function loadIpv6Table() {
+  if (_ipv6Table !== undefined) return _ipv6Table;
+  const datasetPath = resolveIpv6DatasetPath();
+  let fd = null;
+  try {
+    fd = fs.openSync(datasetPath, 'r');
+    const buf = Buffer.allocUnsafe(LOAD_CHUNK_BYTES);
+
+    let newlineCount = 0;
+    let total = 0;
+    let pos = 0;
+    for (;;) {
+      const n = fs.readSync(fd, buf, 0, LOAD_CHUNK_BYTES, pos);
+      if (n === 0) break;
+      pos += n;
+      total += n;
+      for (let i = 0; i < n; i++) if (buf[i] === 10) newlineCount++;
+    }
+    if (total === 0) { _ipv6Table = null; return _ipv6Table; }
+
+    const maxRows = newlineCount + 1;
+    const acc = {
+      startHi: new BigUint64Array(maxRows),
+      startLo: new BigUint64Array(maxRows),
+      endHi: new BigUint64Array(maxRows),
+      endLo: new BigUint64Array(maxRows),
+      labelId: new Uint32Array(maxRows),
+      labels: [],
+      labelMap: new Map(),
+      w: 0,
+    };
+
+    pos = 0;
+    for (;;) {
+      const n = fs.readSync(fd, buf, 0, LOAD_CHUNK_BYTES, pos);
+      if (n === 0) break;
+
+      let lastNL = -1;
+      for (let i = n - 1; i >= 0; i--) { if (buf[i] === 10) { lastNL = i; break; } }
+
+      let limit;
+      if (lastNL === -1) {
+        limit = n;
+        pos += n;
+      } else {
+        limit = lastNL;
+        pos += lastNL + 1;
+      }
+
+      let i = 0;
+      while (i < limit) {
+        let nl = _indexOfNewline(buf, i, limit);
+        if (nl === -1) nl = limit;
+        _parseIpv6LineBytes(buf, i, nl, acc);
+        i = nl + 1;
+      }
+    }
+
+    if (acc.w === 0) { _ipv6Table = null; return _ipv6Table; }
+    _ipv6Table = {
+      n: acc.w,
+      startHi: acc.startHi.subarray(0, acc.w),
+      startLo: acc.startLo.subarray(0, acc.w),
+      endHi: acc.endHi.subarray(0, acc.w),
+      endLo: acc.endLo.subarray(0, acc.w),
+      labelId: acc.labelId.subarray(0, acc.w),
+      labels: acc.labels,
+    };
+  } catch {
+    _ipv6Table = null;
+  } finally {
+    if (fd !== null) { try { fs.closeSync(fd); } catch { /* ignore */ } }
+  }
+  return _ipv6Table;
+}
+
+function lookupIpv6(hi, lo) {
+  const t = loadIpv6Table();
   if (!t || t.n === 0) return 'unknown';
 
-  const { starts, ends, labelId, labels } = t;
-
-  // Binary search for the range whose [start, end] contains key.
-  let lo = 0;
-  let hi = t.n - 1;
-  while (lo <= hi) {
-    const mid = (lo + hi) >>> 1;
-    if (key < starts[mid]) {
-      hi = mid - 1;
-    } else if (key > ends[mid]) {
-      lo = mid + 1;
+  let left = 0;
+  let right = t.n - 1;
+  while (left <= right) {
+    const mid = (left + right) >>> 1;
+    if (cmpU128(hi, lo, t.startHi[mid], t.startLo[mid]) < 0) {
+      right = mid - 1;
+    } else if (cmpU128(hi, lo, t.endHi[mid], t.endLo[mid]) > 0) {
+      left = mid + 1;
     } else {
-      // Return a FRESH object, not the interned record -- callers must not be
-      // able to mutate the shared label, and regionLabel() only reads the two
-      // fields, so this is behaviourally identical to the old object array.
-      const lab = labels[labelId[mid]];
+      const lab = t.labels[t.labelId[mid]];
       return { country: lab.country, subdivision: lab.subdivision };
     }
   }
@@ -316,12 +598,61 @@ function deriveRegion(ip) {
 }
 
 /**
- * Test-only: drop the cached table so a test can re-point DBIP_DATASET_PATH and
+ * Derive a coarse { country, subdivision } region from a plaintext IP, or the
+ * literal string 'unknown' when the IP falls outside every range or no dataset
+ * is loaded. IPv4 (including mapped ::ffff:a.b.c.d) uses the IPv4 table; native
+ * IPv6 uses the sibling IPv6 table. NEVER throws; NEVER retains or logs the IP.
+ *
+ * @param {string} ip plaintext request IP (Fly-Client-IP / req.ip)
+ * @returns {{country:string, subdivision:string}|'unknown'}
+ */
+function deriveRegion(ip) {
+  const key = ipv4ToInt(ip);
+  if (key !== null) {
+    const t = loadTable();
+    if (!t || t.n === 0) return 'unknown';
+
+    const { starts, ends, labelId, labels } = t;
+
+    let lo = 0;
+    let hi = t.n - 1;
+    while (lo <= hi) {
+      const mid = (lo + hi) >>> 1;
+      if (key < starts[mid]) {
+        hi = mid - 1;
+      } else if (key > ends[mid]) {
+        lo = mid + 1;
+      } else {
+        const lab = labels[labelId[mid]];
+        return { country: lab.country, subdivision: lab.subdivision };
+      }
+    }
+    return 'unknown';
+  }
+
+  const halves = ipv6ToHalves(ip);
+  if (!halves) return 'unknown';
+  return lookupIpv6(halves.hi, halves.lo);
+}
+
+/**
+ * Test-only: drop the cached tables so a test can re-point dataset paths and
  * force a fresh load. Not used in production code paths.
  */
 function _resetForTest() {
   _table = undefined;
+  _ipv6Table = undefined;
 }
 
-module.exports = { deriveRegion, ipv4ToInt, _resetForTest };
+module.exports = {
+  deriveRegion,
+  ipv4ToInt,
+  ipv6ToHalves,
+  unwrapIpv4Mapped,
+  classifyIp,
+  GEO_KIND,
+  siblingIpv6Path,
+  _resetForTest,
+};
 module.exports.DEFAULT_DATASET_PATH = DEFAULT_DATASET_PATH;
+module.exports.DEFAULT_IPV6_DATASET_PATH = DEFAULT_IPV6_DATASET_PATH;
diff --git a/tests/server-client-ip-geo.test.js b/tests/server-client-ip-geo.test.js
new file mode 100644
index 000000000..f65913036
--- /dev/null
+++ b/tests/server-client-ip-geo.test.js
@@ -0,0 +1,161 @@
+/**
+ * Fly-Client-IP must drive telemetry hash + region, not Express req.ip.
+ *
+ * On Fly, trust proxy 1 resolves req.ip to the app anycast hop (SJC → US-CA)
+ * or a 6PN IPv6 (unknown). This test sets X-Forwarded-For to a California-looking
+ * address and Fly-Client-IP to the fixture's India range, then asserts the
+ * stored region is IN-Maharashtra and that two Fly-Client-IP values do not
+ * share one ip_hash (the production 20/20 cap bug).
+ *
+ * Run: node tests/server-client-ip-geo.test.js
+ */
+
+'use strict';
+
+const assert = require('assert');
+const crypto = require('crypto');
+const http = require('http');
+const path = require('path');
+
+process.env.TELEMETRY_RATE_MAX = '1000';
+process.env.DBIP_DATASET_PATH = path.join(
+  __dirname, '..', 'showcase', 'server', 'data', 'dbip-city-lite.fixture.csv'
+);
+
+const SERVER_NM = path.join(__dirname, '..', 'showcase', 'server', 'node_modules');
+const Database = require(require.resolve('better-sqlite3', { paths: [SERVER_NM] }));
+const express = require(require.resolve('express', { paths: [SERVER_NM] }));
+const { initializeDatabase } = require('../showcase/server/src/db/schema');
+const Queries = require('../showcase/server/src/db/queries');
+const createTelemetryRouter = require('../showcase/server/src/routes/telemetry');
+const { hashIp } = require('../showcase/server/src/utils/telemetry-hash');
+const { clientIp } = require('../showcase/server/src/utils/client-ip');
+const ipGeo = require('../showcase/server/src/utils/ip-geo');
+const activeTracker = require('../showcase/server/src/telemetry/active-tracker');
+const { resetPerUuidBudget } = require('../showcase/server/src/middleware/telemetry-rate-limit');
+
+ipGeo._resetForTest();
+resetPerUuidBudget();
+activeTracker._resetForTest();
+
+const db = new Database(':memory:');
+initializeDatabase(db);
+const queries = new Queries(db);
+const app = express();
+app.set('trust proxy', 1);
+app.use('/api/telemetry', createTelemetryRouter(db, queries, hashIp));
+const server = http.createServer(app).listen(0);
+const port = server.address().port;
+
+function event() {
+  return {
+    event_id: crypto.randomUUID(),
+    install_uuid: crypto.randomUUID(),
+    ts_minute: Date.now(),
+    mcp_client: 'Codex',
+    model: 'gpt-5',
+    tokens_in: 1,
+    tokens_out: 0,
+    active_agent_count: 1,
+    event_type: 'periodic',
+    active_count_version: 2,
+  };
+}
+
+function post(body, headers) {
+  const payload = Buffer.from(JSON.stringify(body));
+  return new Promise((resolve, reject) => {
+    const req = http.request({
+      method: 'POST',
+      host: '127.0.0.1',
+      port,
+      path: '/api/telemetry/events',
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': payload.length,
+        ...headers,
+      },
+    }, (res) => {
+      let text = '';
+      res.on('data', (chunk) => { text += chunk; });
+      res.on('end', () => resolve({ status: res.statusCode, body: text }));
+    });
+    req.on('error', reject);
+    req.end(payload);
+  });
+}
+
+(async () => {
+  assert.strictEqual(clientIp({ get: () => '  20.20.20.200  ', ip: '8.8.8.8' }), '20.20.20.200');
+  assert.strictEqual(clientIp({ get: () => '', ip: '8.8.8.8' }), '8.8.8.8');
+  assert.strictEqual(clientIp({ get: () => '   ', ip: '8.8.8.8' }), '8.8.8.8');
+
+  const flyAnycast = '8.8.8.8'; // fixture US/California -- stands in for SJC
+  const indiaClient = '20.20.20.200'; // fixture IN/Maharashtra
+  const nyClient = '9.9.9.100'; // fixture US/New York
+
+  const indiaRes = await post({ events: [event()] }, {
+    'X-Forwarded-For': flyAnycast,
+    'Fly-Client-IP': indiaClient,
+  });
+  assert.strictEqual(indiaRes.status, 200, indiaRes.body);
+
+  const nyRes = await post({ events: [event()] }, {
+    'X-Forwarded-For': flyAnycast,
+    'Fly-Client-IP': nyClient,
+  });
+  assert.strictEqual(nyRes.status, 200, nyRes.body);
+
+  const rows = db.prepare(
+    'SELECT region, COUNT(DISTINCT ip_hash) AS hashes, COUNT(*) AS n FROM telemetry_events GROUP BY region ORDER BY region'
+  ).all();
+  const byRegion = Object.fromEntries(rows.map((r) => [r.region, r]));
+  assert.ok(byRegion['IN-Maharashtra'], `expected IN-Maharashtra, got ${JSON.stringify(rows)}`);
+  assert.ok(byRegion['US-NY'], `expected US-NY, got ${JSON.stringify(rows)}`);
+  assert.strictEqual(byRegion['IN-Maharashtra'].n, 1);
+  assert.strictEqual(byRegion['US-NY'].n, 1);
+  assert.ok(!byRegion['US-CA'], `Fly anycast must not win geo, got ${JSON.stringify(rows)}`);
+
+  const hashCount = db.prepare('SELECT COUNT(DISTINCT ip_hash) AS c FROM telemetry_events').get().c;
+  assert.strictEqual(hashCount, 2, `two client IPs must not collapse onto one hash, got ${hashCount}`);
+
+  const mappedRes = await post({ events: [event()] }, {
+    'X-Forwarded-For': flyAnycast,
+    'Fly-Client-IP': '::ffff:20.20.20.200',
+  });
+  assert.strictEqual(mappedRes.status, 200, mappedRes.body);
+  const indiaCount = db.prepare(
+    "SELECT COUNT(*) AS n FROM telemetry_events WHERE region = 'IN-Maharashtra'"
+  ).get().n;
+  assert.strictEqual(indiaCount, 2, 'IPv4-mapped Fly-Client-IP must geolocate as India');
+
+  const kinds = db.prepare(
+    "SELECT DISTINCT geo_kind FROM telemetry_events WHERE region = 'IN-Maharashtra' ORDER BY 1"
+  ).all().map((r) => r.geo_kind);
+  assert.deepStrictEqual(kinds, ['ipv4', 'ipv4-mapped']);
+
+  const ipv6Res = await post({ events: [event()] }, {
+    'X-Forwarded-For': flyAnycast,
+    'Fly-Client-IP': '2405:201:e00:1::1',
+  });
+  assert.strictEqual(ipv6Res.status, 200, ipv6Res.body);
+  const indiaIpv6 = db.prepare(
+    "SELECT region, geo_kind FROM telemetry_events WHERE geo_kind = 'ipv6'"
+  ).get();
+  assert.ok(indiaIpv6, 'native IPv6 Fly-Client-IP must insert a row');
+  assert.strictEqual(indiaIpv6.region, 'IN-Maharashtra');
+  const indiaCountAfterV6 = db.prepare(
+    "SELECT COUNT(*) AS n FROM telemetry_events WHERE region = 'IN-Maharashtra'"
+  ).get().n;
+  assert.strictEqual(indiaCountAfterV6, 3, 'IPv4 + mapped + native IPv6 India');
+
+  server.close();
+  db.close();
+  delete process.env.TELEMETRY_RATE_MAX;
+  console.log('server-client-ip-geo: all assertions passed');
+})().catch((error) => {
+  server.close();
+  db.close();
+  console.error(error);
+  process.exit(1);
+});
diff --git a/tests/server-ip-geo-merge.test.js b/tests/server-ip-geo-merge.test.js
index 4c28280fb..e78d7b320 100644
--- a/tests/server-ip-geo-merge.test.js
+++ b/tests/server-ip-geo-merge.test.js
@@ -7,7 +7,8 @@
  *     ranges collapse into ONE row spanning the full range;
  *   - a row with a DIFFERENT label stays separate;
  *   - a same-label row separated by a GAP stays separate;
- *   - IPv6 upstream rows are skipped (IPv4-only output).
+ *   - IPv6 upstream rows are written to the sibling *.ipv6.csv, not the IPv4 file;
+ *     adjacent same-label IPv6 ranges merge.
  *
  * No framework; PASS/FAIL counter + non-zero exit on failure.
  * Run: node tests/server-ip-geo-merge.test.js
@@ -21,6 +22,7 @@ const path = require('path');
 const { execFileSync } = require('child_process');
 
 const SCRIPT = path.join(__dirname, '..', 'showcase', 'server', 'scripts', 'refresh-dbip-dataset.mjs');
+delete process.env.DBIP_IPV6_DATASET_PATH;
 
 let passed = 0;
 let failed = 0;
@@ -31,6 +33,7 @@ function check(label, cond, detail) {
 
 const inPath = path.join(os.tmpdir(), `fsb-dbip-merge-in-${process.pid}.csv`);
 const outPath = path.join(os.tmpdir(), `fsb-dbip-merge-out-${process.pid}.csv`);
+const ipv6OutPath = outPath.slice(0, -4) + '.ipv6.csv';
 
 // Upstream DB-IP IP-to-City Lite shape: ip_start,ip_end,continent,country,stateprov,city,lat,lon
 const upstream = [
@@ -38,7 +41,9 @@ const upstream = [
   '1.0.1.0,1.0.1.255,EU,DE,Bavaria,Nuremberg,49.4,11.0',    //  >- adjacent same label -> merge into one
   '1.0.2.0,1.0.2.255,EU,DE,Bavaria,Augsburg,48.3,10.8',     // /
   '1.0.3.0,1.0.3.255,EU,FR,Île-de-France,Paris,48.8,2.3',   // different label -> separate
-  '2001:db8::,2001:db8::1,AS,JP,Tokyo,Tokyo,35.6,139.6',    // IPv6 -> skipped entirely
+  '2001:db8::,2001:db8::1,AS,JP,Tokyo,Tokyo,35.6,139.6',     // \
+  '2001:db8::2,2001:db8::3,AS,JP,Tokyo,Kyoto,35.0,135.7',    //  >- adjacent same IPv6 label -> merge
+  '2001:db8:1::,2001:db8:1::1,AS,JP,Osaka,Osaka,34.6,135.5', // different IPv6 subdivision
   '2.0.0.0,2.0.0.255,EU,DE,Bavaria,Regensburg,49.0,12.1',   // same label but GAP -> separate
 ];
 
@@ -63,15 +68,24 @@ try {
   check('adjacent same-label DE/Bavaria collapsed to one span', dataLines.includes(MERGED_DE), `got ${JSON.stringify(dataLines)}`);
   check('different label (FR/Île-de-France) stayed separate', dataLines.includes(FR_ROW), `got ${JSON.stringify(dataLines)}`);
   check('gapped same-label DE/Bavaria stayed separate', dataLines.includes(GAP_DE), `got ${JSON.stringify(dataLines)}`);
-  check('IPv6 upstream row skipped (no Tokyo / JP in output)', !text.includes('Tokyo') && !/,JP,/.test(text), 'IPv6 row leaked into output');
+  check('IPv6 upstream row not in IPv4 file', !text.includes('Tokyo') && !/,JP,/.test(text), 'IPv6 row leaked into IPv4 output');
   check('output is sorted ascending by start', (() => {
     const starts = dataLines.map((l) => Number(l.split(',')[0]));
     for (let i = 1; i < starts.length; i++) if (starts[i] < starts[i - 1]) return false;
     return true;
   })(), `starts not ascending: ${JSON.stringify(dataLines)}`);
+
+  const v6text = fs.readFileSync(ipv6OutPath, 'utf8');
+  const v6lines = v6text.split(/\r?\n/).filter((l) => l && !l.startsWith('#'));
+  const MERGED_JP = '2306139568115548160,0,2306139568115548160,3,JP,Tokyo';
+  const OSAKA = '2306139568115613696,0,2306139568115613696,1,JP,Osaka';
+  check('exactly 2 merged IPv6 data rows', v6lines.length === 2, `got ${v6lines.length}: ${JSON.stringify(v6lines)}`);
+  check('adjacent same-label JP/Tokyo IPv6 collapsed', v6lines.includes(MERGED_JP), `got ${JSON.stringify(v6lines)}`);
+  check('different IPv6 subdivision JP/Osaka stayed separate', v6lines.includes(OSAKA), `got ${JSON.stringify(v6lines)}`);
 } finally {
   try { fs.unlinkSync(inPath); } catch { /* best effort */ }
   try { fs.unlinkSync(outPath); } catch { /* best effort */ }
+  try { fs.unlinkSync(ipv6OutPath); } catch { /* best effort */ }
 }
 
 console.log(`\n=== server-ip-geo-merge results: ${passed} passed, ${failed} failed ===`);
diff --git a/tests/server-ip-geo.test.js b/tests/server-ip-geo.test.js
index 6435c9836..0c7525fcc 100644
--- a/tests/server-ip-geo.test.js
+++ b/tests/server-ip-geo.test.js
@@ -7,7 +7,9 @@
  *       {country, subdivision}; out-of-range IP returns 'unknown'.
  *   (b) DBIP_DATASET_PATH -> non-existent path: deriveRegion returns 'unknown'
  *       and does NOT throw (graceful degradation).
- *   (c) malformed / IPv6 / empty input returns 'unknown'.
+ *   (c) malformed / empty / unmapped IPv6 (loopback, Google DNS, CIDR keys)
+ *       returns 'unknown'. Native IPv6 in the sibling fixture (2405:201::/32,
+ *       2001:db8::/32) hits. IPv4-mapped IPv6 (`::ffff:a.b.c.d`) unwraps as IPv4.
  *
  * Each scenario re-requires the module via _resetForTest() so the lazy table
  * cache is rebuilt against the scenario's DBIP_DATASET_PATH.
@@ -20,6 +22,7 @@
 const path = require('path');
 
 const FIXTURE = path.join(__dirname, '..', 'showcase', 'server', 'data', 'dbip-city-lite.fixture.csv');
+delete process.env.DBIP_IPV6_DATASET_PATH;
 const ipGeo = require(path.join(__dirname, '..', 'showcase', 'server', 'src', 'utils', 'ip-geo'));
 
 let passed = 0;
@@ -108,7 +111,7 @@ const BAD_INPUTS = [
   ['empty string', ''],
   ['IPv6 ::1', '::1'],
   ['IPv6 full', '2001:4860:4860::8888'],
-  ['IPv4-mapped-IPv6', '::ffff:8.8.8.8'],
+  ['IPv6 /56 rate-limit key', '2001:4860:4860::/56'],
   ['garbage', 'not-an-ip'],
   ['too few octets', '8.8.8'],
   ['too many octets', '8.8.8.8.8'],
@@ -124,6 +127,55 @@ for (const [label, input] of BAD_INPUTS) {
   check(`malformed input (${label}) -> unknown, no throw`, !threw2 && isUnknown(v), `threw=${threw2} got=${JSON.stringify(v)}`);
 }
 
+check(
+  'IPv4-mapped ::ffff:8.8.8.8 -> US/California (unwrap then fixture hit)',
+  regionEq(ipGeo.deriveRegion('::ffff:8.8.8.8'), 'US', 'California'),
+  `got ${JSON.stringify(ipGeo.deriveRegion('::ffff:8.8.8.8'))}`
+);
+check(
+  'IPv4-mapped :ffff:8.8.8.8 -> US/California',
+  regionEq(ipGeo.deriveRegion(':ffff:8.8.8.8'), 'US', 'California'),
+  `got ${JSON.stringify(ipGeo.deriveRegion(':ffff:8.8.8.8'))}`
+);
+
+check('classifyIp 8.8.8.8 -> ipv4', ipGeo.classifyIp('8.8.8.8') === 'ipv4', ipGeo.classifyIp('8.8.8.8'));
+check('classifyIp ::ffff:8.8.8.8 -> ipv4-mapped', ipGeo.classifyIp('::ffff:8.8.8.8') === 'ipv4-mapped', ipGeo.classifyIp('::ffff:8.8.8.8'));
+check('classifyIp 2001:db8::1 -> ipv6', ipGeo.classifyIp('2001:db8::1') === 'ipv6', ipGeo.classifyIp('2001:db8::1'));
+check('classifyIp fdaa:35:8f81::2 -> ipv6-ula', ipGeo.classifyIp('fdaa:35:8f81::2') === 'ipv6-ula', ipGeo.classifyIp('fdaa:35:8f81::2'));
+check('classifyIp 2001:db8::/56 -> ipv6-cidr', ipGeo.classifyIp('2001:db8::/56') === 'ipv6-cidr', ipGeo.classifyIp('2001:db8::/56'));
+check('classifyIp empty -> empty', ipGeo.classifyIp('') === 'empty', ipGeo.classifyIp(''));
+
+check(
+  'native IPv6 2405:201:e00:1::1 -> IN/Maharashtra (Jio-like fixture hit)',
+  regionEq(ipGeo.deriveRegion('2405:201:e00:1::1'), 'IN', 'Maharashtra'),
+  `got ${JSON.stringify(ipGeo.deriveRegion('2405:201:e00:1::1'))}`
+);
+check(
+  'native IPv6 2405:201:: range start -> IN/Maharashtra',
+  regionEq(ipGeo.deriveRegion('2405:201::'), 'IN', 'Maharashtra'),
+  `got ${JSON.stringify(ipGeo.deriveRegion('2405:201::'))}`
+);
+check(
+  'native IPv6 2001:db8::1 -> AU/Victoria (docs-prefix fixture hit)',
+  regionEq(ipGeo.deriveRegion('2001:db8::1'), 'AU', 'Victoria'),
+  `got ${JSON.stringify(ipGeo.deriveRegion('2001:db8::1'))}`
+);
+check(
+  'native IPv6 2001:4860:4860::8888 -> unknown (not in fixture)',
+  isUnknown(ipGeo.deriveRegion('2001:4860:4860::8888')),
+  `got ${JSON.stringify(ipGeo.deriveRegion('2001:4860:4860::8888'))}`
+);
+
+const indiaHalves = ipGeo.ipv6ToHalves('2405:201:e00:1::1');
+check(
+  'ipv6ToHalves 2405:201:e00:1::1 is 128-bit halves',
+  !!(indiaHalves && indiaHalves.hi === 2595482963802062849n && indiaHalves.lo === 1n),
+  `got ${indiaHalves && indiaHalves.hi.toString() + ',' + indiaHalves.lo.toString()}`
+);
+check('ipv6ToHalves rejects /56 CIDR key', ipGeo.ipv6ToHalves('2001:db8::/56') === null, 'expected null');
+check('ipv6ToHalves parses ::1', !!ipGeo.ipv6ToHalves('::1'), 'expected halves');
+check('::1 -> unknown (loopback not in fixture)', isUnknown(ipGeo.deriveRegion('::1')), 'expected unknown');
+
 console.log(`\n=== server-ip-geo results: ${passed} passed, ${failed} failed ===`);
 if (failed > 0) process.exit(1);
 process.exit(0);
diff --git a/tests/server-no-ip-leak.test.js b/tests/server-no-ip-leak.test.js
index 2f5eaac78..42d1c5fa8 100644
--- a/tests/server-no-ip-leak.test.js
+++ b/tests/server-no-ip-leak.test.js
@@ -17,8 +17,9 @@
  *   - console.log / console.error references (the request-log middleware in
  *     server.js itself uses console.log and only records method/path/status/duration,
  *     NOT req.ip). console.log isn't in the grep list.
- *   - req.ip read inside the hashIp(req.ip, db) call site (this lives in routes
- *     and middleware; that's the SOLE permitted plaintext touch point).
+ *   - plaintext IP read inside clientIp(req) / hashIp(ipKeyGenerator(...), db)
+ *     / deriveRegion(...) call sites (routes + rate-limit middleware). Those
+ *     are the SOLE permitted plaintext touch points.
  *
  * Failure mode: process.exit(1) with the file path + line number + pattern name.
  *
@@ -93,40 +94,52 @@ for (const file of allFiles) {
 }
 
 // ---------------------------------------------------------------------------
-// Quick task 260630-hct -- POSITIVE assertion on the ingest route's req.ip
-// touchpoints. The ban-list above is necessary but not sufficient: it does not
-// pin HOW MANY times req.ip is referenced or in what form. The privacy invariant
-// (CONTEXT D-09 + 260630-hct) is that req.ip is referenced EXACTLY TWICE in
-// routes/telemetry.js -- once as an inline arg to hashIp() and once as an inline
-// arg to deriveRegion() -- and never assigned to an escaping local. This block
-// fails if a third (or un-inlined) req.ip reference is introduced. It permits
-// the geo-derive call site EXACTLY as it permits the existing hashIp call site;
-// it does NOT weaken any ban above.
+// POSITIVE assertion on the ingest route's plaintext-IP touchpoints.
+// The privacy invariant (CONTEXT D-09 + 260630-hct) is that the client IP is
+// referenced EXACTLY THREE times in routes/telemetry.js -- hashIp, deriveRegion,
+// and classifyIp -- each as an inline clientIp(req) argument, never assigned
+// to an escaping local.
+// Geo must NOT receive ipKeyGenerator's IPv6 /56 form (that is not an IPv4).
 const TELEMETRY_ROUTE = path.join(ROOT, 'routes', 'telemetry.js');
 const telemetrySrc = stripComments(fs.readFileSync(TELEMETRY_ROUTE, 'utf8'));
-const reqIpCount = (telemetrySrc.match(/req\.ip/g) || []).length;
-if (reqIpCount !== 2) {
-  console.error(`FAIL: routes/telemetry.js must reference req.ip EXACTLY TWICE (hashIp + deriveRegion); found ${reqIpCount}.`);
-  console.error('Each reference must be an inline argument; do NOT add a third touchpoint or an escaping local.');
+const clientIpCount = (telemetrySrc.match(/clientIp\(\s*req\s*\)/g) || []).length;
+if (clientIpCount !== 3) {
+  console.error(`FAIL: routes/telemetry.js must call clientIp(req) EXACTLY THREE times (hashIp + deriveRegion + classifyIp); found ${clientIpCount}.`);
+  console.error('Each reference must be an inline argument; do NOT add a fourth touchpoint or an escaping local.');
   process.exit(1);
 }
-// Each req.ip reference must be wrapped in ipKeyGenerator(req.ip) and passed
-// inline to hashIp( / deriveRegion(. Match the canonical inline forms.
-const HASHIP_INLINE = /hashIp\(\s*ipKeyGenerator\(\s*req\.ip\s*\)/;
-const DERIVE_INLINE = /deriveRegion\(\s*ipKeyGenerator\(\s*req\.ip\s*\)/;
+const HASHIP_INLINE = /hashIp\(\s*ipKeyGenerator\(\s*clientIp\(\s*req\s*\)\s*\)/;
+const DERIVE_INLINE = /deriveRegion\(\s*clientIp\(\s*req\s*\)/;
+const CLASSIFY_INLINE = /classifyIp\(\s*clientIp\(\s*req\s*\)/;
 if (!HASHIP_INLINE.test(telemetrySrc)) {
-  console.error('FAIL: routes/telemetry.js -- expected inline hashIp(ipKeyGenerator(req.ip), ...) call site missing.');
+  console.error('FAIL: routes/telemetry.js -- expected inline hashIp(ipKeyGenerator(clientIp(req)), ...) call site missing.');
   process.exit(1);
 }
 if (!DERIVE_INLINE.test(telemetrySrc)) {
-  console.error('FAIL: routes/telemetry.js -- expected inline deriveRegion(ipKeyGenerator(req.ip)) call site missing.');
+  console.error('FAIL: routes/telemetry.js -- expected inline deriveRegion(clientIp(req)) call site missing.');
   process.exit(1);
 }
-// Defensively reject an escaping plaintext-IP local even though the count==2
-// check already covers the common shapes (e.g. const ip = req.ip would push the
-// count to 3 if ip were reused, but a single-use alias would not).
-if (/\bconst\s+ip\s*=\s*req\.ip\b/.test(telemetrySrc)) {
-  console.error('FAIL: routes/telemetry.js introduces an escaping `const ip = req.ip` local; req.ip must stay inline.');
+if (!CLASSIFY_INLINE.test(telemetrySrc)) {
+  console.error('FAIL: routes/telemetry.js -- expected inline classifyIp(clientIp(req)) call site missing.');
+  process.exit(1);
+}
+if (/deriveRegion\(\s*ipKeyGenerator\(/.test(telemetrySrc)) {
+  console.error('FAIL: routes/telemetry.js must not pass ipKeyGenerator(...) into deriveRegion (IPv6 /56 is not geolocatable).');
+  process.exit(1);
+}
+if (/\bconst\s+ip\s*=\s*(req\.ip|clientIp\()/.test(telemetrySrc)) {
+  console.error('FAIL: routes/telemetry.js introduces an escaping plaintext-IP local; clientIp(req) must stay inline.');
+  process.exit(1);
+}
+
+const CLIENT_IP_UTIL = path.join(ROOT, 'utils', 'client-ip.js');
+const clientIpSrc = stripComments(fs.readFileSync(CLIENT_IP_UTIL, 'utf8'));
+if (!/Fly-Client-IP/.test(clientIpSrc)) {
+  console.error('FAIL: utils/client-ip.js must read the Fly-Client-IP header (req.ip on Fly is the anycast hop).');
+  process.exit(1);
+}
+if (/\bconsole\.(log|info|debug|warn|error)\b/.test(clientIpSrc)) {
+  console.error('FAIL: utils/client-ip.js must not log (plaintext IP).');
   process.exit(1);
 }
 
@@ -143,6 +156,6 @@ if (violations.length > 0) {
 console.log(`PASS: scanned ${allFiles.length} .js files under showcase/server/src/`);
 console.log(`  - 6 banned middleware patterns: morgan, winston, express-winston, express-logger, pino-http, express-pino-logger`);
 console.log(`  - 3 leak-pattern checks: fs.write/append + req.ip, fs.write/appendSync + req.ip, container.{push|set|add}(req.ip)`);
-console.log(`  - Positive assertion: routes/telemetry.js references req.ip EXACTLY TWICE, inline to hashIp() + deriveRegion(); no escaping local (260630-hct)`);
+console.log(`  - Positive assertion: routes/telemetry.js calls clientIp(req) EXACTLY THREE times, inline to hashIp(ipKeyGenerator(...)) + deriveRegion() + classifyIp(); no /56-into-geo; no escaping local`);
 console.log(`  - Files scanned: ${allFiles.map(f => path.relative(path.join(__dirname, '..'), f)).join(', ')}`);
 process.exit(0);
diff --git a/tests/server-public-stats-headline.test.js b/tests/server-public-stats-headline.test.js
index cae5f516a..8b19d5a29 100644
--- a/tests/server-public-stats-headline.test.js
+++ b/tests/server-public-stats-headline.test.js
@@ -183,7 +183,8 @@ function getJson(path_, extraHeaders = {}) {
       'active_count_version', 'active_history_since', 'active_history_complete',
       'users_365d', 'total_users', 'agent_days_lifetime',
       'total_agents_lifetime', 'agent_days_since_active_v2', 'tokens_total_lifetime',
-      'tokens_24h', 'popular_mcp_clients', 'popular_agents',
+      'tokens_24h', 'popular_mcp_clients', 'popular_agents', 'popular_regions',
+      'users_by_region_365d',
       'avg_agents_per_user', 'avg_agents_per_reporting_user',
     ];
     for (const f of expectedFields) {
diff --git a/tests/server-region-aggregation.test.js b/tests/server-region-aggregation.test.js
index 5b56da723..bf439456f 100644
--- a/tests/server-region-aggregation.test.js
+++ b/tests/server-region-aggregation.test.js
@@ -12,7 +12,8 @@
  *   (c) when the total below-k sum is itself <5 the 'Other' bucket is SUPPRESSED;
  *   (d) events whose region is 'unknown' are handled by the same floor;
  *   and the public headline path (buildHeadlineJson) exposes popular_regions as
- *   {label, uniq} with NO sub-floor/UUID/ip_hash leak.
+ *   {label, uniq} with NO sub-floor/UUID/ip_hash leak. users_by_region_365d is
+ *   last successful geo (a newer 'unknown' day does not replace a real region).
  *
  * Run: node tests/server-region-aggregation.test.js
  */
@@ -262,6 +263,76 @@ check('REGION_K_FLOOR is the HARD k>=5 (not the relaxed mcp floor of 2)', REGION
   check('HL: serialized headline contains NO ip_hash', !serialized.includes('ip_hash'), 'leaked ip_hash');
   check('HL: serialized headline contains NO install_uuid', !serialized.includes('install_uuid'), 'leaked install_uuid');
 
+  check('HL: headline has users_by_region_365d from persisted rollups',
+    Array.isArray(headline.users_by_region_365d),
+    `got ${JSON.stringify(headline.users_by_region_365d)}`);
+  check('HL: 365d census includes US-CA with uniq=6',
+    headline.users_by_region_365d.some((x) => x.label === 'US-CA' && x.uniq === 6),
+    `got ${JSON.stringify(headline.users_by_region_365d)}`);
+  check('HL: 365d census includes US-NY with uniq=5',
+    headline.users_by_region_365d.some((x) => x.label === 'US-NY' && x.uniq === 5),
+    `got ${JSON.stringify(headline.users_by_region_365d)}`);
+  check('HL: 365d census does NOT leak sub-floor US-TX',
+    !headline.users_by_region_365d.some((x) => x.label === 'US-TX'),
+    `got ${JSON.stringify(headline.users_by_region_365d)}`);
+
+  db.close();
+}
+
+{
+  const db = new Database(':memory:');
+  initializeDatabase(db);
+  const queries = new Queries(db);
+  seedRegion(queries, 'IN-Maharashtra', 6);
+  runHousekeeperTick(db, queries, NOW);
+  db.prepare('DELETE FROM telemetry_events').run();
+  runHousekeeperTick(db, queries, NOW);
+  const headline = buildHeadlineJson(queries);
+  check('persist: 365d still has IN-Maharashtra after raw events are wiped',
+    Array.isArray(headline.users_by_region_365d)
+      && headline.users_by_region_365d.some((x) => x.label === 'IN-Maharashtra' && x.uniq === 6),
+    `got ${JSON.stringify(headline.users_by_region_365d)}`);
+  check('persist: today popular_regions may be empty after wipe, 365d is the durable copy',
+    Array.isArray(headline.popular_regions),
+    `got ${JSON.stringify(headline.popular_regions)}`);
+
+  db.close();
+}
+
+{
+  const db = new Database(':memory:');
+  initializeDatabase(db);
+  const queries = new Queries(db);
+  const yesterdayStart = floorToUtcDayMs(NOW) - 24 * 60 * 60 * 1000;
+  const tsYesterday = yesterdayStart + 3 * 60 * 60 * 1000;
+  const uuids = [];
+  for (let i = 0; i < 6; i++) {
+    const uuid = nextUuid();
+    uuids.push(uuid);
+    queries.insertTelemetryEventWithRegionV3.run(
+      nextEventId(), uuid, tsYesterday + i * 60000,
+      'Claude', 'm', 1, 1, 0, 2, 'periodic', 'iphash', NOW - 24 * 60 * 60 * 1000,
+      'IN-Maharashtra', 'ipv4'
+    );
+  }
+  runHousekeeperTick(db, queries, NOW);
+  for (let i = 0; i < 6; i++) {
+    queries.insertTelemetryEventWithRegionV3.run(
+      nextEventId(), uuids[i], TS_TODAY + i * 60000,
+      'Claude', 'm', 1, 1, 0, 2, 'periodic', 'iphash', NOW,
+      'unknown', 'ipv6-ula'
+    );
+  }
+  runHousekeeperTick(db, queries, NOW);
+  const headline = buildHeadlineJson(queries);
+  check('persist: newer unknown day does not replace last-known IN-Maharashtra',
+    Array.isArray(headline.users_by_region_365d)
+      && headline.users_by_region_365d.some((x) => x.label === 'IN-Maharashtra' && x.uniq === 6),
+    `got ${JSON.stringify(headline.users_by_region_365d)}`);
+  check('persist: 365d census omits unknown when a real region still exists',
+    !headline.users_by_region_365d.some((x) => x.label === 'unknown'),
+    `got ${JSON.stringify(headline.users_by_region_365d)}`);
+
   db.close();
 }
 
diff --git a/tests/server-telemetry-housekeeper.test.js b/tests/server-telemetry-housekeeper.test.js
index 97898ac95..190f97d7c 100644
--- a/tests/server-telemetry-housekeeper.test.js
+++ b/tests/server-telemetry-housekeeper.test.js
@@ -69,7 +69,7 @@ for (let i = 0; i < 3; i++) {
     '00000000-0000-4000-8000-000000000' + (10 + i),
     UUID_A,
     tsToday + i * 60000,
-    'Claude', 'm', 100, 50, 2, 2, 'periodic', 'h1', NOW, 'unknown'
+    'Claude', 'm', 100, 50, 2, 2, 'periodic', 'h1', NOW, 'IN-Maharashtra'
   );
 }
 
@@ -79,7 +79,7 @@ for (let i = 0; i < 2; i++) {
     '00000000-0000-4000-8000-000000000' + (20 + i),
     UUID_B,
     tsToday + i * 60000,
-    'Codex', 'm', 200, 100, 1, 2, 'periodic', 'h2', NOW, 'unknown'
+    'Codex', 'm', 200, 100, 1, 2, 'periodic', 'h2', NOW, 'US-NY'
   );
 }
 
@@ -89,7 +89,7 @@ queries.insertTelemetryEventWithRegionV2.run(
   '00000000-0000-4000-8000-000000000030',
   UUID_A,
   tsYesterday,
-  'Claude', 'm', 50, 25, 1, 2, 'periodic', 'h1', NOW - 12 * 60 * 60 * 1000, 'unknown'
+  'Claude', 'm', 50, 25, 1, 2, 'periodic', 'h1', NOW - 12 * 60 * 60 * 1000, 'IN-Maharashtra'
 );
 
 // Seed rollup retention boundaries plus deliberately corrupt historical
@@ -151,14 +151,20 @@ check('rollup (A, today).event_count === 3', rollupAToday && rollupAToday.event_
 check('rollup (A, today).tokens_in === 300', rollupAToday && rollupAToday.tokens_in === 300, `got ${JSON.stringify(rollupAToday)}`);
 check('rollup (A, today).tokens_out === 150', rollupAToday && rollupAToday.tokens_out === 150, `got ${JSON.stringify(rollupAToday)}`);
 check('rollup (A, today).max_active_agents === 2', rollupAToday && rollupAToday.max_active_agents === 2, `got ${JSON.stringify(rollupAToday)}`);
+check('rollup (A, today).region persists IN-Maharashtra on the 365d row',
+  rollupAToday && rollupAToday.region === 'IN-Maharashtra', `got ${JSON.stringify(rollupAToday)}`);
 
 const rollupAYesterday = db.prepare('SELECT * FROM telemetry_rollups_daily WHERE install_uuid = ? AND day_utc = ?').get(UUID_A, YESTERDAY);
 check('rollup row exists for (A, yesterday)', !!rollupAYesterday, `got ${JSON.stringify(rollupAYesterday)}`);
 check('rollup (A, yesterday).event_count === 1', rollupAYesterday && rollupAYesterday.event_count === 1, `got ${JSON.stringify(rollupAYesterday)}`);
+check('rollup (A, yesterday).region persists IN-Maharashtra',
+  rollupAYesterday && rollupAYesterday.region === 'IN-Maharashtra', `got ${JSON.stringify(rollupAYesterday)}`);
 
 const rollupBToday = db.prepare('SELECT * FROM telemetry_rollups_daily WHERE install_uuid = ? AND day_utc = ?').get(UUID_B, TODAY);
 check('rollup row exists for (B, today)', !!rollupBToday, `got ${JSON.stringify(rollupBToday)}`);
 check('rollup (B, today).event_count === 2', rollupBToday && rollupBToday.event_count === 2, `got ${JSON.stringify(rollupBToday)}`);
+check('rollup (B, today).region persists US-NY on the 365d row',
+  rollupBToday && rollupBToday.region === 'US-NY', `got ${JSON.stringify(rollupBToday)}`);
 
 // Step 3: global aggregates for today + yesterday.
 const globalToday = db.prepare('SELECT * FROM telemetry_global_aggregates WHERE day_utc = ?').get(TODAY);
diff --git a/tests/showcase-angular-foundation.test.js b/tests/showcase-angular-foundation.test.js
index 4cfd0e03f..1ec354585 100644
--- a/tests/showcase-angular-foundation.test.js
+++ b/tests/showcase-angular-foundation.test.js
@@ -47,6 +47,7 @@ const shellComponentSource = readIfPresent('showcase/angular/src/app/layout/show
 const shellTemplateSource = readIfPresent('showcase/angular/src/app/layout/showcase-shell/showcase-shell.component.html');
 const shellStyleSource = readIfPresent('showcase/angular/src/app/layout/showcase-shell/showcase-shell.component.scss');
 const globalStylesSource = readIfPresent('showcase/angular/src/styles.scss');
+const languagePickerStyleSource = readIfPresent('showcase/angular/src/app/layout/language-picker/language-picker.component.scss');
 const themeServiceSource = readIfPresent('showcase/angular/src/app/core/theme.service.ts');
 const homeComponentSource = readIfPresent('showcase/angular/src/app/pages/home/home-page.component.ts');
 const homeStyleSource = readIfPresent('showcase/angular/src/app/pages/home/home-page.component.scss');
@@ -248,6 +249,19 @@ assert(
   'shared styles keep light-theme selector while shell styles own nav/footer/theme-toggle primitives'
 );
 
+assert(
+  /:root\s*\{[\s\S]*?color-scheme:\s*dark;/.test(globalStylesSource) &&
+    /\[data-theme="light"\]\s*\{[\s\S]*?color-scheme:\s*light;/.test(globalStylesSource),
+  'global theme tokens set color-scheme so native form controls follow dark/light mode'
+);
+
+assert(
+  /\.lang-picker__select\s*\{[\s\S]*?background-color:\s*var\(--bg-card\);/.test(languagePickerStyleSource) &&
+    /\.lang-picker__select\s*\{[\s\S]*?color-scheme:\s*inherit;/.test(languagePickerStyleSource) &&
+    !/background:\s*transparent/.test(languagePickerStyleSource),
+  'language picker select uses an opaque theme background instead of transparent UA Field'
+);
+
 assert(
   !/(about-hero|dash-preview|faq-section|privacy-page)/.test(globalStylesSource),
   'global styles avoid page-specific selector leakage'
diff --git a/tests/stats-chart-overhaul.test.js b/tests/stats-chart-overhaul.test.js
index 495238ff8..9d0bd5f82 100644
--- a/tests/stats-chart-overhaul.test.js
+++ b/tests/stats-chart-overhaul.test.js
@@ -288,9 +288,9 @@ function commitPunchcardLocal(commits) {
   check('stats globe: redrawChart keeps the running globe when regions are unchanged',
     /if\s*\(this\.stopGlobe\s*&&\s*key\s*===\s*this\.lastGlobeKey\)\s*return;/.test(redrawBlock),
     'redrawChart() lacks the stopGlobe && key === lastGlobeKey early return');
-  check('stats globe: globe signature key derives from popular_regions and motion preference',
-    /JSON\.stringify\(\{[\s\S]*regions:\s*this\.latestFsbHeadline\?\.popular_regions\s*\?\?\s*\[\][\s\S]*reducedMotion:\s*this\.prefersReducedMotion/.test(redrawBlock),
-    'redrawChart() globe key does not include popular_regions + reducedMotion');
+  check('stats globe: globe signature key derives from globeRegionList and motion preference',
+    /JSON\.stringify\(\{[\s\S]*regions:\s*this\.globeRegionList[\s\S]*reducedMotion:\s*this\.prefersReducedMotion/.test(redrawBlock),
+    'redrawChart() globe key does not include globeRegionList + reducedMotion');
   check('stats globe: no unconditional globe teardown ahead of the fsb-active-now branch',
     redrawBlock.indexOf("selectedView === 'fsb-active-now'") !== -1 &&
       redrawBlock.indexOf("selectedView === 'fsb-active-now'") < redrawBlock.indexOf('this.stopGlobe?.();'),
@@ -373,7 +373,7 @@ function commitPunchcardLocal(commits) {
   check('stats globe: region values have an accessible fallback list',
     html.includes("[attr.aria-describedby]=\"accessibleGlobeData.length ? 'stats-globe-data' : null\"") &&
       html.includes('id="stats-globe-data"') &&
-      /get\s+accessibleGlobeData\(\)[\s\S]*popular_regions/.test(src),
+      /get\s+accessibleGlobeData\(\)[\s\S]*globeRegionList/.test(src),
     'globe canvas lacks a described region/count list');
 
   check('stats tabs: grid fallback covers narrow-tablet widths before clipping',