@agent-native/core 0.80.11 → 0.81.1

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

@@ -1,22 +1,32 @@
 import {
+  appBasePath,
   AgentSidebar,
   GuidedQuestionFlow,
   focusAgentChat,
+  markAgentChatHomeHandoff,
   navigateWithAgentChatViewTransition,
   useAgentChatHomeHandoff,
-  useAgentChatHomeHandoffLinks,
   useGuidedQuestionFlow,
   useT,
 } from "@agent-native/core/client";
 import { InvitationBanner } from "@agent-native/core/client/org";
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
 import { useLocation, useNavigate } from "react-router";
 
 import { useNavigationState } from "@/hooks/use-navigation-state";
+import {
+  ANALYTICS_CHAT_STORAGE_KEY,
+  hasRecentAnalyticsChat,
+  markAnalyticsChatActivity,
+} from "@/lib/chat-handoff";
 import { TAB_ID } from "@/lib/tab-id";
 
 import { Header } from "./Header";
 import { HeaderActionsProvider } from "./HeaderActions";
+import {
+  isAnalyticsSessionsRoute,
+  shouldDefaultOpenAnalyticsSidebar,
+} from "./layout-route-policy";
 import { MobileNav } from "./MobileNav";
 import { Sidebar } from "./Sidebar";
 
@@ -26,6 +36,59 @@ interface LayoutProps {
 
 const BARE_ROUTES = new Set(["/chart"]);
 
+function stripBasePath(path: string): string {
+  const basePath = appBasePath();
+  if (!basePath) return path;
+  if (path === basePath) return "/";
+  if (path.startsWith(`${basePath}/`)) return path.slice(basePath.length);
+  if (path.startsWith(`${basePath}?`) || path.startsWith(`${basePath}#`)) {
+    return `/${path.slice(basePath.length)}`;
+  }
+  return path;
+}
+
+function pathnameFromLocalPath(path: string): string {
+  return path.split(/[?#]/, 1)[0] || "/";
+}
+
+function isFrameworkOrApiPath(pathname: string): boolean {
+  return (
+    pathname === "/_agent-native" ||
+    pathname.startsWith("/_agent-native/") ||
+    pathname === "/api" ||
+    pathname.startsWith("/api/")
+  );
+}
+
+function isStaticAssetPath(pathname: string): boolean {
+  const lastSegment = pathname.split("/").pop() ?? "";
+  return /\.[A-Za-z0-9]{1,12}$/.test(lastSegment);
+}
+
+function localPathFromAnchor(anchor: HTMLAnchorElement): string | null {
+  if (!anchor.href) return null;
+  try {
+    const url = new URL(anchor.href);
+    if (url.origin !== window.location.origin) return null;
+    return stripBasePath(`${url.pathname}${url.search}${url.hash}`);
+  } catch {
+    return null;
+  }
+}
+
+function shouldHandleAnchorClick(
+  event: MouseEvent,
+  anchor: HTMLAnchorElement,
+): boolean {
+  if (event.defaultPrevented || event.button !== 0) return false;
+  if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
+    return false;
+  }
+  if (anchor.target && anchor.target !== "_self") return false;
+  if (anchor.hasAttribute("download")) return false;
+  return true;
+}
+
 export function Layout({ children }: LayoutProps) {
   useNavigationState();
   const location = useLocation();
@@ -82,18 +145,60 @@ export function Layout({ children }: LayoutProps) {
   const isExtensionsRoute =
     location.pathname === "/extensions" ||
     location.pathname.startsWith("/extensions/");
+  const isSessionsRoute = isAnalyticsSessionsRoute(location.pathname);
   const isAskRoute = location.pathname === "/ask";
   const chatHomeHandoffActive = useAgentChatHomeHandoff({
-    storageKey: "analytics",
+    storageKey: ANALYTICS_CHAT_STORAGE_KEY,
     activePath: location.pathname,
     enabled: !isAskRoute && !reportScreenshot,
   });
-  useAgentChatHomeHandoffLinks({
-    storageKey: "analytics",
-    chatPath: "/ask",
-  });
   const sidebarScope = chatHomeHandoffActive ? null : analyticsScope;
 
+  useEffect(() => {
+    function handleChatRunning(event: Event) {
+      const detail = (event as CustomEvent).detail;
+      if (typeof detail?.isRunning === "boolean") {
+        markAnalyticsChatActivity();
+      }
+    }
+
+    window.addEventListener("agentNative.chatRunning", handleChatRunning);
+    return () =>
+      window.removeEventListener("agentNative.chatRunning", handleChatRunning);
+  }, []);
+
+  useEffect(() => {
+    if (!isAskRoute) return;
+
+    function handleClick(event: MouseEvent) {
+      const target = event.target;
+      if (!(target instanceof Element)) return;
+      const anchor = target.closest("a[href]");
+      if (!(anchor instanceof HTMLAnchorElement)) return;
+      if (!shouldHandleAnchorClick(event, anchor)) return;
+      if (anchor.closest(".agent-panel-root")) return;
+
+      const path = localPathFromAnchor(anchor);
+      const pathname = path ? pathnameFromLocalPath(path) : "";
+      if (
+        !path ||
+        pathname === "/ask" ||
+        isFrameworkOrApiPath(pathname) ||
+        isStaticAssetPath(pathname) ||
+        !hasRecentAnalyticsChat()
+      ) {
+        return;
+      }
+
+      event.preventDefault();
+      markAgentChatHomeHandoff(ANALYTICS_CHAT_STORAGE_KEY);
+      navigateWithAgentChatViewTransition(navigate, path);
+    }
+
+    document.addEventListener("click", handleClick, true);
+    return () => document.removeEventListener("click", handleClick, true);
+  }, [isAskRoute, navigate]);
+
   function openAskAgentFullscreen() {
     focusAgentChat();
     navigateWithAgentChatViewTransition(navigate, "/ask");
@@ -158,11 +263,14 @@ export function Layout({ children }: LayoutProps) {
         ) : (
           <AgentSidebar
             position="right"
-            defaultOpen
+            defaultOpen={
+              chatHomeHandoffActive &&
+              shouldDefaultOpenAnalyticsSidebar(location.pathname)
+            }
             chatViewTransition
-            storageKey="analytics"
+            storageKey={ANALYTICS_CHAT_STORAGE_KEY}
             browserTabId={TAB_ID}
-            openOnChatRunning={chatHomeHandoffActive}
+            openOnChatRunning={chatHomeHandoffActive && !isSessionsRoute}
             onFullscreenRequest={openAskAgentFullscreen}
             emptyStateText={t("chat.emptyState")}
             suggestions={[

package/corpus/templates/analytics/app/components/layout/layout-route-policy.ts

@@ -0,0 +1,7 @@
+export function isAnalyticsSessionsRoute(pathname: string): boolean {
+  return pathname === "/sessions" || pathname.startsWith("/sessions/");
+}
+
+export function shouldDefaultOpenAnalyticsSidebar(pathname: string): boolean {
+  return !isAnalyticsSessionsRoute(pathname);
+}

package/corpus/templates/analytics/app/global.css

@@ -464,6 +464,10 @@
   container: analytics-session-detail / inline-size;
 }
 
+.analytics-session-detail-timeline {
+  display: none;
+}
+
 @container analytics-session-detail (min-width: 760px) {
   .analytics-session-detail-header {
     flex-direction: row;
@@ -476,6 +480,10 @@
   .analytics-session-detail-workbench {
     grid-template-columns: minmax(0, 1fr) 330px;
   }
+
+  .analytics-session-detail-timeline {
+    display: flex;
+  }
 }
 
 /* The dashboard grid responds to the available content width — which shrinks

package/corpus/templates/analytics/app/hooks/use-navigation-state.ts

@@ -4,6 +4,10 @@ import {
 } from "@agent-native/core/client";
 import { useLocation } from "react-router";
 
+import {
+  ANALYTICS_CHAT_STORAGE_KEY,
+  hasRecentAnalyticsChat,
+} from "@/lib/chat-handoff";
 import { rememberLastOpened } from "@/lib/last-opened";
 import { TAB_ID } from "@/lib/tab-id";
 
@@ -102,7 +106,9 @@ export function useNavigationState() {
     },
     onNavigate: (_command, path) => {
       if (location.pathname === "/ask" && pathnameFromPath(path) !== "/ask") {
-        markAgentChatHomeHandoff("analytics");
+        if (hasRecentAnalyticsChat()) {
+          markAgentChatHomeHandoff(ANALYTICS_CHAT_STORAGE_KEY);
+        }
       }
     },
   });

package/corpus/templates/analytics/app/lib/chat-handoff.ts

@@ -0,0 +1,34 @@
+export const ANALYTICS_CHAT_STORAGE_KEY = "analytics";
+
+export const ANALYTICS_RECENT_CHAT_HANDOFF_TTL_MS = 5 * 60 * 1000;
+
+const ANALYTICS_LAST_CHAT_ACTIVITY_KEY =
+  "agent-native.analytics.last-chat-activity-at";
+
+function readAnalyticsLastChatActivityAt(): number {
+  if (typeof window === "undefined") return 0;
+  try {
+    const raw = window.sessionStorage.getItem(ANALYTICS_LAST_CHAT_ACTIVITY_KEY);
+    const parsed = raw ? Number.parseInt(raw, 10) : 0;
+    return Number.isFinite(parsed) ? parsed : 0;
+  } catch {
+    return 0;
+  }
+}
+
+export function markAnalyticsChatActivity(now = Date.now()): void {
+  if (typeof window === "undefined") return;
+  try {
+    window.sessionStorage.setItem(
+      ANALYTICS_LAST_CHAT_ACTIVITY_KEY,
+      String(now),
+    );
+  } catch {}
+}
+
+export function hasRecentAnalyticsChat(now = Date.now()): boolean {
+  const lastChatAt = readAnalyticsLastChatActivityAt();
+  return (
+    lastChatAt > 0 && now - lastChatAt <= ANALYTICS_RECENT_CHAT_HANDOFF_TTL_MS
+  );
+}

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

@@ -1,25 +1,15 @@
-import {
-  AgentChatSurface,
-  markAgentChatHomeHandoff,
-  useT,
-} from "@agent-native/core/client";
-import { useEffect } from "react";
+import { AgentChatSurface, useT } from "@agent-native/core/client";
+import { useState } from "react";
 
+import {
+  ANALYTICS_CHAT_STORAGE_KEY,
+  hasRecentAnalyticsChat,
+} from "@/lib/chat-handoff";
 import { TAB_ID } from "@/lib/tab-id";
 
 export default function AskPage() {
   const t = useT();
-
-  useEffect(() => {
-    function handleChatRunning(event: Event) {
-      const detail = (event as CustomEvent).detail;
-      if (detail?.isRunning === true) markAgentChatHomeHandoff("analytics");
-    }
-
-    window.addEventListener("agentNative.chatRunning", handleChatRunning);
-    return () =>
-      window.removeEventListener("agentNative.chatRunning", handleChatRunning);
-  }, []);
+  const [restoreActiveThread] = useState(() => hasRecentAnalyticsChat());
 
   return (
     <div className="analytics-ask-page flex h-full min-h-0 flex-col bg-background">
@@ -28,7 +18,8 @@ export default function AskPage() {
         chatViewTransition
         className="analytics-chat-panel"
         defaultMode="chat"
-        storageKey="analytics"
+        storageKey={ANALYTICS_CHAT_STORAGE_KEY}
+        restoreActiveThread={restoreActiveThread}
         browserTabId={TAB_ID}
         showHeader={false}
         showTabBar={false}

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

@@ -28,7 +28,7 @@ import {
 import {
   IconArchive,
   IconClock,
-  IconDots,
+  IconDotsVertical,
   IconEye,
   IconEyeOff,
   IconGripVertical,
@@ -1391,7 +1391,7 @@ export default function SqlDashboardPage() {
                   className="text-muted-foreground hover:text-foreground"
                   aria-label={t("sqlDashboard.dashboardActions")}
                 >
-                  <IconDots className="h-4 w-4" />
+                  <IconDotsVertical className="h-4 w-4" />
                 </Button>
               </DropdownMenuTrigger>
             </TooltipTrigger>

package/corpus/templates/analytics/app/pages/sessions/SessionDetailPage.tsx

@@ -110,6 +110,11 @@ type SkipRange = {
   endMs: number;
 };
 
+type ReplayViewportDimensions = {
+  width: number;
+  height: number;
+};
+
 const DEFAULT_PLAYER_WIDTH = 1024;
 const DEFAULT_PLAYER_HEIGHT = 640;
 const DEFAULT_SPEED = 2;
@@ -334,9 +339,12 @@ function ReplayPlayer({
     height: number;
   } | null>(null);
   const [fitScale, setFitScale] = useState(1);
+  const initialDims = useMemo(() => replayViewportDimensions(events), [events]);
 
-  const playerWidth = streamedDims?.width ?? DEFAULT_PLAYER_WIDTH;
-  const playerHeight = streamedDims?.height ?? DEFAULT_PLAYER_HEIGHT;
+  const playerWidth =
+    streamedDims?.width ?? initialDims?.width ?? DEFAULT_PLAYER_WIDTH;
+  const playerHeight =
+    streamedDims?.height ?? initialDims?.height ?? DEFAULT_PLAYER_HEIGHT;
   const skipRanges = useMemo(() => buildIdleSkipRanges(events), [events]);
   const skipRangesRef = useLiveRef(skipRanges);
   const skipInactiveRef = useLiveRef(skipInactive);
@@ -414,7 +422,7 @@ function ReplayPlayer({
       if (cancelled || !stageRootRef.current) return;
 
       stageRootRef.current.innerHTML = "";
-      setStreamedDims(null);
+      setStreamedDims(initialDims);
       localReplayer = new Replayer(events as any[], {
         root: stageRootRef.current,
         speed: DEFAULT_SPEED,
@@ -431,6 +439,7 @@ function ReplayPlayer({
       const meta = localReplayer.getMetaData?.();
       const total = Number(meta?.totalTime ?? replayDuration(events));
       setTotalTime(Number.isFinite(total) ? total : 0);
+      applyReplayFrameDimensions(localReplayer, initialDims);
       localReplayer.on?.("finish", () => {
         setPlaying(false);
         const finalTime = Number(localReplayer.getCurrentTime?.() ?? total);
@@ -438,10 +447,20 @@ function ReplayPlayer({
       });
       localReplayer.on?.("resize", (payload: unknown) => {
         const dims = payload as { width?: unknown; height?: unknown };
-        if (typeof dims.width === "number" && typeof dims.height === "number") {
-          setStreamedDims({ width: dims.width, height: dims.height });
+        const nextDims = normalizeReplayDimensions(dims.width, dims.height);
+        if (nextDims) {
+          applyReplayFrameDimensions(localReplayer, nextDims);
+          revealReplayFrame(localReplayer);
+          setStreamedDims(nextDims);
         }
       });
+      localReplayer.on?.("fullsnapshot-rebuilded", () => {
+        applyReplayFrameDimensions(
+          localReplayer,
+          replayViewportDimensions(events) ?? initialDims,
+        );
+        revealReplayFrame(localReplayer);
+      });
       updateTime(0);
       setStatus("ready");
       try {
@@ -456,6 +475,13 @@ function ReplayPlayer({
         }
         setPlaying(false);
       }
+      window.requestAnimationFrame(() => {
+        applyReplayFrameDimensions(
+          localReplayer,
+          replayViewportDimensions(events) ?? initialDims,
+        );
+        revealReplayFrame(localReplayer);
+      });
     }
 
     void loadReplay().catch((loadError: any) => {
@@ -479,7 +505,7 @@ function ReplayPlayer({
       replayerRef.current = null;
       if (stageRootRef.current) stageRootRef.current.innerHTML = "";
     };
-  }, [events, t, updateTime]);
+  }, [events, initialDims, t, updateTime]);
 
   useEffect(() => {
     if (!playing || status !== "ready") {
@@ -842,7 +868,7 @@ function ReplayTimeline({
   const t = useT();
   const visibleMarkers = markers.slice(0, 120);
   return (
-    <Card className="flex min-h-0 overflow-hidden">
+    <Card className="analytics-session-detail-timeline min-h-0 overflow-hidden">
       <CardContent className="flex min-h-0 flex-1 flex-col p-0">
         <div className="shrink-0 border-b px-3 py-2">
           <div className="flex items-center gap-2 text-sm font-semibold">
@@ -925,7 +951,7 @@ function DetailSkeleton() {
   return (
     <div className="analytics-session-detail-workbench grid min-h-0 flex-1 gap-3">
       <Skeleton className="h-full min-h-[420px] w-full" />
-      <Skeleton className="h-full min-h-[420px] w-full" />
+      <Skeleton className="analytics-session-detail-timeline h-full min-h-[420px] w-full" />
     </div>
   );
 }
@@ -1008,13 +1034,13 @@ function sanitizeMutationData(data: AnyRecord): AnyRecord {
         typeof copy.value === "string" &&
         containsStylesheetNetworkLoad(copy.value)
       ) {
-        copy.value = "";
+        copy.value = sanitizeCssText(copy.value);
       }
       if (
         typeof copy.textContent === "string" &&
         containsStylesheetNetworkLoad(copy.textContent)
       ) {
-        copy.textContent = "";
+        copy.textContent = sanitizeCssText(copy.textContent);
       }
       return copy;
     });
@@ -1035,21 +1061,12 @@ function sanitizeSerializedNode(node: unknown): AnyRecord | null {
       childNodes: [],
     };
   }
-  if (next.type === 2 && tagName === "style") {
-    return {
-      ...next,
-      attributes: isRecord(next.attributes)
-        ? sanitizeAttributes(next.attributes)
-        : {},
-      childNodes: [],
-    };
-  }
   if (
     next.type === 3 &&
     typeof next.textContent === "string" &&
     containsStylesheetNetworkLoad(next.textContent)
   ) {
-    next.textContent = "";
+    next.textContent = sanitizeCssText(next.textContent);
   }
   if (
     next.type === 2 &&
@@ -1073,6 +1090,13 @@ function containsStylesheetNetworkLoad(value: string): boolean {
   return /@import\b/i.test(value) || /\burl\s*\(/i.test(value);
 }
 
+function sanitizeCssText(value: string): string {
+  if (!containsStylesheetNetworkLoad(value)) return value;
+  return value
+    .replace(/@import\s+(?:url\s*\()?[^;{}]+;?/gi, "")
+    .replace(/\burl\s*\((?:\\.|[^\\)])*\)/gi, "none");
+}
+
 function sanitizeAttributes(attributes: AnyRecord): AnyRecord {
   const next: AnyRecord = {};
   for (const [key, value] of Object.entries(attributes)) {
@@ -1080,7 +1104,11 @@ function sanitizeAttributes(attributes: AnyRecord): AnyRecord {
     if (normalized.startsWith("on")) continue;
     if (normalized === "srcdoc") continue;
     if (isReplayResourceAttribute(normalized)) continue;
-    if (normalized === "style" && /\burl\s*\(/i.test(String(value))) continue;
+    if (normalized === "style") {
+      const style = sanitizeCssText(String(value));
+      if (style.trim()) next[key] = style;
+      continue;
+    }
     next[key] = value;
   }
   return next;
@@ -1240,6 +1268,66 @@ function currentUrlAt(events: AnyReplayEvent[], currentTime: number): string {
   return current;
 }
 
+export function replayViewportDimensions(
+  events: AnyReplayEvent[],
+): ReplayViewportDimensions | null {
+  for (const event of events) {
+    if (event.type !== RRWEB_EVENT_TYPE.Meta) continue;
+    const dims = normalizeReplayDimensions(
+      event.data?.width,
+      event.data?.height,
+    );
+    if (dims) return dims;
+  }
+  return null;
+}
+
+function normalizeReplayDimensions(
+  width: unknown,
+  height: unknown,
+): ReplayViewportDimensions | null {
+  if (
+    typeof width !== "number" ||
+    typeof height !== "number" ||
+    !Number.isFinite(width) ||
+    !Number.isFinite(height) ||
+    width <= 0 ||
+    height <= 0
+  ) {
+    return null;
+  }
+  return {
+    width: Math.round(width),
+    height: Math.round(height),
+  };
+}
+
+function applyReplayFrameDimensions(
+  replayer: any,
+  dims: ReplayViewportDimensions | null,
+) {
+  const width = dims?.width ?? DEFAULT_PLAYER_WIDTH;
+  const height = dims?.height ?? DEFAULT_PLAYER_HEIGHT;
+  const wrapper = replayer?.wrapper as HTMLElement | undefined;
+  const iframe = replayer?.iframe as HTMLIFrameElement | undefined;
+  const mouseTail = replayer?.mouseTail as HTMLCanvasElement | undefined;
+  for (const element of [wrapper, iframe]) {
+    if (!element) continue;
+    element.style.width = `${width}px`;
+    element.style.height = `${height}px`;
+  }
+  for (const element of [iframe, mouseTail]) {
+    if (!element) continue;
+    element.setAttribute("width", String(width));
+    element.setAttribute("height", String(height));
+  }
+}
+
+function revealReplayFrame(replayer: any) {
+  const iframe = replayer?.iframe as HTMLIFrameElement | undefined;
+  if (iframe) iframe.style.display = "inherit";
+}
+
 function replayStartedAt(events: AnyReplayEvent[]): number {
   const first = events.find((event) =>
     Number.isFinite(Number(event.timestamp)),

package/corpus/templates/analytics/app/pages/sessions/SessionsPage.tsx

@@ -235,7 +235,7 @@ export default function SessionsPage() {
                     >
                       <span className="inline-flex h-10 w-[92px] items-center justify-center gap-2 rounded-md bg-primary/10 font-medium text-primary">
                         <IconPlayerPlay className="h-4 w-4 fill-current" />
-                        {formatDuration(recording.durationMs)}
+                        {formatSessionDuration(recording.durationMs)}
                       </span>
                       <span className="min-w-0">
                         <span className="block truncate text-sm font-medium text-foreground">
@@ -523,13 +523,11 @@ function formatDateTime(value: string): string {
   }).format(date);
 }
 
-function formatDuration(ms: number | null): string {
-  if (!ms || !Number.isFinite(ms) || ms <= 0) return "0s";
+export function formatSessionDuration(ms: number | null): string {
+  if (!ms || !Number.isFinite(ms) || ms <= 0) return "0m";
   const seconds = Math.round(ms / 1000);
-  if (seconds < 60) return `${seconds}s`;
   const minutes = Math.floor(seconds / 60);
-  const remainingSeconds = seconds % 60;
-  if (minutes < 60) return `${minutes}m ${remainingSeconds}s`;
+  if (minutes < 60) return `${minutes}m`;
   const hours = Math.floor(minutes / 60);
   const remainingMinutes = minutes % 60;
   return `${hours}h ${remainingMinutes}m`;

package/corpus/templates/analytics/changelog/2026-06-30-ask-opens-a-fresh-chat-unless-you-were-just-chatting-and-das.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-06-30
+---
+
+Ask opens a fresh chat unless you were just chatting, and dashboard navigation keeps the sidebar closed from an empty Ask state.

package/corpus/templates/analytics/changelog/2026-06-30-dashboard-email-reports-are-more-reliable-and-use-cleaner.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-06-30
+---
+
+Dashboard email reports are more reliable and use cleaner header copy.

package/corpus/templates/analytics/changelog/2026-06-30-dashboard-toolbar-controls-use-a-quieter-share-button-and-ve.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-06-30
+---
+
+Dashboard toolbar controls use a quieter share button and vertical actions menu.

package/corpus/templates/analytics/changelog/2026-06-30-session-replay-rows-show-whole-minute-durations-in-the-playl.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-06-30
+---
+
+Session replay rows show whole-minute durations in the playlist.

package/corpus/templates/analytics/changelog/2026-06-30-session-replays-now-render-captured-styling-and-keep-the-eve.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-06-30
+---
+
+Session replays now render captured styling and keep the event timeline out of compact layouts.

package/corpus/templates/analytics/server/jobs/dashboard-report.ts

@@ -41,14 +41,27 @@ export async function runDashboardReportsOnce(): Promise<{
     for (const sub of batch) {
       processed++;
       try {
-        await runWithRequestContext(
+        const result = await runWithRequestContext(
           {
             userEmail: sub.ownerEmail,
             orgId: sub.orgId ?? undefined,
           },
-          () => sendDashboardReportSubscription(sub),
+          () =>
+            sendDashboardReportSubscription(sub, { requireScreenshot: true }),
         );
-        await markDashboardReportResult(sub, "success");
+        if (result.screenshotAttached) {
+          await markDashboardReportResult(sub, "success");
+        } else {
+          failed++;
+          const message = result.screenshotError
+            ? `Dashboard screenshot unavailable: ${result.screenshotError}`
+            : "Dashboard screenshot unavailable";
+          console.error(
+            `[dashboard-report] Subscription ${sub.id} sent without a screenshot:`,
+            message,
+          );
+          await markDashboardReportResult(sub, "error", message);
+        }
       } catch (err: any) {
         failed++;
         const message = err?.message ?? String(err);