@agent-native/core 0.131.5 → 0.131.7

package/corpus/templates/analytics/AGENTS.md

@@ -45,8 +45,10 @@ change the numbers.
 - A sibling app asking over A2A sends a question or shaped input, never SQL. It
   lacks this app's schema, data dictionary, dashboards, and dialect knowledge,
   so raw-query actions (`sql`, `code`, `script`, `expression`) are not
-  sibling-invocable. For recurring numbers, add a shaped read action with
-  semantic parameters and let this app own the query.
+  sibling-invocable. Prefer natural-language delegation so this app retains its
+  instructions, source selection, and tools. Shaped reads are stable contracts,
+  not workarounds for delegation; this app still owns the query.
+- For open-ended delegated requests, choose a safe default and label partial.
 - Data integrity first. Never invent numbers, dimensions, filters, or source
   semantics; only present values you actually retrieved, and state uncertainty.
 - Every analytical answer carries audit context: source(s), time window,
@@ -70,8 +72,9 @@ change the numbers.
   only URLs, ids, or handles.
 - Never hardcode API keys, tokens, webhook URLs, secrets, private Builder data,
   or customer data. Use secrets/OAuth and obvious placeholders in examples.
-- External MCP callers default to `ask_app` for multi-step work; fallback reads
-  are bounded and scoped, and writes stay `ask_app`-only.
+- External MCP callers default to `ask_app` for interpretation, source choice,
+  analysis, or multi-step work. Direct reads require exact, complete input;
+  writes stay `ask_app`-only.
 - Dashboard email reports and analytics alert rules are SQL-backed,
   self-describing action surfaces — don't hand-wire routes around them. Reports
   cap at five recipients. See `dashboard-ops`.

package/corpus/templates/analytics/actions/query-agent-native-analytics.ts

@@ -33,9 +33,10 @@ export default defineAction({
     ),
   }),
   readOnly: true,
-  // No raw HTTP route: a GET endpoint would put caller SQL in query strings
-  // and access logs. External MCP callers reach this through the explicit
-  // ANALYTICS_CONNECTOR_CATALOG entry, which dispatches run() in-process.
+  // No raw HTTP or connector-catalog route: SQL would land in query strings,
+  // logs, or a caller that lacks this app's schema and data dictionary. This
+  // remains an internal Analytics-agent tool; sibling agents ask Analytics a
+  // natural-language question and Analytics forms the query.
   http: false,
   publicAgent: { expose: true, readOnly: true, requiresAuth: true },
   run: async (args) => {

package/corpus/templates/analytics/changelog/2026-07-30-delegated-analytics-questions-now-return-a-useful-current-me.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-30
+---
+
+Delegated analytics questions now return a useful current metric without transport hints derailing the answer

package/corpus/templates/analytics/changelog/2026-07-30-scheduled-dashboard-emails-complete-every-panel-without-pool.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-30
+---
+
+Scheduled dashboard emails complete every panel without pooled query timeout leaks.

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

@@ -81,6 +81,7 @@ globalThis.__AGENT_NATIVE_DASHBOARD_REPORT_SCHEDULED_RUNTIME__ = true;
 
 const CRON_TOKEN = ${JSON.stringify(token)};
 const ROUTE_PATH = ${JSON.stringify(ROUTE_PATH)};
+const WORKER_PATH = "/.netlify/functions/${WORKER_NAME}";
 let cachedHandler;
 
 function timingSafeEquals(a, b) {
@@ -92,6 +93,27 @@ function timingSafeEquals(a, b) {
   return diff === 0;
 }
 
+async function triggerNextSweep(request) {
+  const url = new URL(request.url);
+  url.pathname = WORKER_PATH;
+  url.search = "";
+  const response = await fetch(url.toString(), {
+    method: "POST",
+    headers: {
+      "content-type": "application/json",
+      "x-agent-native-dashboard-report-cron": CRON_TOKEN,
+    },
+    body: JSON.stringify({ scheduled: true }),
+  });
+  if (!response.ok && response.status !== 202) {
+    console.error(
+      "[dashboard-report-cron] Follow-up sweep trigger failed:",
+      response.status,
+      await response.text().catch(() => ""),
+    );
+  }
+}
+
 export default async function handler(request, context) {
   const token = request.headers.get("x-agent-native-dashboard-report-cron") || "";
   if (!timingSafeEquals(token, CRON_TOKEN)) {
@@ -109,7 +131,12 @@ export default async function handler(request, context) {
     body: JSON.stringify({ scheduled: true }),
   });
 
-  return await cachedHandler(rewritten, context);
+  const response = await cachedHandler(rewritten, context);
+  const result = await response.clone().json().catch(() => null);
+  if (response.ok && result?.remaining > 0) {
+    await triggerNextSweep(request);
+  }
+  return response;
 }
 
 export const config = {

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

@@ -8,15 +8,21 @@ import {
   recordDashboardReportCaptureOutcome,
 } from "../lib/dashboard-report-subscriptions";
 
+declare global {
+  var __AGENT_NATIVE_DASHBOARD_REPORT_SCHEDULED_RUNTIME__: boolean | undefined;
+}
+
 let running = false;
 const DEFAULT_MAX_REPORTS_PER_SWEEP = 5;
 const SERVERLESS_REPORT_DELIVERY_BUDGET_MS = 220_000;
-/**
- * Reports render from SQL in seconds now, so one sweep can drain the whole
- * batch. When capture still drove a headless browser this was forced to 1 and
- * every subscription after the first missed its same-day retry window.
- */
-const SERVERLESS_MAX_REPORTS_PER_SWEEP = 5;
+const SERVERLESS_MAX_REPORTS_PER_SWEEP = 1;
+
+function serverlessDashboardReportRuntime(): boolean {
+  return (
+    process.env.NETLIFY === "true" ||
+    globalThis.__AGENT_NATIVE_DASHBOARD_REPORT_SCHEDULED_RUNTIME__ === true
+  );
+}
 
 async function persistDashboardReportResult(
   ...args: Parameters<typeof markDashboardReportResult>
@@ -52,7 +58,9 @@ async function persistDashboardReportCaptureOutcome(
 }
 
 function maxReportsPerSweep(): number {
-  if (process.env.NETLIFY === "true") return SERVERLESS_MAX_REPORTS_PER_SWEEP;
+  if (serverlessDashboardReportRuntime()) {
+    return SERVERLESS_MAX_REPORTS_PER_SWEEP;
+  }
   const raw = process.env.DASHBOARD_REPORT_SWEEP_LIMIT?.trim();
   if (!raw) return DEFAULT_MAX_REPORTS_PER_SWEEP;
   const parsed = Number.parseInt(raw, 10);
@@ -72,10 +80,6 @@ export async function runDashboardReportsOnce(): Promise<{
 }> {
   if (running) return { processed: 0, failed: 0, remaining: 0 };
   running = true;
-  const deliveryDeadlineAt =
-    process.env.NETLIFY === "true"
-      ? Date.now() + SERVERLESS_REPORT_DELIVERY_BUDGET_MS
-      : undefined;
   let processed = 0;
   let failed = 0;
   let remaining = 0;
@@ -86,6 +90,9 @@ export async function runDashboardReportsOnce(): Promise<{
     remaining = batch.length >= sweepLimit ? 1 : 0;
     for (const sub of batch) {
       processed++;
+      const deliveryDeadlineAt = serverlessDashboardReportRuntime()
+        ? Date.now() + SERVERLESS_REPORT_DELIVERY_BUDGET_MS
+        : undefined;
       const retryAt = dashboardReportRetryAt(sub);
       try {
         const result = await runWithRequestContext(

package/corpus/templates/analytics/server/lib/analytics-connector-catalog.ts

@@ -1,9 +1,10 @@
 /**
  * The deliberately small authenticated MCP surface for Analytics.
  *
- * Keep this list read-only and bounded. It includes incident evidence plus
- * the narrow Gong deep-dive/synthesis/evidence operations used by sibling
- * apps. Do not add raw replay blobs or dashboard/data mutation actions here.
+ * Keep this list read-only and bounded. It includes optional semantic read
+ * contracts for callers that already know the exact operation and complete
+ * input. Natural-language ask_app/A2A remains the default. Do not add raw SQL,
+ * replay blobs, or dashboard/data mutation actions here.
  */
 export const ANALYTICS_CONNECTOR_CATALOG = [
   "account-deep-dive",
@@ -14,7 +15,6 @@ export const ANALYTICS_CONNECTOR_CATALOG = [
   "list-session-recordings",
   "get-session-replay-summary",
   "get-session-replay-timeline",
-  "query-agent-native-analytics",
   "list-error-issues",
   "get-error-issue",
 ] as const;

package/corpus/templates/analytics/server/lib/canonical-first-party-dashboard-repair.ts

@@ -9,14 +9,17 @@ import {
 export const LEGACY_NEW_VS_RECURRING_USERS_SQL = `WITH all_users AS (SELECT NULLIF(user_key, '') AS user_key, event_date, user_id FROM analytics_events WHERE event_name = 'session status' AND signed_in = 'true' AND NULLIF(user_key, '') IS NOT NULL AND lower(COALESCE(NULLIF(template, ''), NULLIF(properties::jsonb ->> 'templateId', ''), NULLIF(app, ''), NULLIF(properties::jsonb ->> 'agent_native_app', ''), 'unknown')) <> 'docs' AND ('{{emailFilter}}' IN ('', 'all') OR ('{{emailFilter}}' = 'exclude_builder' AND lower(coalesce(user_id, '')) NOT LIKE '%@builder.io') OR ('{{emailFilter}}' = 'only_builder' AND lower(coalesce(user_id, '')) LIKE '%@builder.io'))), first_seen AS (SELECT user_key, MIN(event_date) AS first_date FROM all_users GROUP BY user_key), daily AS (SELECT a.event_date AS date, CASE WHEN a.event_date = f.first_date THEN 'New' ELSE 'Recurring' END AS user_type, COUNT(DISTINCT a.user_key) AS users FROM all_users a JOIN first_seen f ON f.user_key = a.user_key WHERE ('{{timeRange}}' IN ('', 'all') OR ('{{timeRange}}' = '7d' AND a.event_date >= to_char(CURRENT_DATE - INTERVAL '7 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '30d' AND a.event_date >= to_char(CURRENT_DATE - INTERVAL '30 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '90d' AND a.event_date >= to_char(CURRENT_DATE - INTERVAL '90 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '180d' AND a.event_date >= to_char(CURRENT_DATE - INTERVAL '180 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '365d' AND a.event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD'))) GROUP BY 1, 2) SELECT date, user_type, users FROM daily ORDER BY date, CASE WHEN user_type = 'Recurring' THEN 0 ELSE 1 END`;
 const LEGACY_NEW_VS_RECURRING_USERS_DESCRIPTION =
   "Daily signed-in visitors split by first-ever session (New) vs return visit (Recurring), stacked with Recurring on the bottom and New on top. Docs excluded. A user is New only on their all-time first active day.";
-const NEW_VS_RECURRING_USERS_SQL = `WITH first_seen AS (SELECT NULLIF(user_key, '') AS user_key, MIN(event_date) AS first_date FROM analytics_events WHERE event_name = 'session status' AND signed_in = 'true' AND NULLIF(user_key, '') IS NOT NULL AND lower(COALESCE(NULLIF(template, ''), NULLIF(properties::jsonb ->> 'templateId', ''), NULLIF(app, ''), NULLIF(properties::jsonb ->> 'agent_native_app', ''), 'unknown')) <> 'docs' AND ('{{emailFilter}}' IN ('', 'all') OR ('{{emailFilter}}' = 'exclude_builder' AND lower(coalesce(user_id, '')) NOT LIKE '%@builder.io') OR ('{{emailFilter}}' = 'only_builder' AND lower(coalesce(user_id, '')) LIKE '%@builder.io')) AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD') GROUP BY 1), activity AS (SELECT NULLIF(user_key, '') AS user_key, event_date FROM analytics_events WHERE event_name = 'session status' AND signed_in = 'true' AND NULLIF(user_key, '') IS NOT NULL AND lower(COALESCE(NULLIF(template, ''), NULLIF(properties::jsonb ->> 'templateId', ''), NULLIF(app, ''), NULLIF(properties::jsonb ->> 'agent_native_app', ''), 'unknown')) <> 'docs' AND ('{{emailFilter}}' IN ('', 'all') OR ('{{emailFilter}}' = 'exclude_builder' AND lower(coalesce(user_id, '')) NOT LIKE '%@builder.io') OR ('{{emailFilter}}' = 'only_builder' AND lower(coalesce(user_id, '')) LIKE '%@builder.io')) AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD') AND ('{{timeRange}}' IN ('', 'all') OR ('{{timeRange}}' = '7d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '7 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '30d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '30 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '90d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '90 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '180d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '180 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '365d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD')))), daily AS (SELECT a.event_date AS date, CASE WHEN a.event_date = f.first_date THEN 'New' ELSE 'Recurring' END AS user_type, COUNT(DISTINCT a.user_key) AS users FROM activity a JOIN first_seen f ON f.user_key = a.user_key GROUP BY 1, 2) SELECT date, user_type, users FROM daily ORDER BY date, CASE WHEN user_type = 'Recurring' THEN 0 ELSE 1 END`;
+const BOUNDED_NEW_VS_RECURRING_USERS_SQL = `WITH first_seen AS (SELECT NULLIF(user_key, '') AS user_key, MIN(event_date) AS first_date FROM analytics_events WHERE event_name = 'session status' AND signed_in = 'true' AND NULLIF(user_key, '') IS NOT NULL AND lower(COALESCE(NULLIF(template, ''), NULLIF(properties::jsonb ->> 'templateId', ''), NULLIF(app, ''), NULLIF(properties::jsonb ->> 'agent_native_app', ''), 'unknown')) <> 'docs' AND ('{{emailFilter}}' IN ('', 'all') OR ('{{emailFilter}}' = 'exclude_builder' AND lower(coalesce(user_id, '')) NOT LIKE '%@builder.io') OR ('{{emailFilter}}' = 'only_builder' AND lower(coalesce(user_id, '')) LIKE '%@builder.io')) AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD') GROUP BY 1), activity AS (SELECT NULLIF(user_key, '') AS user_key, event_date FROM analytics_events WHERE event_name = 'session status' AND signed_in = 'true' AND NULLIF(user_key, '') IS NOT NULL AND lower(COALESCE(NULLIF(template, ''), NULLIF(properties::jsonb ->> 'templateId', ''), NULLIF(app, ''), NULLIF(properties::jsonb ->> 'agent_native_app', ''), 'unknown')) <> 'docs' AND ('{{emailFilter}}' IN ('', 'all') OR ('{{emailFilter}}' = 'exclude_builder' AND lower(coalesce(user_id, '')) NOT LIKE '%@builder.io') OR ('{{emailFilter}}' = 'only_builder' AND lower(coalesce(user_id, '')) LIKE '%@builder.io')) AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD') AND ('{{timeRange}}' IN ('', 'all') OR ('{{timeRange}}' = '7d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '7 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '30d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '30 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '90d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '90 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '180d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '180 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '365d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD')))), daily AS (SELECT a.event_date AS date, CASE WHEN a.event_date = f.first_date THEN 'New' ELSE 'Recurring' END AS user_type, COUNT(DISTINCT a.user_key) AS users FROM activity a JOIN first_seen f ON f.user_key = a.user_key GROUP BY 1, 2) SELECT date, user_type, users FROM daily ORDER BY date, CASE WHEN user_type = 'Recurring' THEN 0 ELSE 1 END`;
 const MARKETING_SITE_TEMPLATE_FILTER =
   "lower(COALESCE(NULLIF(template, ''), NULLIF(properties::jsonb ->> 'templateId', ''), NULLIF(app, ''), NULLIF(properties::jsonb ->> 'agent_native_app', ''), 'unknown')) <> 'www'";
-const NEW_VS_RECURRING_USERS_WITHOUT_MARKETING_SITE_SQL =
-  NEW_VS_RECURRING_USERS_SQL.replace(
+export const DEPLOYED_NEW_VS_RECURRING_USERS_SQL =
+  BOUNDED_NEW_VS_RECURRING_USERS_SQL.replace(
     " <> 'docs' AND ",
     ` <> 'docs' AND ${MARKETING_SITE_TEMPLATE_FILTER} AND `,
   );
+// Keep cohort classification in one raw-table scan. Separate first-seen and
+// activity scans double the random heap reads on the growing event table.
+const NEW_VS_RECURRING_USERS_SQL = `WITH activity AS (SELECT NULLIF(user_key, '') AS user_key, event_date, MIN(event_date) OVER (PARTITION BY NULLIF(user_key, '')) AS first_date FROM analytics_events WHERE event_name = 'session status' AND signed_in = 'true' AND NULLIF(user_key, '') IS NOT NULL AND lower(COALESCE(NULLIF(template, ''), NULLIF(properties::jsonb ->> 'templateId', ''), NULLIF(app, ''), NULLIF(properties::jsonb ->> 'agent_native_app', ''), 'unknown')) <> 'docs' AND ${MARKETING_SITE_TEMPLATE_FILTER} AND ('{{emailFilter}}' IN ('', 'all') OR ('{{emailFilter}}' = 'exclude_builder' AND lower(coalesce(user_id, '')) NOT LIKE '%@builder.io') OR ('{{emailFilter}}' = 'only_builder' AND lower(coalesce(user_id, '')) LIKE '%@builder.io')) AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD')), daily AS (SELECT event_date AS date, CASE WHEN event_date = first_date THEN 'New' ELSE 'Recurring' END AS user_type, COUNT(DISTINCT user_key) AS users FROM activity WHERE ('{{timeRange}}' IN ('', 'all') OR ('{{timeRange}}' = '7d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '7 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '30d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '30 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '90d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '90 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '180d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '180 days', 'YYYY-MM-DD')) OR ('{{timeRange}}' = '365d' AND event_date >= to_char(CURRENT_DATE - INTERVAL '365 days', 'YYYY-MM-DD'))) GROUP BY 1, 2) SELECT date, user_type, users FROM daily ORDER BY date, CASE WHEN user_type = 'Recurring' THEN 0 ELSE 1 END`;
 const NEW_VS_RECURRING_USERS_DESCRIPTION =
   "Daily signed-in visitors split by first active day observed in the previous 365 days (New) vs return visit (Recurring), stacked with Recurring on the bottom and New on top. Docs and marketing-site traffic are excluded.";
 
@@ -34,9 +37,10 @@ const CANONICAL_CUSTOM_PANEL_REPLACEMENTS: readonly ExactFirstPartyPanelReplacem
       id: "new-vs-recurring-users",
       legacySql: [
         LEGACY_NEW_VS_RECURRING_USERS_SQL,
-        NEW_VS_RECURRING_USERS_SQL,
+        BOUNDED_NEW_VS_RECURRING_USERS_SQL,
+        DEPLOYED_NEW_VS_RECURRING_USERS_SQL,
       ],
-      sql: NEW_VS_RECURRING_USERS_WITHOUT_MARKETING_SITE_SQL,
+      sql: NEW_VS_RECURRING_USERS_SQL,
       legacyDescription: LEGACY_NEW_VS_RECURRING_USERS_DESCRIPTION,
       description: NEW_VS_RECURRING_USERS_DESCRIPTION,
     },

package/corpus/templates/analytics/server/lib/dashboard-panel-query.ts

@@ -400,8 +400,9 @@ export async function runDashboardPanelQuery(args: {
   source: DashboardPanelSource;
   query: string;
   ctx: CredentialContext;
+  timeoutMs?: number;
 }): Promise<DashboardPanelQueryResult | MissingKeyResponse> {
-  const { source, query, ctx } = args;
+  const { source, query, ctx, timeoutMs } = args;
 
   if (source === "bigquery") {
     const missing = await missingCredential(
@@ -452,7 +453,10 @@ export async function runDashboardPanelQuery(args: {
         userEmail: ctx.userEmail,
         orgId: ctx.orgId ?? null,
       },
-      { cache: true },
+      {
+        cache: true,
+        ...(timeoutMs !== undefined ? { timeoutMs } : {}),
+      },
     );
   }
 

package/corpus/templates/analytics/server/lib/dashboard-panel-source-resolver.ts

@@ -19,17 +19,24 @@ type AnalyticsPanelSourceResolver = PanelSourceResolver<
   CredentialContext
 >;
 
+type AnalyticsPanelSourceRequest = PanelSourceRequest<DashboardPanelSource> & {
+  timeoutMs?: number;
+};
+
 function createResolver(
   source: DashboardPanelSource,
 ): AnalyticsPanelSourceResolver {
   return {
     source,
-    resolve: async (request, context) =>
-      (await runDashboardPanelQuery({
+    resolve: async (request, context) => {
+      const timeoutMs = (request as AnalyticsPanelSourceRequest).timeoutMs;
+      return (await runDashboardPanelQuery({
         source: request.source,
         query: request.query,
         ctx: context,
-      })) as DashboardPanelQueryResult | MissingKeyResponse,
+        ...(timeoutMs !== undefined ? { timeoutMs } : {}),
+      })) as DashboardPanelQueryResult | MissingKeyResponse;
+    },
   };
 }
 
@@ -42,7 +49,7 @@ const registry = createPanelSourceResolverRegistry<
 >({ resolvers: analyticsPanelSourceResolvers });
 
 export async function resolveAnalyticsPanelSource(
-  request: PanelSourceRequest<DashboardPanelSource>,
+  request: AnalyticsPanelSourceRequest,
   context: CredentialContext,
 ): Promise<PanelSourceResult | MissingKeyResponse> {
   return registry.resolve(request, context) as Promise<

package/corpus/templates/analytics/server/lib/dashboard-report-render.ts

@@ -14,7 +14,10 @@ import type {
   TableColumnConfig,
 } from "../../app/pages/adhoc/sql-dashboard/types";
 import { DASHBOARD_REPORT_ACTION_TIMEOUT_MS } from "../../shared/dashboard-report-timeouts.js";
-import { MAX_CONCURRENT_SQL_QUERIES } from "../../shared/sql-query-limits";
+import {
+  MAX_CONCURRENT_FIRST_PARTY_SQL_QUERIES,
+  MAX_CONCURRENT_SQL_QUERIES,
+} from "../../shared/sql-query-limits";
 import {
   normalizeDashboardPanelQuery,
   type DashboardPanelSource,
@@ -186,7 +189,7 @@ async function fetchOnePanel(
 
   try {
     const result = await withTimeout(
-      resolveAnalyticsPanelSource({ source, query }, ctx),
+      resolveAnalyticsPanelSource({ source, query, timeoutMs }, ctx),
       timeoutMs,
       `Panel query timed out after ${Math.round(timeoutMs / 1000)}s`,
     );
@@ -276,42 +279,57 @@ export async function fetchReportPanelData(args: {
     args.perPanelTimeoutMs ?? DEFAULT_PANEL_TIMEOUT_MS,
   );
 
-  let next = 0;
-  const worker = async (): Promise<void> => {
-    while (next < queue.length) {
-      const panel = queue[next++];
-      const remaining = args.deadlineAt
-        ? args.deadlineAt - Date.now()
-        : Infinity;
-      if (remaining <= 0) {
-        results.set(panel.id, {
-          status: "query-failed",
-          message:
-            "The report delivery deadline passed before this panel could run",
-        });
-        continue;
+  const runQueue = async (
+    panelQueue: SqlPanel[],
+    concurrency: number,
+  ): Promise<void> => {
+    let next = 0;
+    const worker = async (): Promise<void> => {
+      while (next < panelQueue.length) {
+        const panel = panelQueue[next++];
+        const remaining = args.deadlineAt
+          ? args.deadlineAt - Date.now()
+          : Infinity;
+        if (remaining <= 0) {
+          results.set(panel.id, {
+            status: "query-failed",
+            message:
+              "The report delivery deadline passed before this panel could run",
+          });
+          continue;
+        }
+        results.set(
+          panel.id,
+          await fetchOnePanel(
+            panel,
+            vars,
+            ctx,
+            Math.min(perPanelTimeoutMs, remaining),
+          ),
+        );
       }
-      results.set(
-        panel.id,
-        await fetchOnePanel(
-          panel,
-          vars,
-          ctx,
-          Math.min(perPanelTimeoutMs, remaining),
-        ),
-      );
-    }
+    };
+
+    await Promise.all(
+      Array.from({ length: Math.min(concurrency, panelQueue.length) }, () =>
+        worker(),
+      ),
+    );
   };
 
   await runWithRequestContext(
     { userEmail: ownerEmail, ...(args.orgId ? { orgId: args.orgId } : {}) },
     async () => {
-      await Promise.all(
-        Array.from(
-          { length: Math.min(MAX_CONCURRENT_SQL_QUERIES, queue.length) },
-          () => worker(),
+      await Promise.all([
+        runQueue(
+          queue.filter((panel) => panel.source === "first-party"),
+          MAX_CONCURRENT_FIRST_PARTY_SQL_QUERIES,
         ),
-      );
+        runQueue(
+          queue.filter((panel) => panel.source !== "first-party"),
+          MAX_CONCURRENT_SQL_QUERIES,
+        ),
+      ]);
     },
   );
 

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

@@ -618,19 +618,27 @@ export function validateFirstPartyAnalyticsSql(sql: string): void {
   }
 }
 
-function scopeClause(scope: AnalyticsScope): {
+function scopedTableSource(
+  tableName: string,
+  scope: AnalyticsScope,
+  today: string,
+): {
   sql: string;
   args: Array<string | null>;
 } {
+  const freshness = freshnessClause(tableName);
   if (scope.orgId) {
     return {
-      sql: "(org_id = ? OR (org_id IS NULL AND owner_email = ?))",
-      args: [scope.orgId, scope.userEmail],
+      // Keep the org and personal fallback as separate branches so Postgres can
+      // use each branch's composite tenant/date indexes instead of scanning one
+      // broad org index for an OR predicate.
+      sql: `(SELECT * FROM ${tableName} WHERE org_id = ? AND ${freshness} UNION ALL SELECT * FROM ${tableName} WHERE org_id IS NULL AND owner_email = ? AND ${freshness})`,
+      args: [scope.orgId, today, scope.userEmail, today],
     };
   }
   return {
-    sql: "(org_id IS NULL AND owner_email = ?)",
-    args: [scope.userEmail],
+    sql: `(SELECT * FROM ${tableName} WHERE org_id IS NULL AND owner_email = ? AND ${freshness})`,
+    args: [scope.userEmail, today],
   };
 }
 
@@ -661,9 +669,9 @@ export function scopedAnalyticsSql(
         !RESERVED_ALIAS_WORDS.has(normalizedAlias)
           ? aliasPart
           : ` AS ${normalizedTable}`;
-      const scopeDef = scopeClause(scope);
-      args.push(...scopeDef.args, today);
-      return `${keyword} (SELECT * FROM ${normalizedTable} WHERE ${scopeDef.sql} AND ${freshnessClause(normalizedTable)})${usableAlias}`;
+      const scopedSource = scopedTableSource(normalizedTable, scope, today);
+      args.push(...scopedSource.args);
+      return `${keyword} ${scopedSource.sql}${usableAlias}`;
     },
   );
   return { sql: rewritten, args };

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

@@ -298,11 +298,12 @@ export const PRE_MARKETING_SITE_ONE_DAY_RETENTION_BY_TEMPLATE_SQL =
     `${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER}), ranked_first_seen`,
     `${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER}), ranked_first_seen`,
   );
-const ONE_DAY_RETENTION_BY_TEMPLATE_SQL =
+export const MATERIALIZED_ONE_DAY_RETENTION_BY_TEMPLATE_SQL =
   PRE_MARKETING_SITE_ONE_DAY_RETENTION_BY_TEMPLATE_SQL.replace(
     KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER,
     `${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER}`,
   );
+const ONE_DAY_RETENTION_BY_TEMPLATE_SQL = `WITH base AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS user_key, ${TEMPLATE_EXPR} AS template, ${EVENT_DATE_SQL} AS event_date FROM analytics_events WHERE ${SIGNED_IN_ACTIVITY_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER} GROUP BY 1, 2, 3), observed AS (SELECT user_key, event_date, FIRST_VALUE(template) OVER (PARTITION BY user_key ORDER BY event_date, template) AS starting_template, MIN(event_date) OVER (PARTITION BY user_key ORDER BY event_date, template) AS cohort_date FROM base), cohorts AS (SELECT user_key, starting_template AS template, cohort_date, MAX(CASE WHEN event_date > cohort_date AND event_date <= to_char(cohort_date::date + INTERVAL '7 days', 'YYYY-MM-DD') THEN 1 ELSE 0 END) AS retained FROM observed WHERE cohort_date <= ${daysAgoSql(7)} AND ${dashboardTimeRangeFilter("cohort_date")} GROUP BY user_key, starting_template, cohort_date) SELECT template, SUM(retained) AS retained_users, COUNT(*) AS cohort_users, SUM(retained)::float / NULLIF(COUNT(*), 0) AS rate FROM cohorts GROUP BY template HAVING COUNT(*) >= ${PER_TEMPLATE_RETENTION_MIN_COHORT_SIZE} ORDER BY rate DESC, cohort_users DESC, template`;
 export const PRE_MARKETING_SITE_SEVEN_DAY_RETENTION_BY_TEMPLATE_SQL =
   LEGACY_SEVEN_DAY_RETENTION_BY_TEMPLATE_SQL.replace(
     `${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER}), ranked_first_seen`,
@@ -314,17 +315,19 @@ const SEVEN_DAY_RETENTION_BY_TEMPLATE_SQL =
     `${KNOWN_PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER}`,
   );
 export const PRE_MARKETING_SITE_RECURRING_USERS_BY_TEMPLATE_SQL = `WITH first_seen AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS user_key, MIN(${EVENT_DATE_SQL}) AS first_date FROM analytics_events WHERE ${SIGNED_IN_PRODUCT_ACTIVITY_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER} GROUP BY 1), activity AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS user_key, ${EVENT_DATE_SQL} AS event_date, ${TEMPLATE_EXPR} AS template FROM analytics_events WHERE ${SIGNED_IN_PRODUCT_ACTIVITY_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER} AND ${DASHBOARD_TIME_RANGE_FILTER}) SELECT a.event_date AS date, a.template AS template, COUNT(DISTINCT a.user_key) AS users FROM activity a JOIN first_seen f ON f.user_key = a.user_key WHERE a.event_date <> f.first_date AND a.template <> 'unknown' GROUP BY 1, 2 ORDER BY date, template`;
-const RECURRING_USERS_BY_TEMPLATE_SQL =
+export const DOUBLE_SCAN_RECURRING_USERS_BY_TEMPLATE_SQL =
   PRE_MARKETING_SITE_RECURRING_USERS_BY_TEMPLATE_SQL.replace(
     PRODUCT_ACTIVITY_TEMPLATE_FILTER,
     `${PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER}`,
   );
+const RECURRING_USERS_BY_TEMPLATE_SQL = `WITH activity AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS user_key, ${EVENT_DATE_SQL} AS event_date, ${TEMPLATE_EXPR} AS template, MIN(${EVENT_DATE_SQL}) OVER (PARTITION BY ${SIGNED_IN_ACTIVITY_KEY_SQL}) AS first_date FROM analytics_events WHERE ${SIGNED_IN_PRODUCT_ACTIVITY_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER}) SELECT event_date AS date, template, COUNT(DISTINCT user_key) AS users FROM activity WHERE event_date <> first_date AND template <> 'unknown' AND ${DASHBOARD_TIME_RANGE_FILTER} GROUP BY 1, 2 ORDER BY date, template`;
 export const PRE_MARKETING_SITE_RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL = `WITH first_seen AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS user_key, MIN(${EVENT_DATE_SQL}) AS first_date FROM analytics_events WHERE ${SIGNED_IN_PRODUCT_ACTIVITY_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER} GROUP BY 1), activity AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS user_key, ${EVENT_DATE_SQL} AS event_date, ${TEMPLATE_EXPR} AS template FROM analytics_events WHERE ${SIGNED_IN_PRODUCT_ACTIVITY_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER} AND ${DASHBOARD_TIME_RANGE_FILTER}) SELECT to_char(date_trunc('week', a.event_date::date), 'YYYY-MM-DD') AS date, a.template AS template, COUNT(DISTINCT a.user_key) AS users FROM activity a JOIN first_seen f ON f.user_key = a.user_key WHERE a.event_date <> f.first_date AND a.template <> 'unknown' GROUP BY 1, 2 ORDER BY date, template`;
-const RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL =
+export const DOUBLE_SCAN_RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL =
   PRE_MARKETING_SITE_RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL.replace(
     PRODUCT_ACTIVITY_TEMPLATE_FILTER,
     `${PRODUCT_ACTIVITY_TEMPLATE_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER}`,
   );
+const RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL = `WITH activity AS (SELECT ${SIGNED_IN_ACTIVITY_KEY_SQL} AS user_key, ${EVENT_DATE_SQL} AS event_date, ${TEMPLATE_EXPR} AS template, MIN(${EVENT_DATE_SQL}) OVER (PARTITION BY ${SIGNED_IN_ACTIVITY_KEY_SQL}) AS first_date FROM analytics_events WHERE ${SIGNED_IN_PRODUCT_ACTIVITY_FILTER} AND ${MARKETING_SITE_TEMPLATE_FILTER} AND ${DASHBOARD_EMAIL_FILTER} AND ${OBSERVED_ACTIVITY_LOOKBACK_FILTER}) SELECT to_char(date_trunc('week', event_date::date), 'YYYY-MM-DD') AS date, template, COUNT(DISTINCT user_key) AS users FROM activity WHERE event_date <> first_date AND template <> 'unknown' AND ${DASHBOARD_TIME_RANGE_FILTER} GROUP BY 1, 2 ORDER BY date, template`;
 const LEGACY_RECURRING_USERS_DESCRIPTION =
   "Daily signed-in visitors who are NOT on their all-time first active day (Recurring only), stacked by inferred template/app used that day. Docs traffic and unknown template are excluded.";
 const LEGACY_RECURRING_USERS_WEEKLY_DESCRIPTION =
@@ -382,6 +385,7 @@ export function repairFirstPartyObservedRetentionPanels(
           LEGACY_ONE_DAY_RETENTION_BY_TEMPLATE_SQL,
           LEGACY_V0_ONE_DAY_RETENTION_BY_TEMPLATE_SQL,
           PRE_MARKETING_SITE_ONE_DAY_RETENTION_BY_TEMPLATE_SQL,
+          MATERIALIZED_ONE_DAY_RETENTION_BY_TEMPLATE_SQL,
         ],
         sql: ONE_DAY_RETENTION_BY_TEMPLATE_SQL,
         legacyDescription: LEGACY_ONE_DAY_RETENTION_BY_TEMPLATE_DESCRIPTION,
@@ -409,6 +413,7 @@ export function repairFirstPartyObservedRetentionPanels(
           INTERMEDIATE_RECURRING_USERS_BY_TEMPLATE_SQL,
           DEPLOYED_RECURRING_USERS_BY_TEMPLATE_SQL,
           PRE_MARKETING_SITE_RECURRING_USERS_BY_TEMPLATE_SQL,
+          DOUBLE_SCAN_RECURRING_USERS_BY_TEMPLATE_SQL,
         ],
         sql: RECURRING_USERS_BY_TEMPLATE_SQL,
         legacyDescription: LEGACY_RECURRING_USERS_DESCRIPTION,
@@ -422,6 +427,7 @@ export function repairFirstPartyObservedRetentionPanels(
           LEGACY_RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL,
           INTERMEDIATE_RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL,
           PRE_MARKETING_SITE_RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL,
+          DOUBLE_SCAN_RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL,
         ],
         sql: RECURRING_USERS_BY_TEMPLATE_WEEKLY_SQL,
         legacyDescription: LEGACY_RECURRING_USERS_WEEKLY_DESCRIPTION,

package/corpus/templates/analytics/server/lib/production-serverless-runtime.ts

@@ -0,0 +1,11 @@
+export function isProductionServerlessRuntime(): boolean {
+  if (process.env.NODE_ENV !== "production") return false;
+  return (
+    process.env.NETLIFY === "true" ||
+    Boolean(process.env.NETLIFY_FUNCTION_NAME) ||
+    Boolean(process.env.AWS_LAMBDA_FUNCTION_NAME) ||
+    Boolean(process.env.LAMBDA_TASK_ROOT) ||
+    process.env.AWS_EXECUTION_ENV?.startsWith("AWS_Lambda") === true ||
+    process.env.VERCEL === "1"
+  );
+}

package/corpus/templates/analytics/server/lib/real-data-actions.ts

@@ -7,6 +7,7 @@ const INJECTED_CONTEXT_BLOCKS = [
   "available-skills",
   "available-agents",
   "available-jobs",
+  "a2a-caller-hint",
   "plan-mode-note",
   "non-analytics-retry",
   "response-guard",
@@ -233,6 +234,15 @@ export function stripInjectedAnalyticsGuardContext(text: string): string {
       "",
     );
   }
+  // Compatibility with callers deployed before A2A hints were wrapped in the
+  // structured block above. The legacy transport note includes words such as
+  // "full transcripts" and "create ... dashboard"; allowing those framework
+  // words into intent classification falsely triggered corpus and dashboard
+  // guards for ordinary delegated metric questions.
+  requestText = requestText.replace(
+    /\n*\[Note:\s*this request comes from another app via A2A\.[\s\S]*\]\s*$/i,
+    "",
+  );
   return requestText.trim();
 }
 

package/corpus/templates/analytics/server/plugins/agent-chat.ts

@@ -848,8 +848,9 @@ export default createAgentChatPlugin({
   connectorCatalog: [...ANALYTICS_CONNECTOR_CATALOG],
   externalAgents: {
     // Keep the direct MCP surface deliberately curated. External agents
-    // should use ask_app for multi-step investigation; cataloged actions are
-    // bounded fallback reads for callers that already know what they need.
+    // should use ask_app by default; cataloged actions are optional stable
+    // semantic reads for callers with an exact, fully known contract. They are
+    // never a fallback for slow or failed delegation.
     authenticatedReads: "off",
     writes: "ask_app_only",
   },

package/corpus/templates/analytics/server/plugins/analytics-alert-jobs.ts

@@ -1,4 +1,5 @@
 import { runAnalyticsAlertsOnce } from "../jobs/analytics-alerts";
+import { isProductionServerlessRuntime } from "../lib/production-serverless-runtime";
 
 const DEFAULT_INTERVAL_MS = 60_000;
 let skippingLogged = false;
@@ -9,7 +10,7 @@ declare global {
 
 function platformSchedulerOwnsAlerts(): boolean {
   return (
-    process.env.NETLIFY === "true" ||
+    isProductionServerlessRuntime() ||
     globalThis.__AGENT_NATIVE_ANALYTICS_ALERT_SCHEDULED_RUNTIME__ === true
   );
 }

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

@@ -1,4 +1,5 @@
 import { runDashboardReportsOnce } from "../jobs/dashboard-report";
+import { isProductionServerlessRuntime } from "../lib/production-serverless-runtime";
 
 const INTERVAL_MS = 60_000;
 let skippingLogged = false;
@@ -9,7 +10,7 @@ declare global {
 
 function platformSchedulerOwnsReports(): boolean {
   return (
-    process.env.NETLIFY === "true" ||
+    isProductionServerlessRuntime() ||
     globalThis.__AGENT_NATIVE_DASHBOARD_REPORT_SCHEDULED_RUNTIME__ === true
   );
 }

package/corpus/templates/analytics/server/plugins/uptime-monitor-jobs.ts

@@ -8,6 +8,7 @@
  * the actions/UI have their schema even when in-process sweeps are disabled.
  */
 import { runDueMonitorsOnce } from "../jobs/uptime-monitors";
+import { isProductionServerlessRuntime } from "../lib/production-serverless-runtime";
 
 const DEFAULT_INTERVAL_MS = 30_000;
 let skippingLogged = false;
@@ -16,18 +17,6 @@ declare global {
   var __AGENT_NATIVE_UPTIME_MONITOR_SCHEDULED_RUNTIME__: boolean | undefined;
 }
 
-function isProductionServerlessRuntime(): boolean {
-  if (process.env.NODE_ENV !== "production") return false;
-  return (
-    process.env.NETLIFY === "true" ||
-    Boolean(process.env.NETLIFY_FUNCTION_NAME) ||
-    Boolean(process.env.AWS_LAMBDA_FUNCTION_NAME) ||
-    Boolean(process.env.LAMBDA_TASK_ROOT) ||
-    process.env.AWS_EXECUTION_ENV?.startsWith("AWS_Lambda") === true ||
-    process.env.VERCEL === "1"
-  );
-}
-
 function platformSchedulerOwnsMonitors(): boolean {
   return (
     isProductionServerlessRuntime() ||