@agent-native/core 0.175.4 → 0.175.5-nightly-20260827014436

package/corpus/templates/analytics/actions/get-explorer-dashboard.ts

@@ -34,6 +34,7 @@ export default defineAction({
       orgId: dash.orgId,
       visibility: dash.visibility,
       createdAt: dash.createdAt,
+      createdBy: dash.createdBy,
       updatedAt: dash.updatedAt,
       updatedBy: dash.updatedBy,
       role: dash.role,

package/corpus/templates/analytics/app/components/auth/AuthProvider.tsx

@@ -1,5 +1,8 @@
-import { agentNativePath } from "@agent-native/core/client/api-path";
-import { useSession, type AuthSession } from "@agent-native/core/client/hooks";
+import {
+  signOut,
+  useSession,
+  type AuthSession,
+} from "@agent-native/core/client/hooks";
 import { createContext, useContext, type ReactNode } from "react";
 
 interface AuthContextValue {
@@ -16,10 +19,9 @@ export function AuthProvider({ children }: { children: ReactNode }) {
   const value: AuthContextValue = {
     auth: session,
     isLoading,
-    logout: () =>
-      fetch(agentNativePath("/_agent-native/auth/logout"), {
-        method: "POST",
-      }).then(() => location.reload()),
+    logout: () => {
+      void signOut();
+    },
   };
 
   return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;

package/corpus/templates/analytics/app/components/dashboard/SqlChart.tsx

@@ -628,6 +628,23 @@ function numericTooltipValue(value: unknown): number {
   return Number.isFinite(numeric) ? numeric : Number.NEGATIVE_INFINITY;
 }
 
+function sumTooltipPayloadValues(
+  items: Array<{ value?: unknown }>,
+): number | null {
+  let total = 0;
+  let hasNumericValue = false;
+
+  for (const item of items) {
+    const numeric =
+      typeof item.value === "number" ? item.value : Number(item.value);
+    if (!Number.isFinite(numeric)) continue;
+    hasNumericValue = true;
+    total += numeric;
+  }
+
+  return hasNumericValue ? total : null;
+}
+
 function tooltipItemName(item: {
   dataKey?: string | number;
   name?: string | number;
@@ -1072,6 +1089,7 @@ export function ChartTooltip({
   labelFormatter,
   seriesNameFormatter,
   valueFormatter,
+  stacked,
 }: {
   active?: boolean;
   payload?: Array<{
@@ -1085,6 +1103,7 @@ export function ChartTooltip({
   labelFormatter?: (value: string) => string;
   seriesNameFormatter?: (value: string) => string;
   valueFormatter?: (value: number, name?: string | number) => string;
+  stacked?: boolean;
 }) {
   const items = useMemo(
     () =>
@@ -1099,6 +1118,13 @@ export function ChartTooltip({
     isVisible,
     coordinate,
   );
+  const stackedTotal = stacked ? sumTooltipPayloadValues(items) : null;
+  const totalValue =
+    stackedTotal != null && valueFormatter
+      ? valueFormatter(stackedTotal, items[0]?.name)
+      : stackedTotal != null
+        ? String(stackedTotal)
+        : null;
 
   const labelText =
     label == null
@@ -1116,6 +1142,9 @@ export function ChartTooltip({
       className="fixed min-w-40 max-w-[280px] rounded-md border border-border bg-card px-3 py-2 text-xs text-foreground shadow-lg pointer-events-none"
       style={{ zIndex: CHART_TOOLTIP_Z_INDEX }}
     >
+      {totalValue && (
+        <div className="mb-1.5 font-semibold text-foreground">{totalValue}</div>
+      )}
       {labelText && (
         <div className="mb-1.5 truncate font-medium text-foreground">
           {labelText}
@@ -2223,6 +2252,7 @@ function BarRenderer({
                   labelFormatter={xLabelFormatter}
                   seriesNameFormatter={seriesNameFormatter}
                   valueFormatter={valueFormatter}
+                  stacked={stacked}
                 />
               }
               itemSorter={(item) => -(Number(item.value) || 0)}
@@ -2333,6 +2363,7 @@ function TimeSeriesRenderer({
                     labelFormatter={xLabelFormatter}
                     seriesNameFormatter={seriesNameFormatter}
                     valueFormatter={valueFormatter}
+                    stacked={stacked}
                   />
                 }
                 itemSorter={(item) => -(Number(item.value) || 0)}
@@ -2440,6 +2471,7 @@ function TimeSeriesRenderer({
                   labelFormatter={xLabelFormatter}
                   seriesNameFormatter={seriesNameFormatter}
                   valueFormatter={valueFormatter}
+                  stacked={stacked}
                 />
               }
               itemSorter={(item) => -(Number(item.value) || 0)}

package/corpus/templates/analytics/app/components/layout/Layout.tsx

@@ -84,7 +84,7 @@ function InteractiveLayout({ children }: LayoutProps) {
         "Answers:",
         formattedAnswers,
         "",
-        "Use these answers to choose the dashboard scope, data source, metrics, breakdowns, and layout. For dashboards, consult the data dictionary before writing SQL and only ask another question if a required source/table/metric is still genuinely ambiguous.",
+        "Use these answers to choose the dashboard scope, data source, metrics, breakdowns, and layout. For dashboards, consult the data dictionary before writing SQL.",
       ].join("\n"),
     buildSkipContext: () =>
       "The user skipped the guided analytics questions. Proceed with reasonable defaults, consult the data dictionary before writing SQL, and ask again only if a required source/table/metric is still genuinely ambiguous.",

package/corpus/templates/analytics/app/components/layout/Sidebar.tsx

@@ -148,7 +148,9 @@ import { useUserPref } from "@/hooks/use-user-pref";
 import { shouldRenderDashboardList } from "@/lib/dashboard-list-loading";
 import { usePopularity, popularityOf } from "@/lib/item-popularity";
 import {
+  DASHBOARD_SESSION_LOADING_SCOPE,
   dashboardCacheScope,
+  preserveScopedDashboardPlaceholder,
   sqlDashboardPrefetchKey,
   type PrefetchSnapshot,
 } from "@/lib/prefetch-keys";
@@ -162,6 +164,8 @@ import { SidebarLoadError } from "./SidebarLoadError";
 const SIDEBAR_PREVIEW_COUNT = 5;
 const ASK_OPEN_KEY = "analytics-sidebar-ask-open";
 const DASHBOARD_SORT_MODE_KEY = "dashboard-sort-mode";
+const DASHBOARD_VISIBILITY_FILTER_KEY =
+  "analytics-sidebar-dashboard-visibility";
 const DASHBOARDS_OPEN_KEY = "analytics-sidebar-dashboards-open";
 const SIDEBAR_COLLAPSE_KEY = "analytics.sidebar.collapsed";
 const SIDEBAR_SKELETON_CLASS =
@@ -231,6 +235,35 @@ function setStoredSortMode(key: string, value: SidebarSortMode): void {
   }
 }
 
+export function getStoredVisibilityFilter(
+  key: string,
+): SidebarVisibilityFilter {
+  if (typeof window === "undefined") return "all";
+  try {
+    const raw = window.localStorage.getItem(key);
+    if (raw === "all" || raw === "private" || raw === "shared") {
+      return raw;
+    }
+  } catch {
+    // coercion-ok: localStorage is optional; in-memory filter state remains authoritative.
+    // localStorage unavailable; visibility filter is best-effort.
+  }
+  return "all";
+}
+
+export function setStoredVisibilityFilter(
+  key: string,
+  value: SidebarVisibilityFilter,
+): void {
+  if (typeof window === "undefined") return;
+  try {
+    window.localStorage.setItem(key, value);
+  } catch {
+    // coercion-ok: localStorage is optional; in-memory filter state remains authoritative.
+    // localStorage unavailable; visibility filter is best-effort.
+  }
+}
+
 function sortByName<T extends { id: string; name: string }>(items: T[]): T[] {
   return [...items].sort((a, b) => {
     const name = a.name.localeCompare(b.name);
@@ -516,6 +549,7 @@ function SortableRow({
     useState(false);
   const [isRenaming, setIsRenaming] = useState(false);
   const [renameValue, setRenameValue] = useState(name);
+  const pendingRenameRef = useRef(false);
   const renameInputRef = useAutoFocusSelect<HTMLInputElement>(isRenaming);
 
   useEffect(() => {
@@ -749,11 +783,22 @@ function SortableRow({
                 {t("sidebar.itemActions", { name })}
               </TooltipContent>
             </Tooltip>
-            <DropdownMenuContent side="right" align="start" className="w-44">
+            <DropdownMenuContent
+              side="right"
+              align="start"
+              className="w-44"
+              onCloseAutoFocus={(event) => {
+                if (!pendingRenameRef.current) return;
+                event.preventDefault();
+                pendingRenameRef.current = false;
+                setIsRenaming(true);
+              }}
+            >
               <DropdownMenuItem
                 onSelect={() => {
                   setRenameValue(name);
-                  setIsRenaming(true);
+                  pendingRenameRef.current = true;
+                  setMenuOpen(false);
                 }}
               >
                 <IconPencil className="me-2 h-3.5 w-3.5" />
@@ -1513,8 +1558,10 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
   const t = useT();
   const queryClient = useQueryClient();
   const { setTheme } = useTheme();
-  const { auth } = useAuth();
-  const dashboardScope = dashboardCacheScope(auth);
+  const { auth, isLoading: authLoading } = useAuth();
+  const dashboardScope = authLoading
+    ? DASHBOARD_SESSION_LOADING_SCOPE
+    : dashboardCacheScope(auth);
 
   const isAskRoute = location.pathname === "/ask";
   const activeDashboardId = useMemo(() => {
@@ -1536,8 +1583,9 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
       activeDashboardId !== null,
   );
   const [dashShowAll, setDashShowAll] = useState(false);
-  const [dashFilter, setDashFilter] =
-    useState<SidebarVisibilityFilter>("private");
+  const [dashFilter, setDashFilter] = useState<SidebarVisibilityFilter>(() =>
+    getStoredVisibilityFilter(DASHBOARD_VISIBILITY_FILTER_KEY),
+  );
   const [dashboardSortMode, setDashboardSortModeState] =
     useState<SidebarSortMode>(() => getStoredSortMode(DASHBOARD_SORT_MODE_KEY));
   const { data: popularity, isReady: popularityReady } = usePopularity();
@@ -1630,6 +1678,14 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
     setDashboardSortModeState(mode);
   }, []);
 
+  const setDashboardVisibilityFilter = useCallback(
+    (value: SidebarVisibilityFilter) => {
+      setStoredVisibilityFilter(DASHBOARD_VISIBILITY_FILTER_KEY, value);
+      setDashFilter(value);
+    },
+    [],
+  );
+
   useEffect(() => {
     if (getStoredBooleanPreference(ASK_OPEN_KEY) === null) {
       setAskOpen(isAskRoute);
@@ -1700,7 +1756,10 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
   } = useQuery({
     queryKey: ["sql-dashboards-sidebar", dashboardScope, dashboardsSync],
     queryFn: () => fetchSqlDashboards(t),
+    enabled: !authLoading,
     staleTime: 30_000,
+    placeholderData: (prev, previousQuery) =>
+      preserveScopedDashboardPlaceholder(prev, previousQuery, dashboardScope),
   });
 
   const {
@@ -2464,7 +2523,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
                     sortMode={dashboardSortMode}
                     onSortModeChange={setDashboardSortMode}
                     visibilityFilter={dashFilter}
-                    onVisibilityFilterChange={setDashFilter}
+                    onVisibilityFilterChange={setDashboardVisibilityFilter}
                   />
                   <button
                     type="button"

package/corpus/templates/analytics/app/lib/prefetch-keys.ts

@@ -9,6 +9,8 @@ export type DashboardCacheSession = {
   orgId?: string | null;
 };
 
+export const DASHBOARD_SESSION_LOADING_SCOPE = "session-loading";
+
 /**
  * Dashboard payloads are access-scoped. Keep the principal and active org in
  * every client cache key so a session change cannot adopt another caller's
@@ -22,6 +24,14 @@ export function dashboardCacheScope(
   return `${encodeURIComponent(principal)}:${encodeURIComponent(org)}`;
 }
 
+export function preserveScopedDashboardPlaceholder<T>(
+  previous: T | undefined,
+  previousQuery: { queryKey: readonly unknown[] } | undefined,
+  scope: string,
+): T | undefined {
+  return previousQuery?.queryKey[1] === scope ? previous : undefined;
+}
+
 export const sqlDashboardPrefetchKey = (
   id: string,
   scope = "anonymous:personal",

package/corpus/templates/analytics/app/pages/adhoc/explorer-dashboard/index.tsx

@@ -118,8 +118,8 @@ const TAB_ID = generateTabId();
 
 type FetchedExplorerDashboard = {
   data: ExplorerDashboardData;
-  ownerEmail: string | null;
   createdAt: string | null;
+  createdBy: string | null;
   updatedAt: string | null;
   updatedBy: string | null;
   archivedAt: string | null;
@@ -152,8 +152,8 @@ async function fetchDashboard(
       name: raw.name ?? "Untitled Dashboard",
       charts: raw.charts ?? [],
     },
-    ownerEmail: typeof raw.ownerEmail === "string" ? raw.ownerEmail : null,
     createdAt: typeof raw.createdAt === "string" ? raw.createdAt : null,
+    createdBy: typeof raw.createdBy === "string" ? raw.createdBy : null,
     updatedAt: typeof raw.updatedAt === "string" ? raw.updatedAt : null,
     updatedBy: typeof raw.updatedBy === "string" ? raw.updatedBy : null,
     archivedAt: typeof raw.archivedAt === "string" ? raw.archivedAt : null,
@@ -189,7 +189,9 @@ export default function ExplorerDashboardPage() {
   const [dashboard, setDashboard] = useState<ExplorerDashboardData | null>(
     null,
   );
-  const [dashboardOwner, setDashboardOwner] = useState<string | null>(null);
+  const [dashboardCreatedBy, setDashboardCreatedBy] = useState<string | null>(
+    null,
+  );
   const [dashboardCreatedAt, setDashboardCreatedAt] = useState<string | null>(
     null,
   );
@@ -345,7 +347,7 @@ export default function ExplorerDashboardPage() {
     if (!dashboardId) return;
     setLoaded(false);
     setDashboard(null);
-    setDashboardOwner(null);
+    setDashboardCreatedBy(null);
     setDashboardCreatedAt(null);
     setDashboardUpdatedAt(null);
     setDashboardUpdatedBy(null);
@@ -360,7 +362,7 @@ export default function ExplorerDashboardPage() {
     const d = dashboardQuery.data;
     if (d) {
       setDashboard(d.data);
-      setDashboardOwner(d.ownerEmail);
+      setDashboardCreatedBy(d.createdBy);
       setDashboardCreatedAt(d.createdAt);
       setDashboardUpdatedAt(d.updatedAt);
       setDashboardUpdatedBy(d.updatedBy);
@@ -377,7 +379,7 @@ export default function ExplorerDashboardPage() {
         name: t("explorerDashboard.untitledDashboard"),
         charts: [],
       });
-      setDashboardOwner(null);
+      setDashboardCreatedBy(null);
       setDashboardCreatedAt(null);
       setDashboardUpdatedAt(null);
       setDashboardUpdatedBy(null);
@@ -701,7 +703,7 @@ export default function ExplorerDashboardPage() {
                     <DropdownMenuLabel className="font-normal">
                       <DashboardMetadata
                         createdAt={dashboardCreatedAt}
-                        createdBy={dashboardOwner}
+                        createdBy={dashboardCreatedBy}
                         updatedAt={dashboardUpdatedAt}
                         updatedBy={dashboardUpdatedBy}
                       />

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/index.tsx

@@ -407,8 +407,8 @@ type FetchedDashboard = {
   hiddenAt: string | null;
   hiddenBy: string | null;
   visibility: "private" | "org" | "public";
-  ownerEmail: string | null;
   createdAt: string | null;
+  createdBy: string | null;
   updatedAt: string | null;
   updatedBy: string | null;
 } & ResourceAccess;
@@ -494,8 +494,8 @@ async function fetchDashboard(
         data.visibility === "org" || data.visibility === "public"
           ? data.visibility
           : "private",
-      ownerEmail: typeof data.ownerEmail === "string" ? data.ownerEmail : null,
       createdAt: typeof data.createdAt === "string" ? data.createdAt : null,
+      createdBy: typeof data.createdBy === "string" ? data.createdBy : null,
       updatedAt: typeof data.updatedAt === "string" ? data.updatedAt : null,
       updatedBy: typeof data.updatedBy === "string" ? data.updatedBy : null,
       role: typeof data.role === "string" ? data.role : undefined,
@@ -584,7 +584,9 @@ function SqlDashboardPageContent({
   const [dashboardVisibility, setDashboardVisibility] = useState<
     "private" | "org" | "public" | null
   >(null);
-  const [dashboardOwner, setDashboardOwner] = useState<string | null>(null);
+  const [dashboardCreatedBy, setDashboardCreatedBy] = useState<string | null>(
+    null,
+  );
   const [dashboardCreatedAt, setDashboardCreatedAt] = useState<string | null>(
     null,
   );
@@ -875,7 +877,7 @@ function SqlDashboardPageContent({
     setArchivedAt(null);
     setHiddenAt(null);
     setDashboardVisibility(null);
-    setDashboardOwner(null);
+    setDashboardCreatedBy(null);
     setDashboardCreatedAt(null);
     setDashboardUpdatedAt(null);
     setDashboardUpdatedBy(null);
@@ -922,7 +924,7 @@ function SqlDashboardPageContent({
     setArchivedAt(fetched?.archivedAt ?? null);
     setHiddenAt(fetched?.hiddenAt ?? null);
     setDashboardVisibility(fetchedVisibility);
-    setDashboardOwner(fetched?.ownerEmail ?? null);
+    setDashboardCreatedBy(fetched?.createdBy ?? null);
     setDashboardCreatedAt(fetched?.createdAt ?? null);
     setDashboardUpdatedAt(fetched?.updatedAt ?? null);
     setDashboardUpdatedBy(fetched?.updatedBy ?? null);
@@ -1682,14 +1684,11 @@ function SqlDashboardPageContent({
   const handleUnhide = useCallback(async () => {
     if (!dashboardId) return;
     try {
-      const result = (await hideDashboardAction({
+      await hideDashboardAction({
         id: dashboardId,
         hidden: false,
-      })) as { ownerEmail?: string | null } | undefined;
+      });
       setHiddenAt(null);
-      if (typeof result?.ownerEmail === "string") {
-        setDashboardOwner(result.ownerEmail);
-      }
       queryClient.invalidateQueries({
         queryKey: ["sql-dashboards-sidebar", dashboardScope],
       });
@@ -1952,7 +1951,7 @@ function SqlDashboardPageContent({
             <DropdownMenuLabel className="font-normal">
               <DashboardMetadata
                 createdAt={dashboardCreatedAt}
-                createdBy={dashboardOwner}
+                createdBy={dashboardCreatedBy}
                 updatedAt={dashboardUpdatedAt}
                 updatedBy={dashboardUpdatedBy}
               />

package/corpus/templates/analytics/changelog/2026-08-24-feature-flag-changes-recover-from-temporary-workspace-direct.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-24
+---
+
+Feature flag management recovers from temporary workspace directory failures, while directory reads avoid slow per-app database lookups

package/corpus/templates/analytics/changelog/2026-08-26-analytics-distinguishes-daily-from-weekly-activity-shows-sta.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-08-26
+---
+
+Analytics distinguishes daily from weekly activity, shows stacked totals in chart tooltips, and remembers dashboard visibility.

package/corpus/templates/analytics/changelog/2026-08-26-dashboard-metadata-now-shows-the-original-creator-separately.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-26
+---
+
+Dashboard metadata now shows the original creator separately from the current owner

package/corpus/templates/analytics/changelog/2026-08-26-dashboard-names-stay-editable-when-the-analytics-sidebar-ref.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-26
+---
+
+Dashboard names stay editable when the Analytics sidebar refreshes

package/corpus/templates/analytics/changelog/2026-08-26-fixed-the-agent-re-asking-dashboard-scope-questions-you-had-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-26
+---
+
+Fixed the agent re-asking dashboard scope questions you had already answered

package/corpus/templates/analytics/server/db/schema.ts

@@ -31,6 +31,8 @@ export const dashboards = table("dashboards", {
   /** Full dashboard config (SqlDashboardConfig or Explorer state) as JSON. */
   config: text("config").notNull(),
   createdAt: text("created_at").notNull().default(now()),
+  /** Original authenticated creator. Null when historical provenance is unknown. */
+  createdBy: text("created_by"),
   updatedAt: text("updated_at").notNull().default(now()),
   /** Archive timestamp. Null = active. Archived rows are hidden from
    *  default list responses but remain accessible by id and can be restored. */

package/corpus/templates/analytics/server/lib/agent-readable-resource-context.ts

@@ -104,11 +104,14 @@ export function buildDashboardAgentContext(
     hiddenAt: dashboard.hiddenAt,
     hiddenBy: dashboard.hiddenBy,
     createdAt: dashboard.createdAt,
+    createdBy: dashboard.createdBy,
     updatedAt: dashboard.updatedAt,
     updatedBy: dashboard.updatedBy,
     url: `/dashboards/${dashboard.id}`,
   };
-  return options.includeConfig === false ? base : { ...base, ...config };
+  return options.includeConfig === false
+    ? base
+    : { ...base, ...config, createdBy: base.createdBy };
 }
 
 export function buildDashboardSeedAgentContext(
@@ -135,9 +138,12 @@ export function buildDashboardSeedAgentContext(
     archivedAt: null,
     hiddenAt: null,
     hiddenBy: null,
+    createdBy: null,
     url: `/dashboards/${id}`,
   };
-  return options.includeConfig === false ? base : { ...base, ...seed };
+  return options.includeConfig === false
+    ? base
+    : { ...base, ...seed, createdBy: base.createdBy };
 }
 
 export function buildAnalysisAgentContext(

package/corpus/templates/analytics/server/lib/dashboards-store.ts

@@ -53,6 +53,7 @@ export interface DashboardRecord {
   orgId: string | null;
   visibility: "private" | "org" | "public";
   createdAt: string;
+  createdBy: string | null;
   updatedAt: string;
   updatedBy: string | null;
   /** ISO timestamp set when the dashboard is archived. Null = active. */
@@ -467,6 +468,7 @@ function rowToDashboard(row: any, role?: AccessRole): DashboardRecord {
     orgId: row.orgId ?? null,
     visibility: row.visibility,
     createdAt: row.createdAt,
+    createdBy: row.createdBy ?? null,
     updatedAt: row.updatedAt,
     updatedBy: row.updatedBy ?? null,
     archivedAt: row.archivedAt ?? null,
@@ -546,6 +548,7 @@ async function migrateDashboardFromSettings(
     (typeof (settingsValue as any).updatedAt === "string" &&
       (settingsValue as any).updatedAt) ||
     createdAt;
+  const createdBy = visibility === "private" ? ownerEmail : null;
   await db
     .insert(schema.dashboards)
     .values({
@@ -557,6 +560,7 @@ async function migrateDashboardFromSettings(
       orgId,
       visibility,
       createdAt,
+      createdBy,
       updatedAt,
       updatedBy: ownerEmail,
     })
@@ -1389,6 +1393,7 @@ export async function upsertDashboard(
         ownerEmail: ctx.email,
         orgId: ctx.orgId,
         visibility: "private",
+        createdBy: ctx.email,
         updatedBy: ctx.email,
       });
     }

package/corpus/templates/analytics/server/lib/first-party-metric-catalog.ts

@@ -504,6 +504,7 @@ export function repairFirstPartyObservedRetentionPanels(
         legacySql: [
           LEGACY_WAU_BY_TEMPLATE_SQL,
           PRE_MARKETING_SITE_WAU_BY_TEMPLATE_SQL,
+          DAU_BY_TEMPLATE_SQL,
         ],
         sql: WAU_BY_TEMPLATE_SQL,
       },
@@ -573,10 +574,11 @@ export function repairFirstPartyObservedRetentionPanels(
 }
 export const LEGACY_DAU_BY_TEMPLATE_SQL = `SELECT ${EVENT_DATE_SQL} AS date, ${TEMPLATE_EXPR} AS template, COUNT(DISTINCT ${SIGNED_IN_ACTIVITY_KEY_SQL}) AS visitors FROM analytics_events WHERE ${SIGNED_IN_ACTIVITY_FILTER} AND ${DASHBOARD_TIME_RANGE_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} GROUP BY ${EVENT_DATE_SQL}, ${TEMPLATE_EXPR} ORDER BY date, template`;
 export const PRE_MARKETING_SITE_DAU_BY_TEMPLATE_SQL = `SELECT ${EVENT_DATE_SQL} AS date, ${TEMPLATE_EXPR} AS template, COUNT(DISTINCT user_key) AS visitors FROM analytics_events WHERE ${SIGNED_IN_ACTIVITY_FILTER} AND ${DASHBOARD_TIME_RANGE_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} GROUP BY ${EVENT_DATE_SQL}, ${TEMPLATE_EXPR} ORDER BY date, template`;
-const DAU_BY_TEMPLATE_SQL = PRE_MARKETING_SITE_DAU_BY_TEMPLATE_SQL.replace(
-  ` AND ${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} GROUP BY`,
-  ` AND ${FIRST_PARTY_KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER} GROUP BY`,
-);
+export const DAU_BY_TEMPLATE_SQL =
+  PRE_MARKETING_SITE_DAU_BY_TEMPLATE_SQL.replace(
+    ` AND ${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} GROUP BY`,
+    ` AND ${FIRST_PARTY_KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER} GROUP BY`,
+  );
 export const LEGACY_WAU_BY_TEMPLATE_SQL = `WITH base AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS visitor_key, ${TEMPLATE_EXPR} AS template, ${EVENT_DATE_SQL} AS event_date, user_id FROM analytics_events WHERE ${SIGNED_IN_ACTIVITY_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${DASHBOARD_WAU_BASE_RANGE_FILTER}), days AS (SELECT DISTINCT event_date AS date FROM base WHERE ${DASHBOARD_EVENT_DATE_RANGE_FILTER}) SELECT d.date, b.template, COUNT(DISTINCT b.visitor_key) AS visitors FROM days d JOIN base b ON b.event_date >= to_char(d.date::date - INTERVAL '6 days', 'YYYY-MM-DD') AND b.event_date <= d.date GROUP BY d.date, b.template ORDER BY d.date, b.template`;
 export const PRE_MARKETING_SITE_WAU_BY_TEMPLATE_SQL = `WITH base AS (SELECT user_key AS visitor_key, ${TEMPLATE_EXPR} AS template, ${EVENT_DATE_SQL} AS event_date, user_id FROM analytics_events WHERE ${SIGNED_IN_ACTIVITY_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${DASHBOARD_WAU_BASE_RANGE_FILTER}), days AS (SELECT DISTINCT event_date AS date FROM base WHERE ${DASHBOARD_EVENT_DATE_RANGE_FILTER}) SELECT d.date, b.template, COUNT(DISTINCT b.visitor_key) AS visitors FROM days d JOIN base b ON b.event_date >= to_char(d.date::date - INTERVAL '6 days', 'YYYY-MM-DD') AND b.event_date <= d.date GROUP BY d.date, b.template ORDER BY d.date, b.template`;
 const WAU_BY_TEMPLATE_SQL = PRE_MARKETING_SITE_WAU_BY_TEMPLATE_SQL.replace(

package/corpus/templates/analytics/server/lib/migrate-analytics-artifacts.ts

@@ -8,7 +8,7 @@ import {
 } from "@agent-native/core/db/schema";
 import { recordChange } from "@agent-native/core/server";
 import { listOrgSettings } from "@agent-native/core/settings";
-import { eq, inArray } from "drizzle-orm";
+import { and, eq, inArray, isNull } from "drizzle-orm";
 
 import { getDb, schema } from "../db/index.js";
 
@@ -750,6 +750,7 @@ export async function migrateAnalyticsArtifacts(
   }
   await db.transaction(async (tx: any) => {
     for (const row of state.dashboards) {
+      const createdBy = row.visibility === "private" ? row.ownerEmail : null;
       await tx
         .insert(schema.dashboards)
         .values({
@@ -761,6 +762,7 @@ export async function migrateAnalyticsArtifacts(
           orgId: row.orgId,
           visibility: row.visibility,
           createdAt: row.createdAt,
+          createdBy,
           updatedAt: row.updatedAt,
           updatedBy: ctx.userEmail,
           archivedAt: row.archivedAt,
@@ -768,6 +770,18 @@ export async function migrateAnalyticsArtifacts(
           hiddenBy: null,
         })
         .onConflictDoNothing();
+      if (createdBy) {
+        await tx
+          .update(schema.dashboards)
+          .set({ createdBy })
+          .where(
+            and(
+              eq(schema.dashboards.id, row.id),
+              eq(schema.dashboards.orgId, row.orgId),
+              isNull(schema.dashboards.createdBy),
+            ),
+          );
+      }
     }
     for (const row of state.analyses) {
       await tx
@@ -930,6 +944,8 @@ export async function migrateAnalyticsArtifacts(
           orgId: analysis.orgId,
           visibility: analysis.visibility,
           createdAt: analysis.createdAt,
+          createdBy:
+            analysis.visibility === "private" ? analysis.ownerEmail : null,
           updatedAt: now,
           updatedBy: ctx.userEmail,
           hiddenAt: analysis.hiddenAt,
@@ -994,6 +1010,8 @@ export async function migrateAnalyticsArtifacts(
           orgId: extension.orgId,
           visibility: extension.visibility,
           createdAt: extension.createdAt,
+          createdBy:
+            extension.visibility === "private" ? extension.ownerEmail : null,
           updatedAt: now,
           updatedBy: ctx.userEmail,
           hiddenAt: extension.hiddenAt,