@agent-native/core 0.141.5 → 0.141.7

package/corpus/templates/analytics/app/pages/Agents.tsx

@@ -489,9 +489,6 @@ export default function AgentsPage() {
           </p>
         </div>
         <div className="flex shrink-0 items-center gap-2">
-          <Button variant="outline" size="sm" asChild>
-            <Link to="/catalog">{t("agents.openCatalog")}</Link>
-          </Button>
           {canManageOrg ? (
             <DropdownMenu>
               <DropdownMenuTrigger asChild>

package/corpus/templates/analytics/app/pages/DataSources.tsx

@@ -120,11 +120,19 @@ interface GitHubOAuthStatus {
 
 interface FirstPartyAnalyticsHealthResponse {
   status: "healthy" | "monitor" | "recommend_bigquery" | "unavailable";
+  externalBackendRecommendation?: "none" | "connect" | "use" | "unknown";
   metrics: {
     eventCount: number;
     slowQueryCount24h: number;
     maxQueryDurationMs24h: number;
   };
+  externalBackends?: Array<{
+    id: "bigquery" | "amplitude";
+    label: string;
+    role: "warehouse" | "product-analytics";
+    configured: boolean | null;
+    setupLink: string;
+  }>;
   bigQuery: {
     configured: boolean | null;
   };
@@ -1615,23 +1623,25 @@ function FirstPartyAnalyticsCard() {
   });
   const health = rawHealth as FirstPartyAnalyticsHealthResponse | undefined;
   const healthStatus = isHealthError ? "unavailable" : health?.status;
-  const bigQueryConfigured = health?.bigQuery.configured === true;
-  const healthTitleKey =
-    healthStatus === "recommend_bigquery"
-      ? bigQueryConfigured
-        ? "dataSources.bigQueryConnectedTitle"
-        : "dataSources.bigQueryRecommendationTitle"
-      : null;
-  const healthDescriptionKey =
-    healthStatus === "recommend_bigquery"
-      ? bigQueryConfigured
-        ? "dataSources.bigQueryConnectedDescription"
-        : "dataSources.bigQueryRecommendationDescription"
-      : healthStatus === "monitor"
-        ? "dataSources.bigQueryMonitorDescription"
-        : healthStatus === "healthy"
-          ? "dataSources.bigQueryHealthyDescription"
-          : "dataSources.bigQueryHealthUnavailable";
+  const externalBackends = health?.externalBackends ?? [];
+  const externalBackendConfigured = externalBackends.some(
+    (backend) => backend.configured === true,
+  );
+  const recommendsExternalBackend = healthStatus === "recommend_bigquery";
+  const healthTitleKey = recommendsExternalBackend
+    ? externalBackendConfigured
+      ? "analyticsBackend.connectedTitle"
+      : "analyticsBackend.recommendationTitle"
+    : null;
+  const healthDescriptionKey = recommendsExternalBackend
+    ? externalBackendConfigured
+      ? "analyticsBackend.connectedDescription"
+      : "analyticsBackend.recommendationDescription"
+    : healthStatus === "monitor"
+      ? "analyticsBackend.monitorDescription"
+      : healthStatus === "healthy"
+        ? "analyticsBackend.healthyDescription"
+        : "analyticsBackend.unavailableDescription";
 
   const createKey = useActionMutation("create-analytics-public-key", {
     onSuccess: (result: any) => {
@@ -1681,7 +1691,7 @@ function FirstPartyAnalyticsCard() {
             <div className="flex shrink-0 items-center gap-2">
               {isLoading ? (
                 <Skeleton className="h-4 w-20 rounded-full" />
-              ) : healthStatus === "recommend_bigquery" ? (
+              ) : recommendsExternalBackend ? (
                 <span
                   className="flex min-w-0 items-center gap-1.5 text-xs font-medium text-amber-500"
                   title={healthTitleKey ? t(healthTitleKey) : undefined}
@@ -1690,13 +1700,13 @@ function FirstPartyAnalyticsCard() {
                   <span className="max-w-[12rem] truncate">
                     {healthTitleKey
                       ? t(healthTitleKey)
-                      : t("dataSources.bigQueryRecommendationTitle")}
+                      : t("analyticsBackend.recommendationTitle")}
                   </span>
                 </span>
               ) : connected ? (
                 <span className="flex items-center gap-1.5 text-xs text-emerald-500 font-medium whitespace-nowrap">
                   <IconCheck className="h-3.5 w-3.5" />
-                  {t("dataSources.configured")}
+                  {t("analyticsBackend.configured")}
                 </span>
               ) : (
                 <span className="flex items-center gap-1.5 text-xs text-muted-foreground whitespace-nowrap">
@@ -1722,7 +1732,7 @@ function FirstPartyAnalyticsCard() {
             ) : (
               <div
                 className={`rounded-md border p-3 text-xs ${
-                  healthStatus === "recommend_bigquery"
+                  recommendsExternalBackend
                     ? "border-amber-500/30 bg-amber-500/10"
                     : "border-border/50 bg-muted/20"
                 }`}
@@ -1731,7 +1741,7 @@ function FirstPartyAnalyticsCard() {
                   <div className="flex min-w-0 items-start gap-2">
                     <IconAlertCircle
                       className={`mt-px h-3.5 w-3.5 shrink-0 ${
-                        healthStatus === "recommend_bigquery"
+                        recommendsExternalBackend
                           ? "text-amber-500"
                           : "text-muted-foreground"
                       }`}
@@ -1747,15 +1757,41 @@ function FirstPartyAnalyticsCard() {
                       </p>
                     </div>
                   </div>
-                  {healthStatus === "recommend_bigquery" &&
-                  !bigQueryConfigured ? (
-                    <Button asChild size="sm" className="shrink-0 text-xs">
-                      <Link to="/data-sources?source=bigquery">
-                        {t("dataSources.bigQuerySetup")}
-                      </Link>
-                    </Button>
-                  ) : null}
                 </div>
+                {externalBackends.length > 0 && (
+                  <div className="mt-3 border-t border-border/30 pt-3">
+                    <div className="mb-2 text-muted-foreground">
+                      {t("analyticsBackend.options")}
+                    </div>
+                    <div className="flex flex-wrap gap-2">
+                      {externalBackends.map((backend) => {
+                        const statusLabel =
+                          backend.configured === true
+                            ? t("analyticsBackend.configured")
+                            : backend.configured === false
+                              ? t("analyticsBackend.setUp")
+                              : t("dataSources.statusUnknown");
+                        return (
+                          <Button
+                            asChild
+                            key={backend.id}
+                            size="sm"
+                            variant={
+                              backend.configured === true
+                                ? "outline"
+                                : "default"
+                            }
+                            className="text-xs"
+                          >
+                            <Link to={backend.setupLink}>
+                              {backend.label} · {statusLabel}
+                            </Link>
+                          </Button>
+                        );
+                      })}
+                    </div>
+                  </div>
+                )}
                 {health && healthStatus !== "unavailable" && (
                   <div className="mt-3 grid grid-cols-3 gap-2 border-t border-border/30 pt-3">
                     <div>

package/corpus/templates/analytics/app/pages/Settings.tsx

@@ -41,7 +41,6 @@ import { buildAnalyticsGeneralSettingsSearchEntries } from "./settings/settings-
 
 export default function Settings() {
   const t = useT();
-  const agentSettingsTabs = useAgentSettingsTabs();
   const replayStorageStatus = useReplayStorageStatus();
   const { data: analyticsPrefs, isLoading: analyticsPrefsLoading } =
     useActionQuery<AnalyticsUserPrefs>("get-user-pref", {
@@ -122,6 +121,23 @@ export default function Settings() {
       });
   };
 
+  const agentAdditionalContent = (
+    <SettingsRow
+      id="bell-sound"
+      label={t("settings.bellSound")}
+      description={t("settings.bellSoundDescription")}
+      control={
+        <Switch
+          aria-label={t("settings.bellSound")}
+          checked={bellSoundEnabled}
+          disabled={analyticsPrefsLoading || saveAnalyticsPrefs.isPending}
+          onCheckedChange={saveBellSoundPreference}
+        />
+      }
+    />
+  );
+  const agentSettingsTabs = useAgentSettingsTabs({ agentAdditionalContent });
+
   const extraTabs = useMemo<SettingsTabItem[]>(
     () => [
       {
@@ -130,7 +146,7 @@ export default function Settings() {
         icon: IconBell,
         keywords: "alerts rules notifications thresholds triggers monitoring",
         content: (
-          <div className="mx-auto w-full max-w-5xl">
+          <div className="w-full">
             <AlertRulesSettingsCard />
           </div>
         ),
@@ -157,7 +173,7 @@ export default function Settings() {
       extraTabs={extraTabs}
       generalSearchEntries={generalSearchEntries}
       general={
-        <div className="mx-auto w-full max-w-2xl space-y-6">
+        <div className="w-full space-y-6">
           <SettingsGroup className="bg-card border-border/50">
             <SettingsRow
               id="credentials"
@@ -171,18 +187,6 @@ export default function Settings() {
                 </Button>
               }
             />
-            <SettingsRow
-              id="dashboard-templates"
-              label={t("settings.dashboardTemplates")}
-              description={t("settings.dashboardTemplatesDescription")}
-              control={
-                <Button variant="outline" size="sm" asChild>
-                  <Link to="/catalog">
-                    {t("settings.openDashboardTemplates")}
-                  </Link>
-                </Button>
-              }
-            />
             <SettingsRow
               id="language"
               label={t("settings.languageTitle")}
@@ -207,21 +211,6 @@ export default function Settings() {
                 />
               }
             />
-            <SettingsRow
-              id="bell-sound"
-              label={t("settings.bellSound")}
-              description={t("settings.bellSoundDescription")}
-              control={
-                <Switch
-                  aria-label={t("settings.bellSound")}
-                  checked={bellSoundEnabled}
-                  disabled={
-                    analyticsPrefsLoading || saveAnalyticsPrefs.isPending
-                  }
-                  onCheckedChange={saveBellSoundPreference}
-                />
-              }
-            />
           </SettingsGroup>
 
           {replayStorageStatus.data?.configured ? (
@@ -242,29 +231,19 @@ export default function Settings() {
               </CardContent>
             </Card>
           ) : null}
-
-          <Card id="about" className="bg-card border-border/50 scroll-mt-16">
-            <CardHeader>
-              <CardTitle className="text-base">{t("settings.about")}</CardTitle>
-            </CardHeader>
-            <CardContent className="space-y-2 text-sm text-muted-foreground">
-              <p>{t("settings.aboutDescription")}</p>
-              <p>{t("settings.aboutUsage")}</p>
-            </CardContent>
-          </Card>
         </div>
       }
       team={
-        <div className="mx-auto w-full max-w-5xl">
+        <div className="w-full">
           <TeamPage
             showTitle={false}
             createOrgDescription="Set up a team to share dashboards and data sources with your colleagues."
-            className="max-w-5xl"
+            className="w-full"
           />
         </div>
       }
       whatsNew={
-        <div className="mx-auto w-full max-w-2xl">
+        <div className="w-full">
           <ChangelogSettingsCard markdown={changelog} />
         </div>
       }

package/corpus/templates/analytics/app/pages/settings/settings-search.ts

@@ -2,6 +2,7 @@ import {
   getAgentSettingsSearchTabs,
   type SettingsSearchEntry,
 } from "@agent-native/core/client/settings";
+import { buildSettingsRoute } from "@agent-native/core/navigation";
 
 interface SettingsCommandItem {
   id: string;
@@ -12,6 +13,20 @@ interface SettingsCommandItem {
 
 type Translate = (key: string) => string;
 
+function buildSettingsEntryRoute(tabId: string, section?: string): string {
+  const normalizedSection = section?.replace(/^#/, "").trim();
+  if (!normalizedSection || normalizedSection === tabId) {
+    return buildSettingsRoute(tabId);
+  }
+  if (normalizedSection.startsWith("agent:")) {
+    return buildSettingsRoute(normalizedSection);
+  }
+  if (normalizedSection.startsWith(`${tabId}:`)) {
+    return buildSettingsRoute(normalizedSection);
+  }
+  return buildSettingsRoute(`${tabId}:${normalizedSection}`);
+}
+
 export function buildAnalyticsGeneralSettingsSearchEntries(
   t: Translate,
   replayStorageConfigured: boolean,
@@ -21,6 +36,7 @@ export function buildAnalyticsGeneralSettingsSearchEntries(
       id: "analytics-account",
       label: t("settings.account"),
       keywords: "profile photo avatar email signed in identity",
+      tabId: "account",
       hash: "account",
     },
     {
@@ -29,12 +45,6 @@ export function buildAnalyticsGeneralSettingsSearchEntries(
       keywords: "data sources api keys manage credentials",
       hash: "credentials",
     },
-    {
-      id: "analytics-dashboard-templates",
-      label: t("settings.dashboardTemplates"),
-      keywords: "templates catalog dashboards",
-      hash: "dashboard-templates",
-    },
     ...(replayStorageConfigured
       ? [
           {
@@ -57,18 +67,6 @@ export function buildAnalyticsGeneralSettingsSearchEntries(
       keywords: "email notifications errors alerts javascript monitoring",
       hash: "error-email-notifications",
     },
-    {
-      id: "analytics-bell-sound",
-      label: t("settings.bellSound"),
-      keywords: "sound audio ding agent completion notification",
-      hash: "bell-sound",
-    },
-    {
-      id: "analytics-about",
-      label: t("settings.about"),
-      keywords: "about version info usage",
-      hash: "about",
-    },
   ];
 }
 
@@ -118,18 +116,23 @@ export function buildAnalyticsSettingsCommandItems(
   };
 
   for (const tab of tabs) {
+    const entryHref = (entry: SettingsSearchEntry, tabId: string) => {
+      const hash = entry.hash?.replace(/^#/, "");
+      return buildSettingsEntryRoute(tabId, hash);
+    };
     add({
       id: `tab:${tab.id}`,
       label: tab.label,
       keywords: `${tab.keywords} settings`,
-      href: `/settings#${tab.id}`,
+      href: buildSettingsRoute(tab.id),
     });
     for (const entry of tab.searchEntries ?? []) {
+      const tabId = entry.tabId ?? tab.id;
       add({
         id: entry.id,
         label: entry.label,
         keywords: `${entry.keywords ?? ""} ${entry.description ?? ""} ${tab.label} settings`,
-        href: `/settings#${entry.hash ?? entry.tabId ?? tab.id}`,
+        href: entryHref(entry, tabId),
       });
     }
   }

package/corpus/templates/analytics/app/routes/extensions._index.tsx

@@ -7,5 +7,5 @@ export function meta() {
 }
 
 export default function ExtensionsRoute() {
-  return <Navigate to="/settings#extensions" replace />;
+  return <Navigate to="/settings/extensions" replace />;
 }

package/corpus/templates/analytics/app/routes/settings.$.tsx

@@ -0,0 +1 @@
+export { default, meta } from "./settings.js";

package/corpus/templates/analytics/app/routes/team.tsx

@@ -7,5 +7,5 @@ export function meta() {
 }
 
 export default function TeamRoute() {
-  return <Navigate to="/settings#organization" replace />;
+  return <Navigate to="/settings/organization" replace />;
 }

package/corpus/templates/analytics/changelog/2026-08-05-historical-analytics-rollups-now-repair-automatically-after-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-05
+---
+
+Historical Analytics rollups now repair automatically after an upgrade

package/corpus/templates/analytics/changelog/2026-08-05-settings-no-longer-includes-an-unnecessary-about-section.md

@@ -0,0 +1,6 @@
+---
+type: removed
+date: 2026-08-05
+---
+
+Settings no longer includes an unnecessary About section.

package/corpus/templates/analytics/docs/schemas/first-party-analytics.md

@@ -173,7 +173,7 @@ Agent Native observability panels belong in the canonical Agent Native dashboard
 (`agent-native-templates-first-party`), including generation metrics, explicit
 feedback sentiment, optional inferred message sentiment, and separate
 by-main-model breakdowns. Do not publish or install a separate observability
-dashboard template.
+dashboard.
 
 Example dashboard panel:
 

package/corpus/templates/analytics/netlify.toml

@@ -34,3 +34,7 @@ timeout = 120
 
 [functions.uptime-monitor-sweep-background]
 timeout = 120
+
+[functions.analytics-rollup-backfill-background]
+timeout = 300
+memory = "2gb"

package/corpus/templates/analytics/scripts/emit-netlify-dashboard-report-cron.ts

@@ -22,6 +22,10 @@ const UPTIME_SCHEDULED_NAME = "uptime-monitor-cron";
 const UPTIME_WORKER_NAME = "uptime-monitor-sweep-background";
 const UPTIME_ROUTE_PATH = "/api/uptime-monitors/run";
 const UPTIME_SCHEDULE = "* * * * *";
+const ROLLUP_SCHEDULED_NAME = "analytics-rollup-backfill-cron";
+const ROLLUP_WORKER_NAME = "analytics-rollup-backfill-background";
+const ROLLUP_ROUTE_PATH = "/api/analytics-rollups/backfill";
+const ROLLUP_SCHEDULE = "*/15 * * * *";
 
 function ensureDir(dir: string) {
   mkdirSync(dir, { recursive: true });
@@ -388,6 +392,105 @@ export const config = {
   writeFileSync(path.join(dest, `${UPTIME_WORKER_NAME}.mjs`), source);
 }
 
+function emitRollupScheduledTrigger(token: string) {
+  const dest = path.join(FUNCTIONS_DIR, ROLLUP_SCHEDULED_NAME);
+  rmSync(dest, { recursive: true, force: true });
+  ensureDir(dest);
+
+  const source = `const WORKER_PATH = "/.netlify/functions/${ROLLUP_WORKER_NAME}";
+const CRON_TOKEN = ${JSON.stringify(token)};
+
+function siteOrigin(request) {
+  const configured = process.env.URL || process.env.DEPLOY_URL;
+  if (configured) return configured;
+  const url = new URL(request.url);
+  return url.origin;
+}
+
+export default async function handler(request) {
+  const url = new URL(WORKER_PATH, siteOrigin(request));
+  const response = await fetch(url.toString(), {
+    method: "POST",
+    headers: {
+      "content-type": "application/json",
+      "x-agent-native-analytics-rollup-cron": CRON_TOKEN,
+    },
+    body: JSON.stringify({ scheduled: true }),
+  });
+
+  if (!response.ok && response.status !== 202) {
+    console.error(
+      "[analytics-rollup-backfill-cron] Background backfill trigger failed:",
+      response.status,
+    );
+  }
+}
+
+export const config = {
+  name: "analytics rollup backfill cron trigger",
+  generator: "agent-native analytics build",
+  schedule: ${JSON.stringify(ROLLUP_SCHEDULE)},
+};
+`;
+
+  writeFileSync(path.join(dest, `${ROLLUP_SCHEDULED_NAME}.mjs`), source);
+}
+
+function emitRollupBackgroundWorker(token: string) {
+  const dest = path.join(FUNCTIONS_DIR, ROLLUP_WORKER_NAME);
+  rmSync(dest, { recursive: true, force: true });
+  cloneServerBundleForFunction(SERVER_DIR, dest);
+  rmSync(path.join(dest, "server.mjs"), { force: true });
+
+  const source = `globalThis.__AGENT_NATIVE_BACKGROUND_RUNTIME__ = true;
+globalThis.__AGENT_NATIVE_ANALYTICS_ROLLUP_BACKFILL_SCHEDULED_RUNTIME__ = true;
+
+const CRON_TOKEN = ${JSON.stringify(token)};
+const ROUTE_PATH = ${JSON.stringify(ROLLUP_ROUTE_PATH)};
+let cachedHandler;
+
+function timingSafeEquals(a, b) {
+  if (a.length !== b.length) return false;
+  let diff = 0;
+  for (let i = 0; i < a.length; i += 1) {
+    diff |= a.charCodeAt(i) ^ b.charCodeAt(i);
+  }
+  return diff === 0;
+}
+
+export default async function handler(request, context) {
+  const token = request.headers.get("x-agent-native-analytics-rollup-cron") || "";
+  if (!timingSafeEquals(token, CRON_TOKEN)) {
+    return new Response("Unauthorized", { status: 401 });
+  }
+
+  cachedHandler ??= (await import("./main.mjs")).default;
+  const url = new URL(request.url);
+  url.pathname = ROUTE_PATH;
+  url.search = "";
+
+  const rewritten = new Request(url.toString(), {
+    method: "POST",
+    headers: new Headers({ "content-type": "application/json" }),
+    body: JSON.stringify({ scheduled: true }),
+  });
+
+  return await cachedHandler(rewritten, context);
+}
+
+export const config = {
+  name: "analytics rollup backfill background sweep",
+  generator: "agent-native analytics build",
+  background: true,
+  nodeBundler: "none",
+  includedFiles: ["**"],
+  preferStatic: false,
+};
+`;
+
+  writeFileSync(path.join(dest, `${ROLLUP_WORKER_NAME}.mjs`), source);
+}
+
 function isDirectRun(): boolean {
   const entrypoint = process.argv[1];
   return Boolean(
@@ -407,12 +510,15 @@ function main(): void {
   const token = randomBytes(32).toString("hex");
   const alertToken = randomBytes(32).toString("hex");
   const uptimeToken = randomBytes(32).toString("hex");
+  const rollupToken = randomBytes(32).toString("hex");
   emitScheduledTrigger(token);
   emitBackgroundWorker(token);
   emitAlertScheduledTrigger(alertToken);
   emitAlertBackgroundWorker(alertToken);
   emitUptimeScheduledTrigger(uptimeToken);
   emitUptimeBackgroundWorker(uptimeToken);
+  emitRollupScheduledTrigger(rollupToken);
+  emitRollupBackgroundWorker(rollupToken);
   console.log(
     `[dashboard-report-cron] Emitted Netlify scheduled trigger "${SCHEDULED_NAME}" (${SCHEDULE}) and background worker "${WORKER_NAME}".`,
   );
@@ -422,6 +528,9 @@ function main(): void {
   console.log(
     `[uptime-monitor-cron] Emitted Netlify scheduled trigger "${UPTIME_SCHEDULED_NAME}" (${UPTIME_SCHEDULE}) and background worker "${UPTIME_WORKER_NAME}".`,
   );
+  console.log(
+    `[analytics-rollup-backfill-cron] Emitted Netlify scheduled trigger "${ROLLUP_SCHEDULED_NAME}" (${ROLLUP_SCHEDULE}) and background worker "${ROLLUP_WORKER_NAME}".`,
+  );
 }
 
 if (isDirectRun()) {

package/corpus/templates/analytics/scripts/first-party-analytics-bigquery.sql

@@ -0,0 +1,104 @@
+-- Builder.io production first-party Analytics warehouse.
+-- Run this once with the authenticated Builder Google Cloud account:
+--   bq query --use_legacy_sql=false < templates/analytics/scripts/first-party-analytics-bigquery.sql
+--
+-- The raw table is append-only. The query view removes retry duplicates by the
+-- stable Postgres event id, and the two aggregate views preserve the existing
+-- dashboard SQL names without writing rollups back to Neon.
+
+CREATE SCHEMA IF NOT EXISTS `builder-3b0a2.analytics`
+OPTIONS (location = "US");
+
+CREATE TABLE IF NOT EXISTS `builder-3b0a2.analytics.first_party_analytics_events_raw` (
+  id STRING NOT NULL,
+  public_key_id STRING,
+  event_name STRING NOT NULL,
+  user_id STRING,
+  anonymous_id STRING,
+  user_key STRING,
+  session_id STRING,
+  timestamp TIMESTAMP NOT NULL,
+  event_date DATE,
+  received_at TIMESTAMP NOT NULL,
+  url STRING,
+  path STRING,
+  hostname STRING,
+  referrer STRING,
+  app STRING,
+  template STRING,
+  signed_in STRING,
+  properties STRING NOT NULL,
+  context STRING NOT NULL,
+  owner_email STRING NOT NULL,
+  org_id STRING
+)
+PARTITION BY event_date
+CLUSTER BY owner_email, org_id, event_name, app;
+
+CREATE OR REPLACE VIEW `builder-3b0a2.analytics.first_party_analytics_events_raw_query` AS
+SELECT * EXCEPT (_row_number)
+FROM (
+  SELECT
+    raw.*,
+    ROW_NUMBER() OVER (PARTITION BY id ORDER BY received_at DESC) AS _row_number
+  FROM `builder-3b0a2.analytics.first_party_analytics_events_raw` AS raw
+)
+WHERE _row_number = 1;
+
+CREATE OR REPLACE VIEW `builder-3b0a2.analytics.first_party_analytics_events_raw_daily_rollups` AS
+WITH tenant_events AS (
+  SELECT
+    CASE
+      WHEN org_id IS NOT NULL AND org_id <> '' THEN CONCAT('org:', org_id)
+      ELSE CONCAT('user:', owner_email)
+    END AS tenant_key,
+    owner_email,
+    org_id,
+    event_date,
+    event_name,
+    COALESCE(app, '') AS app,
+    COALESCE(template, '') AS template
+  FROM `builder-3b0a2.analytics.first_party_analytics_events_raw_query`
+  WHERE event_date IS NOT NULL
+)
+SELECT
+  TO_HEX(SHA256(CONCAT(
+    tenant_key, '|', CAST(event_date AS STRING), '|', event_name, '|', app,
+    '|', template
+  ))) AS id,
+  tenant_key,
+  ANY_VALUE(owner_email) AS owner_email,
+  ANY_VALUE(org_id) AS org_id,
+  event_date,
+  event_name,
+  app,
+  template,
+  COUNT(*) AS event_count
+FROM tenant_events
+GROUP BY tenant_key, event_date, event_name, app, template;
+
+CREATE OR REPLACE VIEW `builder-3b0a2.analytics.first_party_analytics_events_raw_user_days` AS
+WITH tenant_user_days AS (
+  SELECT
+    CASE
+      WHEN org_id IS NOT NULL AND org_id <> '' THEN CONCAT('org:', org_id)
+      ELSE CONCAT('user:', owner_email)
+    END AS tenant_key,
+    owner_email,
+    org_id,
+    event_date,
+    user_key
+  FROM `builder-3b0a2.analytics.first_party_analytics_events_raw_query`
+  WHERE event_date IS NOT NULL AND user_key IS NOT NULL AND user_key <> ''
+)
+SELECT
+  TO_HEX(SHA256(CONCAT(
+    tenant_key, '|', CAST(event_date AS STRING), '|', user_key
+  ))) AS id,
+  tenant_key,
+  ANY_VALUE(owner_email) AS owner_email,
+  ANY_VALUE(org_id) AS org_id,
+  event_date,
+  user_key
+FROM tenant_user_days
+GROUP BY tenant_key, event_date, user_key;