@hot-updater/cloudflare 1.0.0-rc.34 → 1.0.0-rc.36

package/dist/index.d.cts

@@ -69,6 +69,8 @@ type DatabaseBundleEventMetadata = DatabaseJsonObject & {
   readonly update_strategy: "fingerprint" | "appVersion" | null;
   readonly fingerprint_hash: string | null;
   readonly sdk_version: string | null;
+  /** The native build's built-in bundle ID, when the SDK reports it. */
+  readonly min_bundle_id?: string;
   /** `UPDATE_FAILED`: what failed. */
   readonly failure?: BundleEventFailure;
   readonly http_response?: DatabaseHttpResponse;
@@ -244,7 +246,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;
@@ -575,6 +580,38 @@ declare const plugins: readonly [import("@hot-updater/plugin-core").HotUpdaterPl
       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";

package/dist/index.d.mts

@@ -69,6 +69,8 @@ type DatabaseBundleEventMetadata = DatabaseJsonObject & {
   readonly update_strategy: "fingerprint" | "appVersion" | null;
   readonly fingerprint_hash: string | null;
   readonly sdk_version: string | null;
+  /** The native build's built-in bundle ID, when the SDK reports it. */
+  readonly min_bundle_id?: string;
   /** `UPDATE_FAILED`: what failed. */
   readonly failure?: BundleEventFailure;
   readonly http_response?: DatabaseHttpResponse;
@@ -244,7 +246,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;
@@ -575,6 +580,38 @@ declare const plugins: readonly [import("@hot-updater/plugin-core").HotUpdaterPl
       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";

package/dist/worker/index.d.cts

@@ -57,6 +57,8 @@ type DatabaseBundleEventMetadata = DatabaseJsonObject & {
   readonly update_strategy: "fingerprint" | "appVersion" | null;
   readonly fingerprint_hash: string | null;
   readonly sdk_version: string | null;
+  /** The native build's built-in bundle ID, when the SDK reports it. */
+  readonly min_bundle_id?: string;
   /** `UPDATE_FAILED`: what failed. */
   readonly failure?: BundleEventFailure;
   readonly http_response?: DatabaseHttpResponse;
@@ -232,7 +234,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;
@@ -563,6 +568,38 @@ declare const plugins: readonly [import("@hot-updater/plugin-core").HotUpdaterPl
       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";

package/dist/worker/index.d.mts

@@ -57,6 +57,8 @@ type DatabaseBundleEventMetadata = DatabaseJsonObject & {
   readonly update_strategy: "fingerprint" | "appVersion" | null;
   readonly fingerprint_hash: string | null;
   readonly sdk_version: string | null;
+  /** The native build's built-in bundle ID, when the SDK reports it. */
+  readonly min_bundle_id?: string;
   /** `UPDATE_FAILED`: what failed. */
   readonly failure?: BundleEventFailure;
   readonly http_response?: DatabaseHttpResponse;
@@ -232,7 +234,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;
@@ -563,6 +568,38 @@ declare const plugins: readonly [import("@hot-updater/plugin-core").HotUpdaterPl
       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";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/cloudflare",
   "type": "module",
-  "version": "1.0.0-rc.34",
+  "version": "1.0.0-rc.36",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -56,10 +56,10 @@
     "cloudflare": "4.2.0",
     "hono": "4.12.34",
     "uuidv7": "^1.0.2",
-    "@hot-updater/cli-tools": "1.0.0-rc.34",
-    "@hot-updater/protocol": "1.0.0-rc.30",
-    "@hot-updater/plugin-core": "1.0.0-rc.30",
-    "@hot-updater/server": "1.0.0-rc.34"
+    "@hot-updater/cli-tools": "1.0.0-rc.36",
+    "@hot-updater/protocol": "1.0.0-rc.36",
+    "@hot-updater/plugin-core": "1.0.0-rc.36",
+    "@hot-updater/server": "1.0.0-rc.36"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "0.13.0",
@@ -75,7 +75,7 @@
     "vitest": "4.1.4",
     "wrangler": "^4.69.0",
     "xdg-app-paths": "^8.3.0",
-    "@hot-updater/test-utils": "1.0.0-rc.32"
+    "@hot-updater/test-utils": "1.0.0-rc.36"
   },
   "scripts": {
     "build": "tsdown && pnpm build:worker",

package/sql/bundles.sql

@@ -78,6 +78,14 @@ CREATE INDEX IF NOT EXISTS "insights_distribution_byVersion" ON "insights_distri
 
 CREATE INDEX IF NOT EXISTS "insights_distribution__retention" ON "insights_distribution" ("bucket_start_ms", "channel", "platform", "app_version", "release_id", "_shard");
 
+CREATE TABLE IF NOT EXISTS "insights_builtin_distribution" ("channel" TEXT NOT NULL, "platform" TEXT NOT NULL, "app_version" TEXT NOT NULL, "release_id" TEXT NOT NULL, "builtin_bundle_id" TEXT NOT NULL, "bucket_start_ms" INTEGER NOT NULL, "_shard" INTEGER NOT NULL, "latest_installations" INTEGER NOT NULL, "_v" INTEGER NOT NULL DEFAULT 0, PRIMARY KEY ("channel", "platform", "app_version", "release_id", "builtin_bundle_id", "bucket_start_ms", "_shard"));
+
+CREATE INDEX IF NOT EXISTS "insights_builtin_distribution_byScope" ON "insights_builtin_distribution" ("channel", "platform", "bucket_start_ms", "app_version", "release_id", "builtin_bundle_id", "_shard");
+
+CREATE INDEX IF NOT EXISTS "insights_builtin_distribution_byVersion" ON "insights_builtin_distribution" ("channel", "platform", "app_version", "bucket_start_ms", "release_id", "builtin_bundle_id", "_shard");
+
+CREATE INDEX IF NOT EXISTS "insights_builtin_distribution__retention" ON "insights_builtin_distribution" ("bucket_start_ms", "channel", "platform", "app_version", "release_id", "builtin_bundle_id", "_shard");
+
 CREATE TABLE IF NOT EXISTS "insights_latest_by_bundle" ("platform" TEXT NOT NULL, "channel" TEXT NOT NULL, "bundle_field" TEXT NOT NULL, "bundle_id" TEXT NOT NULL, "type" TEXT NOT NULL, "bucket_start_ms" INTEGER NOT NULL, "_shard" INTEGER NOT NULL, "installations" INTEGER NOT NULL, "_v" INTEGER NOT NULL DEFAULT 0, PRIMARY KEY ("platform", "channel", "bundle_field", "bundle_id", "type", "bucket_start_ms", "_shard"));
 
 CREATE INDEX IF NOT EXISTS "insights_latest_by_bundle__retention" ON "insights_latest_by_bundle" ("bucket_start_ms", "platform", "channel", "bundle_field", "bundle_id", "type", "_shard");

package/worker/dist/README.md

@@ -1 +1 @@
-This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-06T05:52:53.630Z.
+This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-06T19:12:49.460Z.

package/worker/dist/index.js

@@ -4511,7 +4511,7 @@ var createSqlAdapter = /* @__PURE__ */ __name(({ executor, tablePrefix = "", max
 }, "createSqlAdapter");
 
 // ../../packages/server/dist/package.mjs
-var version = "1.0.0-rc.34";
+var version = "1.0.0-rc.36";
 
 // ../../packages/server/dist/version.mjs
 var HOT_UPDATER_SERVER_VERSION = version;
@@ -9557,8 +9557,13 @@ var isOptional = /* @__PURE__ */ __name((value, key, valid) => !Object.hasOwn(va
 var isString = /* @__PURE__ */ __name((value) => typeof value === "string", "isString");
 var isDatabaseHttpResponse = /* @__PURE__ */ __name((value) => isDatabaseJsonObject(value) && (value.resource === "catalog" || value.resource === "artifact") && isString(value.path) && Number.isSafeInteger(value.status) && (value.body === null || isString(value.body)) && typeof value.body_truncated === "boolean" && Number.isSafeInteger(value.received_at_ms), "isDatabaseHttpResponse");
 var isDatabaseBundleEventFailure = /* @__PURE__ */ __name((value) => isDatabaseJsonObject(value) && isString(value.stage) && isString(value.reason) && isOptional(value, "resource", isString) && isOptional(value, "http_status", (status) => Number.isSafeInteger(status)) && isOptional(value, "transport", isString) && isOptional(value, "origin_code", isString) && isOptional(value, "error_message", isString) && isOptional(value, "error_stack", isString), "isDatabaseBundleEventFailure");
-var isDatabaseBundleEventMetadata = /* @__PURE__ */ __name((value) => isDatabaseJsonObject(value) && typeof value.cohort === "string" && (value.update_strategy === null || value.update_strategy === "fingerprint" || value.update_strategy === "appVersion") && (value.fingerprint_hash === null || typeof value.fingerprint_hash === "string") && (value.sdk_version === null || typeof value.sdk_version === "string") && isOptional(value, "failure", isDatabaseBundleEventFailure) && isOptional(value, "http_response", isDatabaseHttpResponse) && isOptional(value, "delivery", isString) && isOptional(value, "patch_fallback", (flag) => typeof flag === "boolean"), "isDatabaseBundleEventMetadata");
+var isDatabaseBundleEventMetadata = /* @__PURE__ */ __name((value) => isDatabaseJsonObject(value) && typeof value.cohort === "string" && (value.update_strategy === null || value.update_strategy === "fingerprint" || value.update_strategy === "appVersion") && (value.fingerprint_hash === null || typeof value.fingerprint_hash === "string") && (value.sdk_version === null || typeof value.sdk_version === "string") && isOptional(value, "min_bundle_id", isString) && isOptional(value, "failure", isDatabaseBundleEventFailure) && isOptional(value, "http_response", isDatabaseHttpResponse) && isOptional(value, "delivery", isString) && isOptional(value, "patch_fallback", (flag) => typeof flag === "boolean"), "isDatabaseBundleEventMetadata");
 var isRecord5 = /* @__PURE__ */ __name((value) => typeof value === "object" && value !== null && !Array.isArray(value), "isRecord");
+var runningBuiltinBundleId = /* @__PURE__ */ __name((row) => {
+  const running = row.type === "UPDATE_DOWNLOADED" ? row.from_bundle_id : row.to_bundle_id;
+  const builtin = isRecord5(row.metadata) ? row.metadata.min_bundle_id : null;
+  return typeof builtin === "string" && running === builtin ? builtin : null;
+}, "runningBuiltinBundleId");
 var isIdentity = /* @__PURE__ */ __name((value) => typeof value === "string" && value.length > 0 && value.length <= 255, "isIdentity");
 var isTextOrNull2 = /* @__PURE__ */ __name((value) => value === null || typeof value === "string", "isTextOrNull");
 var BUNDLE_EVENT_FIELDS = {
@@ -9836,6 +9841,7 @@ function readEventId(payload) {
   return value;
 }
 __name(readEventId, "readEventId");
+var readMinBundleId = /* @__PURE__ */ __name((value) => typeof value === "string" && value.length > 0 && value.length <= 36 ? value : null, "readMinBundleId");
 var oneOf = /* @__PURE__ */ __name((values, value) => values.includes(value) ? value : "unknown", "oneOf");
 var STAGES = [
   "check",
@@ -9957,6 +9963,7 @@ function requireEvent(payload) {
     cohort: requireStringField(payload, "cohort"),
     fingerprintHash: requireNullableStringField(payload, "fingerprintHash"),
     sdkVersion: payload.sdkVersion === void 0 ? null : requireNullableStringField(payload, "sdkVersion"),
+    minBundleId: readMinBundleId(payload.minBundleId),
     fromReleaseId: requireNullableStringField(payload, "fromReleaseId"),
     toReleaseId: requireNullableStringField(payload, "toReleaseId")
   };
@@ -10043,6 +10050,7 @@ function createBundleEventRow(input) {
     cohort: input.cohort,
     fingerprint_hash: input.fingerprintHash,
     sdk_version: input.sdkVersion ?? null,
+    ...input.minBundleId ? { min_bundle_id: input.minBundleId } : {},
     update_strategy: input.updateStrategy
   };
   switch (input.type) {
@@ -10267,6 +10275,7 @@ var eventDetails = /* @__PURE__ */ __name(({ type, metadata }) => ({
 var toEventHistoryRow = /* @__PURE__ */ __name((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,
@@ -10282,6 +10291,7 @@ var toEventHistoryRow = /* @__PURE__ */ __name((row) => ({
 }), "toEventHistoryRow");
 var toInstallationRow = /* @__PURE__ */ __name((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,
@@ -10775,6 +10785,50 @@ var insightsDistribution = /* @__PURE__ */ __name((retention) => defineAggregate
   },
   retention
 }), "insightsDistribution");
+var insightsBuiltinDistribution = /* @__PURE__ */ __name((retention) => defineAggregate({
+  channel: { type: "string" },
+  platform: {
+    type: "string",
+    maxLength: 16
+  },
+  app_version: { type: "string" },
+  release_id: {
+    type: "string",
+    maxLength: 36
+  },
+  builtin_bundle_id: {
+    type: "string",
+    maxLength: 36
+  },
+  bucket_start_ms: { type: "integer" }
+}, {
+  key: [
+    "channel",
+    "platform",
+    "app_version",
+    "release_id",
+    "builtin_bundle_id",
+    "bucket_start_ms"
+  ],
+  gauges: ["latest_installations"],
+  shards: GAUGE_SHARDS,
+  batched: true,
+  indexes: {
+    byScope: {
+      eq: ["channel", "platform"],
+      sort: ["bucket_start_ms"]
+    },
+    byVersion: {
+      eq: [
+        "channel",
+        "platform",
+        "app_version"
+      ],
+      sort: ["bucket_start_ms"]
+    }
+  },
+  retention
+}), "insightsBuiltinDistribution");
 var insightsLatestByBundle = /* @__PURE__ */ __name((retention) => defineAggregate({
   platform: {
     type: "string",
@@ -10877,6 +10931,7 @@ var createInsightsSchema = /* @__PURE__ */ __name(({ rawDays, dailyDays } = DEFA
     insights_overview_lifetime: lifetimeCounters(),
     insights_sketches_lifetime: lifetimeSketches(),
     insights_distribution: insightsDistribution(daily),
+    insights_builtin_distribution: insightsBuiltinDistribution(daily),
     insights_latest_by_bundle: insightsLatestByBundle(daily),
     insights_outcomes: insightsOutcomes(hourly),
     insights_failures: insightsFailures(hourly)
@@ -10994,12 +11049,13 @@ var insightsIdentity = /* @__PURE__ */ __name((identity) => insightsOverviewId({
 }), "insightsIdentity");
 var gaugeSlot = /* @__PURE__ */ __name((head) => ({
   bucket: dayOf(head.received_at_ms),
-  releaseId: head.type === "UPDATE_DOWNLOADED" ? head.from_release_id : head.to_release_id
+  releaseId: head.type === "UPDATE_DOWNLOADED" ? head.from_release_id : head.to_release_id,
+  builtinBundleId: runningBuiltinBundleId(head)
 }), "gaugeSlot");
 var PAIR_FIELD = "from_to";
 var bundlePairKey = /* @__PURE__ */ __name((from, to) => insightsKey(`${from.length}:${from}${to.length}:${to}`), "bundlePairKey");
 var countHead = /* @__PURE__ */ __name((tx, head, delta) => {
-  const { bucket, releaseId } = gaugeSlot(head);
+  const { bucket, releaseId, builtinBundleId } = gaugeSlot(head);
   const shardBy = head.install_id;
   tx.aggregate("insights_distribution", {
     channel: head.channel,
@@ -11008,6 +11064,14 @@ var countHead = /* @__PURE__ */ __name((tx, head, delta) => {
     release_id: releaseId ?? "",
     bucket_start_ms: bucket
   }, { latest_installations: delta }, { shardBy });
+  if (builtinBundleId !== null) tx.aggregate("insights_builtin_distribution", {
+    channel: head.channel,
+    platform: head.platform,
+    app_version: head.app_version,
+    release_id: releaseId ?? "",
+    builtin_bundle_id: builtinBundleId,
+    bucket_start_ms: bucket
+  }, { latest_installations: delta }, { shardBy });
   for (const field of ["from_bundle_id", "to_bundle_id"]) {
     const bundleId = head[field];
     if (bundleId === null) continue;
@@ -11567,26 +11631,49 @@ var getAppUsage = /* @__PURE__ */ __name(async (db, input, now, retention) => {
     lt: timeRange.end
   };
   const distribution = [];
-  for (const platform of reported) distribution.push(...await drain2((page2) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
-    index: "byScope",
-    where: {
-      channel: input.channel,
-      platform
-    },
-    range,
-    limit: PAGE4,
-    ...page2
-  }) : db.findAggregates("insights_distribution", {
-    index: "byVersion",
-    where: {
-      channel: input.channel,
-      platform,
-      app_version: input.appVersion
-    },
-    range,
-    limit: PAGE4,
-    ...page2
-  })));
+  const builtinDistribution = [];
+  for (const platform of reported) {
+    distribution.push(...await drain2((page2) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
+      index: "byScope",
+      where: {
+        channel: input.channel,
+        platform
+      },
+      range,
+      limit: PAGE4,
+      ...page2
+    }) : db.findAggregates("insights_distribution", {
+      index: "byVersion",
+      where: {
+        channel: input.channel,
+        platform,
+        app_version: input.appVersion
+      },
+      range,
+      limit: PAGE4,
+      ...page2
+    })));
+    builtinDistribution.push(...await drain2((page2) => input.appVersion === void 0 ? db.findAggregates("insights_builtin_distribution", {
+      index: "byScope",
+      where: {
+        channel: input.channel,
+        platform
+      },
+      range,
+      limit: PAGE4,
+      ...page2
+    }) : db.findAggregates("insights_builtin_distribution", {
+      index: "byVersion",
+      where: {
+        channel: input.channel,
+        platform,
+        app_version: input.appVersion
+      },
+      range,
+      limit: PAGE4,
+      ...page2
+    })));
+  }
   const points = [];
   for (let start = timeRange.start; start < timeRange.end; start += intervalMs) points.push({
     startMs: start,
@@ -11595,22 +11682,31 @@ var getAppUsage = /* @__PURE__ */ __name(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 countBundle2 = /* @__PURE__ */ __name((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
     });
+  }, "countBundle");
+  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);
+    countBundle2(row, row.release_id || null, null, count);
+  }
+  for (const row of builtinDistribution) {
+    const releaseId = row.release_id || null;
+    countBundle2(row, releaseId, null, -row.latest_installations);
+    countBundle2(row, releaseId, row.builtin_bundle_id, row.latest_installations);
   }
   const sortedVersions = byInstallations(versions);
   return {