@hot-updater/plugin-insights 1.0.0-rc.35 → 1.0.0-rc.37

package/dist/server/index.d.mts

@@ -2,7 +2,7 @@ import { BundleEventFailure, BundleEventFailureReason, BundleEventFailureStage,
 import { InsightsBundleEventFilter, InsightsCountEventSeriesInput, InsightsCountEventsInput, InsightsCountLatestEventsInput, InsightsCoverage, InsightsEventCursor, InsightsEventFilter, InsightsEventSeriesPoint, InsightsFindLatestEventsInput, InsightsGetAppUsageInput, InsightsGetAppUsageResult, InsightsGetReleaseActivityInput, InsightsGetReleaseActivityResult, InsightsListEventsInput, InsightsModel, InsightsRecordEventInput, InsightsScope, InsightsTimeRange, ReleaseActivityMetrics, ReleaseReference } from "./modelTypes.mjs";
 import { DEFAULT_INSIGHTS_RETENTION, InsightsRetention, InsightsSchema, createInsightsSchema, insightsSchema } from "./schema.mjs";
 import { InsightsFailureBreakdown, InsightsUpdateFailures, InsightsUpdateFailuresInput } from "./reads.mjs";
-import { ActiveInstallationWindow, BundleEventFailureInput, CreateBundleEventRequest, CreateBundleEventRequestBase, CursorPage, EventCursorPage, EventHistoryRow, InsightsBundleSelection, InsightsCountMeasurement, InsightsHttpResponse, InstallationHistoryRow, InstallationRow, ReportingOverview } from "./domain.mjs";
+import { ActiveInstallationWindow, BundleEventFailureInput, CreateBundleEventRequest, CreateBundleEventRequestBase, CursorPage, EventCursorPage, EventHistoryChange, EventHistoryRow, InsightsBundleSelection, InsightsCountMeasurement, InsightsHttpResponse, InstallationHistoryRow, InstallationRow, ReportingOverview } from "./domain.mjs";
 import { InsightsBadRequestError } from "./errors.mjs";
 import { createInsightsModel } from "./model.mjs";
 import { InsightsEventPageInput, InsightsInstallationEventPageInput, InsightsProvider, InsightsUserInstallationPageInput } from "./types.mjs";
@@ -284,6 +284,38 @@ declare const insights: (options?: InsightsOptions) => import("@hot-updater/plug
       readonly sort: readonly ["bucket_start_ms"];
     };
   }, never, readonly ["channel", "platform", "app_version", "release_id", "bucket_start_ms"]>;
+  readonly insights_builtin_distribution: import("@hot-updater/plugin-core").AggregateDefinition<{
+    readonly channel: {
+      readonly type: "string";
+    };
+    readonly platform: {
+      readonly type: "string";
+      readonly maxLength: 16;
+    };
+    readonly app_version: {
+      readonly type: "string";
+    };
+    readonly release_id: {
+      readonly type: "string";
+      readonly maxLength: 36;
+    };
+    readonly builtin_bundle_id: {
+      readonly type: "string";
+      readonly maxLength: 36;
+    };
+    readonly bucket_start_ms: {
+      readonly type: "integer";
+    };
+  }, "latest_installations", {
+    readonly byScope: {
+      readonly eq: readonly ["channel", "platform"];
+      readonly sort: readonly ["bucket_start_ms"];
+    };
+    readonly byVersion: {
+      readonly eq: readonly ["channel", "platform", "app_version"];
+      readonly sort: readonly ["bucket_start_ms"];
+    };
+  }, never, readonly ["channel", "platform", "app_version", "release_id", "builtin_bundle_id", "bucket_start_ms"]>;
   readonly insights_latest_by_bundle: import("@hot-updater/plugin-core").AggregateDefinition<{
     readonly platform: {
       readonly type: "string";
@@ -390,4 +422,4 @@ declare const insights: (options?: InsightsOptions) => import("@hot-updater/plug
   endpoints: PluginEndpoint[];
 }, {}>;
 //#endregion
-export { type ActiveInstallationWindow, type BundleEventFailure, type BundleEventFailureInput, type BundleEventFailureReason, type BundleEventFailureStage, type BundleEventRow, type BundleEventRowBase, type CreateBundleEventRequest, type CreateBundleEventRequestBase, type CursorPage, DEFAULT_INSIGHTS_RETENTION, type DatabaseBundleEventMetadata, type EventCursorPage, type EventHistoryRow, InsightsApi, InsightsBadRequestError, type InsightsBundleEventFilter, type InsightsBundleSelection, type InsightsCountEventSeriesInput, type InsightsCountEventsInput, type InsightsCountLatestEventsInput, type InsightsCountMeasurement, type InsightsCoverage, type InsightsEventCursor, type InsightsEventFilter, type InsightsEventPageInput, type InsightsEventSeriesPoint, type InsightsFailureBreakdown, type InsightsFindLatestEventsInput, type InsightsGetAppUsageInput, type InsightsGetAppUsageResult, type InsightsGetReleaseActivityInput, type InsightsGetReleaseActivityResult, type InsightsHttpResponse, type InsightsIdentityParts, type InsightsInstallationEventPageInput, type InsightsListEventsInput, type InsightsModel, InsightsOptions, type InsightsProvider, type InsightsRecordEventInput, type InsightsRetention, type InsightsSchema, type InsightsScope, type InsightsTimeRange, type InsightsUpdateFailures, type InsightsUpdateFailuresInput, type InsightsUserInstallationPageInput, type InstallationHistoryRow, type InstallationRow, type ReleaseActivityMetrics, type ReleaseReference, type ReportingOverview, createInsightsModel, createInsightsProvider, createInsightsSchema, insights, insightsIdentity, insightsSchema };
+export { type ActiveInstallationWindow, type BundleEventFailure, type BundleEventFailureInput, type BundleEventFailureReason, type BundleEventFailureStage, type BundleEventRow, type BundleEventRowBase, type CreateBundleEventRequest, type CreateBundleEventRequestBase, type CursorPage, DEFAULT_INSIGHTS_RETENTION, type DatabaseBundleEventMetadata, type EventCursorPage, type EventHistoryChange, type EventHistoryRow, InsightsApi, InsightsBadRequestError, type InsightsBundleEventFilter, type InsightsBundleSelection, type InsightsCountEventSeriesInput, type InsightsCountEventsInput, type InsightsCountLatestEventsInput, type InsightsCountMeasurement, type InsightsCoverage, type InsightsEventCursor, type InsightsEventFilter, type InsightsEventPageInput, type InsightsEventSeriesPoint, type InsightsFailureBreakdown, type InsightsFindLatestEventsInput, type InsightsGetAppUsageInput, type InsightsGetAppUsageResult, type InsightsGetReleaseActivityInput, type InsightsGetReleaseActivityResult, type InsightsHttpResponse, type InsightsIdentityParts, type InsightsInstallationEventPageInput, type InsightsListEventsInput, type InsightsModel, InsightsOptions, type InsightsProvider, type InsightsRecordEventInput, type InsightsRetention, type InsightsSchema, type InsightsScope, type InsightsTimeRange, type InsightsUpdateFailures, type InsightsUpdateFailuresInput, type InsightsUserInstallationPageInput, type InstallationHistoryRow, type InstallationRow, type ReleaseActivityMetrics, type ReleaseReference, type ReportingOverview, createInsightsModel, createInsightsProvider, createInsightsSchema, insights, insightsIdentity, insightsSchema };

package/dist/server/index.mjs

@@ -1,8 +1,8 @@
+import { DEFAULT_INSIGHTS_RETENTION, createInsightsSchema, insightsSchema } from "./schema.mjs";
 import { createInsightsModel } from "./model.mjs";
 import { markOfficial } from "./official.mjs";
 import { InsightsBadRequestError } from "./errors.mjs";
 import { createInsightsProvider } from "./provider.mjs";
-import { DEFAULT_INSIGHTS_RETENTION, createInsightsSchema, insightsSchema } from "./schema.mjs";
 import { insightsIdentity, recordEvent } from "./recordEvent.mjs";
 import { countEventSeries, countEvents, countLatestEvents, findLatestEvents, getAppUsage, getReleaseActivity, getUpdateFailures, listEvents } from "./reads.mjs";
 import { INSIGHTS_ROUTES, createInsightsRouteHandlers } from "./routes.mjs";

package/dist/server/modelTypes.d.cts

@@ -10,13 +10,14 @@ interface InsightsScope {
 }
 /**
  * Raw event predicates; recovery is attributed to the source bundle. An
- * UNCHANGED report is kept as no event, so no filter names it.
+ * UNCHANGED filter matches the kept rows that moved an installation to the
+ * bundle without an apply report.
  */
 type InsightsBundleEventFilter = InsightsScope & ({
   readonly type: "RECOVERED";
   readonly fromBundleId: string;
 } | {
-  readonly type: "UPDATE_DOWNLOADED" | "UPDATE_APPLIED" | "UPDATE_FAILED";
+  readonly type: "UPDATE_DOWNLOADED" | "UPDATE_APPLIED" | "UPDATE_FAILED" | "UNCHANGED";
   readonly toBundleId: string;
 });
 type InsightsEventFilter = {
@@ -139,7 +140,10 @@ interface InsightsGetAppUsageResult {
   readonly bundleDistribution: readonly {
     readonly appVersion: string;
     readonly platform: "ios" | "android";
+    /** The release the installations run; null for none. */
     readonly releaseId: string | null;
+    /** The native build's built-in bundle, when they run it. */
+    readonly builtinBundleId: string | null;
     readonly installations: number;
   }[];
   readonly measuredAtMs: number;

package/dist/server/modelTypes.d.mts

@@ -10,13 +10,14 @@ interface InsightsScope {
 }
 /**
  * Raw event predicates; recovery is attributed to the source bundle. An
- * UNCHANGED report is kept as no event, so no filter names it.
+ * UNCHANGED filter matches the kept rows that moved an installation to the
+ * bundle without an apply report.
  */
 type InsightsBundleEventFilter = InsightsScope & ({
   readonly type: "RECOVERED";
   readonly fromBundleId: string;
 } | {
-  readonly type: "UPDATE_DOWNLOADED" | "UPDATE_APPLIED" | "UPDATE_FAILED";
+  readonly type: "UPDATE_DOWNLOADED" | "UPDATE_APPLIED" | "UPDATE_FAILED" | "UNCHANGED";
   readonly toBundleId: string;
 });
 type InsightsEventFilter = {
@@ -139,7 +140,10 @@ interface InsightsGetAppUsageResult {
   readonly bundleDistribution: readonly {
     readonly appVersion: string;
     readonly platform: "ios" | "android";
+    /** The release the installations run; null for none. */
     readonly releaseId: string | null;
+    /** The native build's built-in bundle, when they run it. */
+    readonly builtinBundleId: string | null;
     readonly installations: number;
   }[];
   readonly measuredAtMs: number;

package/dist/server/overview.cjs

@@ -1,3 +1,4 @@
+const require_schema = require("./schema.cjs");
 //#region src/server/overview.ts
 const encodeIdentity = (identity) => [
 	identity.scopeKind,
@@ -64,18 +65,19 @@ const insightsOverviewDeltas = (event) => {
 			bucketStartMs
 		}, windowed);
 	};
-	if (event.type === "UPDATE_DOWNLOADED") metric(event.to_release_id, {
+	const implied = event.metadata.implied_download === true ? 1 : 0;
+	if (!require_schema.isLateEvent(event) && event.type === "UPDATE_DOWNLOADED") metric(event.to_release_id, {
 		downloads: 1,
 		applies: 0,
 		failedLaunches: 0
 	});
-	else if (event.type === "UPDATE_APPLIED") metric(event.to_release_id, {
-		downloads: 0,
+	else if (!require_schema.isLateEvent(event) && require_schema.isLaunch(event)) metric(event.to_release_id, {
+		downloads: implied,
 		applies: 1,
 		failedLaunches: 0
 	});
-	else if (event.type === "RECOVERED") metric(event.from_release_id, {
-		downloads: 0,
+	else if (!require_schema.isLateEvent(event) && event.type === "RECOVERED") metric(event.from_release_id, {
+		downloads: implied,
 		applies: 0,
 		failedLaunches: 1
 	});

package/dist/server/overview.d.cts

@@ -1,14 +1,14 @@
 import "./eventRow.cjs";
 //#region src/server/overview.d.ts
 type InsightsOverviewIdentity = {
-  readonly scopeKind: "release" | "channel" | "usage" | "distribution";
-  readonly releaseKind: "all" | "specific" | "embedded";
+  readonly scopeKind: "release" | "channel" | "usage";
+  readonly releaseKind: "all" | "specific";
   readonly releaseId: string;
   readonly channel: string;
   readonly platform: "all" | "ios" | "android";
   readonly appVersionKind: "all" | "specific";
   readonly appVersion: string;
-  readonly periodKind: "lifetime" | "hour" | "latest";
+  readonly periodKind: "lifetime" | "hour";
   readonly bucketStartMs: number;
 };
 //#endregion

package/dist/server/overview.d.mts

@@ -1,14 +1,14 @@
 import "./eventRow.mjs";
 //#region src/server/overview.d.ts
 type InsightsOverviewIdentity = {
-  readonly scopeKind: "release" | "channel" | "usage" | "distribution";
-  readonly releaseKind: "all" | "specific" | "embedded";
+  readonly scopeKind: "release" | "channel" | "usage";
+  readonly releaseKind: "all" | "specific";
   readonly releaseId: string;
   readonly channel: string;
   readonly platform: "all" | "ios" | "android";
   readonly appVersionKind: "all" | "specific";
   readonly appVersion: string;
-  readonly periodKind: "lifetime" | "hour" | "latest";
+  readonly periodKind: "lifetime" | "hour";
   readonly bucketStartMs: number;
 };
 //#endregion

package/dist/server/overview.mjs

@@ -1,3 +1,4 @@
+import { isLateEvent, isLaunch } from "./schema.mjs";
 //#region src/server/overview.ts
 const encodeIdentity = (identity) => [
 	identity.scopeKind,
@@ -64,18 +65,19 @@ const insightsOverviewDeltas = (event) => {
 			bucketStartMs
 		}, windowed);
 	};
-	if (event.type === "UPDATE_DOWNLOADED") metric(event.to_release_id, {
+	const implied = event.metadata.implied_download === true ? 1 : 0;
+	if (!isLateEvent(event) && event.type === "UPDATE_DOWNLOADED") metric(event.to_release_id, {
 		downloads: 1,
 		applies: 0,
 		failedLaunches: 0
 	});
-	else if (event.type === "UPDATE_APPLIED") metric(event.to_release_id, {
-		downloads: 0,
+	else if (!isLateEvent(event) && isLaunch(event)) metric(event.to_release_id, {
+		downloads: implied,
 		applies: 1,
 		failedLaunches: 0
 	});
-	else if (event.type === "RECOVERED") metric(event.from_release_id, {
-		downloads: 0,
+	else if (!isLateEvent(event) && event.type === "RECOVERED") metric(event.from_release_id, {
+		downloads: implied,
 		applies: 0,
 		failedLaunches: 1
 	});

package/dist/server/provider.cjs

@@ -166,11 +166,24 @@ const eventDetails = ({ type, metadata }) => ({
 	} } : {},
 	...type === "UPDATE_FAILED" && metadata.failure !== void 0 ? { failure: toFailure(metadata.failure) } : {},
 	...type === "UPDATE_DOWNLOADED" && metadata.delivery !== void 0 ? { delivery: metadata.delivery } : {},
-	...type === "UPDATE_DOWNLOADED" && metadata.patch_fallback === true ? { patchFallback: true } : {}
+	...type === "UPDATE_DOWNLOADED" && metadata.patch_fallback === true ? { patchFallback: true } : {},
+	...type === "UNCHANGED" && metadata.change !== void 0 ? { change: {
+		kinds: metadata.change.kinds,
+		...metadata.change.previous === null ? {} : { previous: {
+			bundleId: metadata.change.previous.bundle_id,
+			releaseId: metadata.change.previous.release_id,
+			appVersion: metadata.change.previous.app_version,
+			channel: metadata.change.previous.channel,
+			...metadata.change.previous.min_bundle_id === void 0 ? {} : { minBundleId: metadata.change.previous.min_bundle_id }
+		} }
+	} } : {},
+	...metadata.late === true ? { late: true } : {},
+	...metadata.implied_download === true ? { impliedDownload: true } : {}
 });
 const toEventHistoryRow = (row) => ({
 	...row.to_release_id == null ? {} : { toReleaseId: row.to_release_id },
 	...row.metadata.sdk_version == null ? {} : { sdkVersion: row.metadata.sdk_version },
+	...row.metadata.min_bundle_id === void 0 ? {} : { minBundleId: row.metadata.min_bundle_id },
 	appVersion: row.app_version,
 	channel: row.channel,
 	cohort: row.metadata.cohort,
@@ -186,6 +199,7 @@ const toEventHistoryRow = (row) => ({
 });
 const toInstallationRow = (row) => ({
 	...eventDetails(row).httpResponse ? { httpResponse: eventDetails(row).httpResponse } : {},
+	...row.metadata.min_bundle_id === void 0 ? {} : { minBundleId: row.metadata.min_bundle_id },
 	appVersion: row.app_version,
 	channel: row.channel,
 	cohort: row.metadata.cohort,

package/dist/server/provider.mjs

@@ -166,11 +166,24 @@ const eventDetails = ({ type, metadata }) => ({
 	} } : {},
 	...type === "UPDATE_FAILED" && metadata.failure !== void 0 ? { failure: toFailure(metadata.failure) } : {},
 	...type === "UPDATE_DOWNLOADED" && metadata.delivery !== void 0 ? { delivery: metadata.delivery } : {},
-	...type === "UPDATE_DOWNLOADED" && metadata.patch_fallback === true ? { patchFallback: true } : {}
+	...type === "UPDATE_DOWNLOADED" && metadata.patch_fallback === true ? { patchFallback: true } : {},
+	...type === "UNCHANGED" && metadata.change !== void 0 ? { change: {
+		kinds: metadata.change.kinds,
+		...metadata.change.previous === null ? {} : { previous: {
+			bundleId: metadata.change.previous.bundle_id,
+			releaseId: metadata.change.previous.release_id,
+			appVersion: metadata.change.previous.app_version,
+			channel: metadata.change.previous.channel,
+			...metadata.change.previous.min_bundle_id === void 0 ? {} : { minBundleId: metadata.change.previous.min_bundle_id }
+		} }
+	} } : {},
+	...metadata.late === true ? { late: true } : {},
+	...metadata.implied_download === true ? { impliedDownload: true } : {}
 });
 const toEventHistoryRow = (row) => ({
 	...row.to_release_id == null ? {} : { toReleaseId: row.to_release_id },
 	...row.metadata.sdk_version == null ? {} : { sdkVersion: row.metadata.sdk_version },
+	...row.metadata.min_bundle_id === void 0 ? {} : { minBundleId: row.metadata.min_bundle_id },
 	appVersion: row.app_version,
 	channel: row.channel,
 	cohort: row.metadata.cohort,
@@ -186,6 +199,7 @@ const toEventHistoryRow = (row) => ({
 });
 const toInstallationRow = (row) => ({
 	...eventDetails(row).httpResponse ? { httpResponse: eventDetails(row).httpResponse } : {},
+	...row.metadata.min_bundle_id === void 0 ? {} : { minBundleId: row.metadata.min_bundle_id },
 	appVersion: row.app_version,
 	channel: row.channel,
 	cohort: row.metadata.cohort,

package/dist/server/reads.cjs

@@ -1,5 +1,5 @@
-require("./provider.cjs");
 const require_schema = require("./schema.cjs");
+require("./provider.cjs");
 const require_recordEvent = require("./recordEvent.cjs");
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 //#region src/server/reads.ts
@@ -36,12 +36,11 @@ const EVENT_FIELDS = [
 ];
 /** A stored event or head, as the event row it holds. */
 const toEvent = (row) => Object.fromEntries(EVENT_FIELDS.map((field) => [field, row[field]]));
-const bundleRef = (filter) => filter.type === "RECOVERED" ? `from:${filter.fromBundleId}` : `to:${filter.toBundleId}`;
 const scopeOf = (filter) => ({
 	platform: filter.platform,
 	channel: filter.channel,
 	type: filter.type,
-	bundle_ref: bundleRef(filter)
+	bundle_ref: require_schema.bundleRefOfFilter(filter)
 });
 /** One UTC day of a global or bundle list, newest first. */
 const eventsOfDay = (db, filter, day, range, limit) => filter.kind === "all" ? db.findMany("bundle_events", {
@@ -410,26 +409,49 @@ const getAppUsage = async (db, input, now, retention) => {
 		lt: timeRange.end
 	};
 	const distribution = [];
-	for (const platform of reported) distribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
-		index: "byScope",
-		where: {
-			channel: input.channel,
-			platform
-		},
-		range,
-		limit: PAGE,
-		...page
-	}) : db.findAggregates("insights_distribution", {
-		index: "byVersion",
-		where: {
-			channel: input.channel,
-			platform,
-			app_version: input.appVersion
-		},
-		range,
-		limit: PAGE,
-		...page
-	})));
+	const builtinDistribution = [];
+	for (const platform of reported) {
+		distribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
+			index: "byScope",
+			where: {
+				channel: input.channel,
+				platform
+			},
+			range,
+			limit: PAGE,
+			...page
+		}) : db.findAggregates("insights_distribution", {
+			index: "byVersion",
+			where: {
+				channel: input.channel,
+				platform,
+				app_version: input.appVersion
+			},
+			range,
+			limit: PAGE,
+			...page
+		})));
+		builtinDistribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_builtin_distribution", {
+			index: "byScope",
+			where: {
+				channel: input.channel,
+				platform
+			},
+			range,
+			limit: PAGE,
+			...page
+		}) : db.findAggregates("insights_builtin_distribution", {
+			index: "byVersion",
+			where: {
+				channel: input.channel,
+				platform,
+				app_version: input.appVersion
+			},
+			range,
+			limit: PAGE,
+			...page
+		})));
+	}
 	const points = [];
 	for (let start = timeRange.start; start < timeRange.end; start += intervalMs) points.push({
 		startMs: start,
@@ -438,22 +460,31 @@ const getAppUsage = async (db, input, now, retention) => {
 	const versions = /* @__PURE__ */ new Map();
 	const platforms = /* @__PURE__ */ new Map();
 	const bundles = /* @__PURE__ */ new Map();
-	for (const row of distribution) {
-		const count = row.latest_installations;
-		versions.set(row.app_version, (versions.get(row.app_version) ?? 0) + count);
-		platforms.set(row.platform, (platforms.get(row.platform) ?? 0) + count);
-		const releaseId = row.release_id === "" ? null : row.release_id;
+	const countBundle = (row, releaseId, builtinBundleId, count) => {
 		const key = JSON.stringify([
 			row.app_version,
 			row.platform,
-			releaseId
+			releaseId,
+			builtinBundleId
 		]);
 		bundles.set(key, {
 			appVersion: row.app_version,
 			platform: row.platform,
 			releaseId,
+			builtinBundleId,
 			installations: (bundles.get(key)?.installations ?? 0) + count
 		});
+	};
+	for (const row of distribution) {
+		const count = row.latest_installations;
+		versions.set(row.app_version, (versions.get(row.app_version) ?? 0) + count);
+		platforms.set(row.platform, (platforms.get(row.platform) ?? 0) + count);
+		countBundle(row, row.release_id || null, null, count);
+	}
+	for (const row of builtinDistribution) {
+		const releaseId = row.release_id || null;
+		countBundle(row, releaseId, null, -row.latest_installations);
+		countBundle(row, releaseId, row.builtin_bundle_id, row.latest_installations);
 	}
 	const sortedVersions = byInstallations(versions);
 	return {

package/dist/server/reads.mjs

@@ -1,5 +1,5 @@
+import { DAILY_EVENTS, DAY_MS, HOUR_MS, bundleRefOfFilter } from "./schema.mjs";
 import "./provider.mjs";
-import { DAILY_EVENTS, DAY_MS, HOUR_MS } from "./schema.mjs";
 import { PAIR_FIELD, bundlePairKey, insightsIdentity } from "./recordEvent.mjs";
 import { DatabaseAdapterInputError, compareUtf8, countDistinct, mergeDistinct } from "@hot-updater/plugin-core";
 //#region src/server/reads.ts
@@ -36,12 +36,11 @@ const EVENT_FIELDS = [
 ];
 /** A stored event or head, as the event row it holds. */
 const toEvent = (row) => Object.fromEntries(EVENT_FIELDS.map((field) => [field, row[field]]));
-const bundleRef = (filter) => filter.type === "RECOVERED" ? `from:${filter.fromBundleId}` : `to:${filter.toBundleId}`;
 const scopeOf = (filter) => ({
 	platform: filter.platform,
 	channel: filter.channel,
 	type: filter.type,
-	bundle_ref: bundleRef(filter)
+	bundle_ref: bundleRefOfFilter(filter)
 });
 /** One UTC day of a global or bundle list, newest first. */
 const eventsOfDay = (db, filter, day, range, limit) => filter.kind === "all" ? db.findMany("bundle_events", {
@@ -410,26 +409,49 @@ const getAppUsage = async (db, input, now, retention) => {
 		lt: timeRange.end
 	};
 	const distribution = [];
-	for (const platform of reported) distribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
-		index: "byScope",
-		where: {
-			channel: input.channel,
-			platform
-		},
-		range,
-		limit: PAGE,
-		...page
-	}) : db.findAggregates("insights_distribution", {
-		index: "byVersion",
-		where: {
-			channel: input.channel,
-			platform,
-			app_version: input.appVersion
-		},
-		range,
-		limit: PAGE,
-		...page
-	})));
+	const builtinDistribution = [];
+	for (const platform of reported) {
+		distribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
+			index: "byScope",
+			where: {
+				channel: input.channel,
+				platform
+			},
+			range,
+			limit: PAGE,
+			...page
+		}) : db.findAggregates("insights_distribution", {
+			index: "byVersion",
+			where: {
+				channel: input.channel,
+				platform,
+				app_version: input.appVersion
+			},
+			range,
+			limit: PAGE,
+			...page
+		})));
+		builtinDistribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_builtin_distribution", {
+			index: "byScope",
+			where: {
+				channel: input.channel,
+				platform
+			},
+			range,
+			limit: PAGE,
+			...page
+		}) : db.findAggregates("insights_builtin_distribution", {
+			index: "byVersion",
+			where: {
+				channel: input.channel,
+				platform,
+				app_version: input.appVersion
+			},
+			range,
+			limit: PAGE,
+			...page
+		})));
+	}
 	const points = [];
 	for (let start = timeRange.start; start < timeRange.end; start += intervalMs) points.push({
 		startMs: start,
@@ -438,22 +460,31 @@ const getAppUsage = async (db, input, now, retention) => {
 	const versions = /* @__PURE__ */ new Map();
 	const platforms = /* @__PURE__ */ new Map();
 	const bundles = /* @__PURE__ */ new Map();
-	for (const row of distribution) {
-		const count = row.latest_installations;
-		versions.set(row.app_version, (versions.get(row.app_version) ?? 0) + count);
-		platforms.set(row.platform, (platforms.get(row.platform) ?? 0) + count);
-		const releaseId = row.release_id === "" ? null : row.release_id;
+	const countBundle = (row, releaseId, builtinBundleId, count) => {
 		const key = JSON.stringify([
 			row.app_version,
 			row.platform,
-			releaseId
+			releaseId,
+			builtinBundleId
 		]);
 		bundles.set(key, {
 			appVersion: row.app_version,
 			platform: row.platform,
 			releaseId,
+			builtinBundleId,
 			installations: (bundles.get(key)?.installations ?? 0) + count
 		});
+	};
+	for (const row of distribution) {
+		const count = row.latest_installations;
+		versions.set(row.app_version, (versions.get(row.app_version) ?? 0) + count);
+		platforms.set(row.platform, (platforms.get(row.platform) ?? 0) + count);
+		countBundle(row, row.release_id || null, null, count);
+	}
+	for (const row of builtinDistribution) {
+		const releaseId = row.release_id || null;
+		countBundle(row, releaseId, null, -row.latest_installations);
+		countBundle(row, releaseId, row.builtin_bundle_id, row.latest_installations);
 	}
 	const sortedVersions = byInstallations(versions);
 	return {