@agent-native/core 0.168.13 → 0.169.1

package/corpus/README.md

@@ -31,4 +31,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- template files: 8522
+- template files: 8525

package/corpus/templates/analytics/actions/bigquery-table-info.ts

@@ -9,12 +9,12 @@ Use these sources of truth instead:
 
 - \`list-data-dictionary\` for approved metric, table, column, join, and caveat definitions configured by this organization.
 - \`data-source-status --key bigquery\` to confirm whether BigQuery credentials and a project are configured.
-- \`search-bigquery-schema\` to list configured datasets/tables or inspect exact table columns before writing SQL.
+- \`search-bigquery-schema\` to search the configured project by dataset, table, or column term, or inspect exact table columns before writing SQL.
 - The configured warehouse's \`INFORMATION_SCHEMA.COLUMNS\` tables when you need to discover actual datasets, tables, and columns.
 - \`@app_events\` as an optional placeholder for a default application events table in query-metrics examples. It defaults to \`<BIGQUERY_PROJECT_ID>.analytics.events_partitioned\` and can be overridden with \`ANALYTICS_BIGQUERY_EVENTS_TABLE\`; it is not the BigQuery connection status or a table catalog.
 - \`@project\` as the configured BigQuery project placeholder for fully-qualified table references.
 
-If no data-dictionary entry exists and schema discovery is unavailable, ask the user for the source table or metric definition before writing SQL. Never invent table names, column names, joins, or numbers.
+If no data-dictionary entry exists, search the configured project before asking about business meaning. Ask the user for a metric definition only after the configured schema and query actions prove that the source or metric is unavailable. Never ask the user to provide internal dataset, table, or column names that the schema action can discover, and never invent table names, column names, joins, or numbers.
 
 Preferred schema discovery:
 
@@ -22,6 +22,7 @@ Preferred schema discovery:
 pnpm action search-bigquery-schema
 pnpm action search-bigquery-schema --dataset=<dataset>
 pnpm action search-bigquery-schema --table=<dataset.table>
+pnpm action search-bigquery-schema --search=<metric-or-column-term>
 \`\`\`
 
 Example schema discovery query:

package/corpus/templates/analytics/actions/search-bigquery-schema.ts

@@ -35,6 +35,15 @@ interface TableListResponse {
   }>;
 }
 
+interface BigQueryTableSummary {
+  projectId?: string;
+  datasetId?: string;
+  tableId?: string;
+  type?: string;
+  friendlyName?: string;
+  labels?: Record<string, string>;
+}
+
 interface TableMetadata {
   tableReference?: {
     projectId?: string;
@@ -54,6 +63,9 @@ interface TableMetadata {
 
 const PROJECT_RE = /^[A-Za-z][A-Za-z0-9-]{4,61}[A-Za-z0-9]$/;
 const ID_RE = /^[A-Za-z0-9_]+$/;
+const GLOBAL_SEARCH_DATASET_LIMIT = 100;
+const GLOBAL_SEARCH_TABLE_LIMIT = 250;
+const GLOBAL_SEARCH_METADATA_BATCH_SIZE = 20;
 
 function assertIdentifier(
   label: string,
@@ -183,7 +195,12 @@ function compactTable(meta: TableMetadata, includeColumns: boolean) {
 }
 
 function matchesSearch(meta: TableMetadata, search: string): boolean {
-  const q = search.toLowerCase();
+  const terms = search
+    .toLowerCase()
+    .replace(/[._-]+/g, " ")
+    .split(/\s+/)
+    .filter(Boolean);
+  if (!terms.length) return true;
   const ref = meta.tableReference ?? {};
   const haystack = [
     ref.projectId,
@@ -199,8 +216,9 @@ function matchesSearch(meta: TableMetadata, search: string): boolean {
   ]
     .filter(Boolean)
     .join(" ")
-    .toLowerCase();
-  return haystack.includes(q);
+    .toLowerCase()
+    .replace(/[._-]+/g, " ");
+  return terms.every((term) => haystack.includes(term));
 }
 
 async function listDatasets(projectId: string, limit: number, search: string) {
@@ -245,6 +263,111 @@ async function listTables(projectId: string, datasetId: string, limit: number) {
   }));
 }
 
+async function searchAcrossDatasets(
+  projectId: string,
+  search: string,
+  limit: number,
+) {
+  const datasets = await listDatasets(
+    projectId,
+    GLOBAL_SEARCH_DATASET_LIMIT + 1,
+    "",
+  );
+  const scannableDatasets = datasets.slice(0, GLOBAL_SEARCH_DATASET_LIMIT);
+  const tables: BigQueryTableSummary[] = [];
+  const datasetCount = scannableDatasets.filter(
+    (dataset) => typeof dataset.datasetId === "string" && dataset.datasetId,
+  ).length;
+  let datasetsScanned = 0;
+  let truncated = datasets.length > GLOBAL_SEARCH_DATASET_LIMIT;
+
+  for (const dataset of scannableDatasets) {
+    const datasetId = dataset.datasetId;
+    if (!datasetId) continue;
+    if (tables.length >= GLOBAL_SEARCH_TABLE_LIMIT) {
+      truncated = true;
+      break;
+    }
+
+    datasetsScanned += 1;
+    const remaining = GLOBAL_SEARCH_TABLE_LIMIT - tables.length;
+    const listed = await listTables(
+      projectId,
+      datasetId,
+      Math.min(remaining, GLOBAL_SEARCH_TABLE_LIMIT),
+    );
+    tables.push(...listed);
+  }
+
+  if (datasetsScanned < datasetCount) truncated = true;
+
+  // Inspect table metadata in bounded batches so a search can match columns,
+  // not only table names, without issuing an unbounded burst of requests.
+  const matches: ReturnType<typeof compactTable>[] = [];
+  const errors: Array<{
+    projectId?: string;
+    datasetId?: string;
+    tableId?: string;
+    error: string;
+  }> = [];
+
+  for (
+    let offset = 0;
+    offset < tables.length;
+    offset += GLOBAL_SEARCH_METADATA_BATCH_SIZE
+  ) {
+    const batch = tables.slice(
+      offset,
+      offset + GLOBAL_SEARCH_METADATA_BATCH_SIZE,
+    );
+    const settled = await Promise.allSettled(
+      batch.map(async (table) => {
+        if (!table.datasetId || !table.tableId) return null;
+        const metadata = await getTableMetadata(
+          projectId,
+          table.datasetId,
+          table.tableId,
+        );
+        return matchesSearch(metadata, search)
+          ? compactTable(metadata, true)
+          : null;
+      }),
+    );
+
+    settled.forEach((result, index) => {
+      const table = batch[index];
+      if (result.status === "fulfilled") {
+        if (result.value) matches.push(result.value);
+        return;
+      }
+      errors.push({
+        projectId: table?.projectId ?? projectId,
+        datasetId: table?.datasetId,
+        tableId: table?.tableId,
+        error:
+          result.reason instanceof Error
+            ? result.reason.message
+            : String(result.reason),
+      });
+    });
+  }
+
+  return {
+    mode: "table-search",
+    projectId,
+    search,
+    datasetsScanned,
+    tablesScanned: tables.length,
+    truncated,
+    tables: matches.slice(0, limit),
+    ...(errors.length
+      ? { errors: errors.slice(0, 12), errorCount: errors.length }
+      : {}),
+    nextStep:
+      "Use table=dataset.table for full metadata. Global search is bounded; pass a returned dataset/table reference for a complete inspection.",
+  };
+}
+
 async function getTableMetadata(
   projectId: string,
   datasetId: string,
@@ -256,7 +379,7 @@ async function getTableMetadata(
 
 export default defineAction({
   description:
-    "Search or describe BigQuery metadata for the configured warehouse. Use before writing SQL when the data dictionary does not already name the dataset, table, and columns. With no args, lists datasets. With dataset, lists tables. With dataset + table or a dataset.table value, returns columns for that table.",
+    "Search or describe BigQuery metadata for the configured warehouse. Use before writing SQL when the data dictionary does not already name the dataset, table, and columns. With no args, lists datasets. With search and no dataset, searches accessible tables and columns across the configured project so the user does not need to provide internal table names. With dataset, lists tables. With dataset + table or a dataset.table value, returns columns for that table.",
   schema: z.object({
     dataset: z
       .string()
@@ -307,6 +430,9 @@ export default defineAction({
     }
 
     if (!args.dataset) {
+      if (search) {
+        return searchAcrossDatasets(configuredProjectId, search, limit);
+      }
       return {
         mode: "datasets",
         projectId: configuredProjectId,

package/corpus/templates/analytics/agent-native.config.ts

@@ -1,5 +1,6 @@
 import { defineAgentNativeConfig } from "@agent-native/core/config";
 
 export default defineAgentNativeConfig({
+  changelog: { enabled: true },
   harness: true,
 });

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

@@ -46,6 +46,11 @@ import { toast } from "sonner";
 
 import { useAuth } from "@/components/auth/AuthProvider";
 import { ANALYTICS_CHAT_STORAGE_KEY } from "@/lib/chat-handoff";
+import {
+  matchesDashboardVisibilityFilter,
+  type DashboardVisibility,
+  type DashboardVisibilityFilter,
+} from "@/lib/dashboard-visibility";
 import { cn, shortcutModifierLabel } from "@/lib/utils";
 import {
   dashboards,
@@ -63,6 +68,7 @@ type SidebarDashboard = {
   source: "static" | "sql" | "analysis";
   resourceId?: string;
   visibility?: Visibility;
+  ownerEmail?: string | null;
   /** Id of the dashboard this one nests under in the sidebar, if any. */
   parentId?: string;
 };
@@ -162,7 +168,7 @@ const SIDEBAR_SKELETON_CLASS =
   "bg-sidebar-foreground/12 dark:bg-sidebar-foreground/10";
 
 type SidebarSortMode = "most-used" | "alphabetical" | "manual";
-type SidebarVisibilityFilter = "all" | "private" | "shared";
+type SidebarVisibilityFilter = DashboardVisibilityFilter;
 
 import {
   DndContext,
@@ -258,14 +264,11 @@ function isVisibility(value: unknown): value is Visibility {
 }
 
 export function matchesVisibilityFilter(
-  item: { visibility?: Visibility },
+  item: { visibility?: Visibility; ownerEmail?: string | null },
   filter: SidebarVisibilityFilter,
+  currentUserEmail?: string | null,
 ): boolean {
-  if (filter === "all") return true;
-  if (filter === "private") {
-    return item.visibility !== "org" && item.visibility !== "public";
-  }
-  return item.visibility === "org" || item.visibility === "public";
+  return matchesDashboardVisibilityFilter(item, filter, currentUserEmail);
 }
 
 export function threadMatchesVisibilityFilter(
@@ -447,7 +450,7 @@ function SidebarSectionSettingsPopover({
 
 // --- Visibility types and helpers ---
 
-type Visibility = "private" | "org" | "public";
+type Visibility = DashboardVisibility;
 
 // --- Shared sortable row (used by both dashboards and analyses) ---
 
@@ -1143,6 +1146,7 @@ type SqlDashboardListItem = {
   id: string;
   name: string;
   visibility?: Visibility;
+  ownerEmail?: string | null;
   parentId?: string;
 };
 
@@ -1160,18 +1164,25 @@ async function fetchSqlDashboards(
           d.visibility === "org" ||
           d.visibility === "public"),
     )
-    .map((d: any) => ({
-      id: d.id,
-      name:
-        typeof d.name === "string" && d.name.trim().length > 0
-          ? d.name
-          : t("sidebar.untitledDashboard"),
-      visibility: d.visibility as Visibility,
-      parentId:
-        typeof d.parentId === "string" && d.parentId.trim().length > 0
-          ? d.parentId
-          : undefined,
-    }));
+    .map((d: any) => {
+      const ownerEmail =
+        typeof d.ownerEmail === "string" && d.ownerEmail.trim().length > 0
+          ? d.ownerEmail
+          : undefined;
+      return {
+        id: d.id,
+        name:
+          typeof d.name === "string" && d.name.trim().length > 0
+            ? d.name
+            : t("sidebar.untitledDashboard"),
+        visibility: d.visibility as Visibility,
+        ...(ownerEmail ? { ownerEmail } : {}),
+        parentId:
+          typeof d.parentId === "string" && d.parentId.trim().length > 0
+            ? d.parentId
+            : undefined,
+      };
+    });
 }
 
 async function fetchSidebarAnalyses(t: (key: string) => string): Promise<
@@ -1525,7 +1536,8 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
       activeDashboardId !== null,
   );
   const [dashShowAll, setDashShowAll] = useState(false);
-  const [dashFilter, setDashFilter] = useState<SidebarVisibilityFilter>("all");
+  const [dashFilter, setDashFilter] =
+    useState<SidebarVisibilityFilter>("private");
   const [dashboardSortMode, setDashboardSortModeState] =
     useState<SidebarSortMode>(() => getStoredSortMode(DASHBOARD_SORT_MODE_KEY));
   const { data: popularity, isReady: popularityReady } = usePopularity();
@@ -1749,6 +1761,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
       name: d.name,
       source: "sql",
       visibility: d.visibility,
+      ownerEmail: d.ownerEmail,
       parentId: d.parentId,
     }));
     const analysisItems: SidebarDashboard[] = analysesList.map((a) => ({
@@ -1802,9 +1815,9 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
   const filteredDashboards = useMemo(
     () =>
       visibleDashboards.filter((dashboard) =>
-        matchesVisibilityFilter(dashboard, dashFilter),
+        matchesVisibilityFilter(dashboard, dashFilter, auth?.email),
       ),
-    [visibleDashboards, dashFilter],
+    [auth?.email, visibleDashboards, dashFilter],
   );
 
   // Group dashboards that declare a parentId beneath their parent. Nesting is

package/corpus/templates/analytics/app/lib/dashboard-visibility.ts

@@ -0,0 +1,41 @@
+export type DashboardVisibility = "private" | "org" | "public";
+export type DashboardVisibilityFilter = "all" | "private" | "shared";
+
+export type DashboardVisibilityItem = {
+  visibility?: DashboardVisibility;
+  ownerEmail?: string | null;
+};
+
+function normalizeEmail(email: string | null | undefined): string | null {
+  const normalized = email?.trim().toLowerCase();
+  return normalized ? normalized : null;
+}
+
+export function isDashboardMine(
+  item: DashboardVisibilityItem,
+  currentUserEmail?: string | null,
+): boolean {
+  if (item.visibility === "org" || item.visibility === "public") {
+    return false;
+  }
+
+  if ("ownerEmail" in item) {
+    const ownerEmail = normalizeEmail(item.ownerEmail);
+    const viewerEmail = normalizeEmail(currentUserEmail);
+    return Boolean(ownerEmail && viewerEmail && ownerEmail === viewerEmail);
+  }
+
+  // Older dashboard-shaped items do not always carry ownership metadata.
+  return true;
+}
+
+export function matchesDashboardVisibilityFilter(
+  item: DashboardVisibilityItem,
+  filter: DashboardVisibilityFilter,
+  currentUserEmail?: string | null,
+): boolean {
+  if (filter === "all") return true;
+  return filter === "private"
+    ? isDashboardMine(item, currentUserEmail)
+    : !isDashboardMine(item, currentUserEmail);
+}

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

@@ -56,6 +56,10 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Skeleton } from "@/components/ui/skeleton";
+import {
+  isDashboardMine,
+  type DashboardVisibility,
+} from "@/lib/dashboard-visibility";
 import { dashboardCacheScope } from "@/lib/prefetch-keys";
 
 import { NewDashboardDialog } from "../components/layout/NewDashboardDialog";
@@ -65,7 +69,8 @@ type Dashboard = {
   id: string;
   name?: string;
   title?: string;
-  visibility?: string;
+  visibility?: DashboardVisibility;
+  ownerEmail?: string | null;
   folderId?: string | null;
 };
 type Folder = {
@@ -125,10 +130,15 @@ export default function DashboardOverview() {
         ) {
           continue;
         }
+        const ownerEmail =
+          typeof dashboard.ownerEmail === "string"
+            ? dashboard.ownerEmail
+            : undefined;
         validDashboards.push({
           id: dashboard.id,
           name: dashboard.name,
           visibility: dashboard.visibility,
+          ...(ownerEmail ? { ownerEmail } : {}),
           folderId: dashboard.folderId ?? null,
         });
       }
@@ -394,6 +404,7 @@ export default function DashboardOverview() {
               folders={folders}
               grouped={grouped}
               onMove={moveDashboard}
+              currentUserEmail={auth?.email}
               t={t}
             />
           ))}
@@ -428,6 +439,7 @@ function DashboardScopeSection({
   folders,
   grouped,
   onMove,
+  currentUserEmail,
   t,
 }: {
   scope: Scope;
@@ -435,11 +447,12 @@ function DashboardScopeSection({
   folders: Folder[];
   grouped: Map<string, Dashboard[]>;
   onMove: (dashboard: Dashboard, folderId: string | null) => void;
+  currentUserEmail?: string | null;
   t: ReturnType<typeof useT>;
 }) {
   const scopeFolders = folders.filter((folder) => folder.scope === scope);
   const scopeDashboards = dashboards.filter((dashboard) =>
-    isDashboardInScope(dashboard, scope),
+    isDashboardInScope(dashboard, scope, currentUserEmail),
   );
   const Icon = scope === "personal" ? IconLock : IconUsers;
 
@@ -476,6 +489,7 @@ function DashboardScopeSection({
               folders={folders}
               scope={scope}
               onMove={onMove}
+              currentUserEmail={currentUserEmail}
               t={t}
             />
           ))}
@@ -485,6 +499,7 @@ function DashboardScopeSection({
             folders={folders}
             scope={scope}
             onMove={onMove}
+            currentUserEmail={currentUserEmail}
             t={t}
             hideWhenEmpty
           />
@@ -500,6 +515,7 @@ function FolderSection({
   folders,
   scope,
   onMove,
+  currentUserEmail,
   t,
   hideWhenEmpty = false,
 }: {
@@ -508,11 +524,12 @@ function FolderSection({
   folders: Folder[];
   scope: Scope;
   onMove: (dashboard: Dashboard, folderId: string | null) => void;
+  currentUserEmail?: string | null;
   t: ReturnType<typeof useT>;
   hideWhenEmpty?: boolean;
 }) {
   const scopedDashboards = dashboards.filter((dashboard) =>
-    isDashboardInScope(dashboard, scope),
+    isDashboardInScope(dashboard, scope, currentUserEmail),
   );
   if (hideWhenEmpty && scopedDashboards.length === 0) return null;
 
@@ -540,6 +557,7 @@ function FolderSection({
               folders={folders}
               currentFolderId={folder?.id ?? null}
               onMove={onMove}
+              currentUserEmail={currentUserEmail}
               t={t}
             />
           ))}
@@ -554,23 +572,26 @@ function DashboardRow({
   folders,
   currentFolderId,
   onMove,
+  currentUserEmail,
   t,
 }: {
   dashboard: Dashboard;
   folders: Folder[];
   currentFolderId: string | null;
   onMove: (dashboard: Dashboard, folderId: string | null) => void;
+  currentUserEmail?: string | null;
   t: ReturnType<typeof useT>;
 }) {
   const name =
     dashboard.name || dashboard.title || t("sidebar.untitledDashboard");
+  const mine = isDashboardMine(dashboard, currentUserEmail);
   const candidateFolders = folders.filter((folder) => {
-    if (dashboard.visibility === "private") {
+    if (mine) {
       return folder.scope === "personal";
     }
     return dashboard.visibility === "org" && folder.scope === "shared";
   });
-  const canOrganize = dashboard.visibility !== "public";
+  const canOrganize = mine || dashboard.visibility === "org";
 
   return (
     <div className="group flex items-center gap-3 px-4 py-3 transition-colors hover:bg-muted/30">
@@ -586,7 +607,7 @@ function DashboardRow({
             {name}
           </p>
           <p className="truncate text-xs text-muted-foreground">
-            {dashboard.visibility === "private"
+            {mine
               ? t("dashboardOverview.personal")
               : t("dashboardOverview.shared")}
           </p>
@@ -635,8 +656,12 @@ function DashboardRow({
   );
 }
 
-function isDashboardInScope(dashboard: Dashboard, scope: Scope): boolean {
+function isDashboardInScope(
+  dashboard: Dashboard,
+  scope: Scope,
+  currentUserEmail?: string | null,
+): boolean {
   return scope === "personal"
-    ? dashboard.visibility === "private"
-    : dashboard.visibility === "org" || dashboard.visibility === "public";
+    ? isDashboardMine(dashboard, currentUserEmail)
+    : !isDashboardMine(dashboard, currentUserEmail);
 }

package/corpus/templates/analytics/changelog/2026-08-21-dashboard-filters-keep-other-users-dashboards-out-of-mine.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-21
+---
+
+Dashboard filters keep other users' dashboards out of Mine

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

@@ -286,10 +286,13 @@ function looksLikeWorkflowOrAutomationRequest(lower: string): boolean {
 }
 
 const ANALYTICS_RESULT_TERMS =
-  /\b(conversion|conversions|funnel|revenue|payment|payments|traffic|pageviews?|signups?|events?|active users?|sessions?|retention|churn|pipeline|deals?|calls?|transcripts?|sentiment|themes?|objections?|cohorts?|segments?|accounts?|customers?|tickets?|issues?|leads?|opportunities|mrr|arr|ctr|cvr|cac|ltv)\b/;
+  /\b(conversion|conversions|funnel|revenue|payment|payments|traffic|pageviews?|signups?|events?|active users?|sessions?|retention|churn|pipeline|deals?|calls?|transcripts?|sentiment|themes?|objections?|cohorts?|segments?|accounts?|customers?|tickets?|issues?|leads?|opportunities|usage|adoption|ai credits?|credit consumption|credits? consumed|allowance|quota|mrr|arr|ctr|cvr|cac|ltv)\b/;
+
+const ANALYTICS_DOMAIN_ENTITY_TERMS =
+  /\b(?:branch(?:es)?|branch creation|created by|creator identity)\b/;
 
 const ANALYTICS_INTENT_TERMS =
-  /\b(analy[sz]e|measure|calculate|query|report|summari[sz]e|break ?down|compare|rank|segment|forecast|trend|count|total|average|median|percent(?:age)?|rate|top|bottom|highest|lowest|how many|how much|what (?:is|are|was|were)|which|why)\b/;
+  /\b(analy[sz]e|measure|calculate|query|report|summari[sz]e|break ?down|compare|rank|segment|forecast|trend|count|total|average|median|percent(?:age)?|rate|top|bottom|highest|lowest|pull|fetch|retrieve|export|show|how many|how much|what (?:is|are|was|were)|which|why)\b/;
 
 const SOURCE_SEARCH_INTENT_TERMS =
   /\b(find|surface|search|scan|grep|review|inspect|check|look through|go find)\b/;
@@ -308,7 +311,7 @@ const ARTIFACT_DATA_INTENT =
 // a live provider data call. They should be answered from the data dictionary,
 // schema introspection tools, or the agent's knowledge of configured sources.
 const METADATA_ONLY_TERMS =
-  /\b(what (?:tables?|columns?|fields?|sources?|datasets?|metrics?|schema) (?:are|is|exist|available|do (?:we|you|i) have)|which (?:sources?|tables?|providers?|integrations?) (?:are|is) (?:connected|configured|available|set up)|list (?:the )?(?:tables?|columns?|fields?|sources?|datasets?|schemas?)|show (?:me )?(?:available|the) (?:sources?|tables?|schemas?)|what does .+ (?:mean|measure|represent|track)|how is .+ (?:defined|calculated|computed|measured)|definition of|describe (?:the )?(?:\w+\s+)?(?:table|column|schema|metric|field)|list (?:the )?columns?\s+in|what (?:is|are) (?:the )?(?:data (?:dictionary|schema)|available (?:sources?|tables?))|what (?:source|provider|table) (?:has|stores|contains))\b/;
+  /\b(what (?:tables?|columns?|fields?|sources?|datasets?|metrics?|schema) (?:are|is|exist|available|do (?:we|you|i) have)|which (?:sources?|tables?|providers?|integrations?) (?:are|is) (?:connected|configured|available|set up)|list (?:the )?(?:tables?|columns?|fields?|sources?|datasets?|schemas?)|show (?:me )?(?:available|the) (?:data )?(?:sources?|tables?|schemas?)|what does .+ (?:mean|measure|represent|track)|how is .+ (?:defined|calculated|computed|measured)|definition of|describe (?:the )?(?:\w+\s+)?(?:table|column|schema|metric|field)|list (?:the )?columns?\s+in|what (?:is|are) (?:the )?(?:data (?:dictionary|schema)|available (?:data )?(?:sources?|tables?))|what (?:source|provider|table) (?:has|stores|contains))\b/;
 
 export function looksLikeAnalyticsDataRequest(text: string): boolean {
   const requestText = stripInjectedAnalyticsGuardContext(text);
@@ -350,6 +353,14 @@ export function looksLikeAnalyticsDataRequest(text: string): boolean {
   if (METADATA_ONLY_TERMS.test(lower)) return false;
 
   if (ANALYTICS_RESULT_TERMS.test(lower)) return true;
+  if (
+    ANALYTICS_DOMAIN_ENTITY_TERMS.test(lower) &&
+    (ANALYTICS_INTENT_TERMS.test(lower) ||
+      SOURCE_SEARCH_INTENT_TERMS.test(lower) ||
+      /\bdata\b/.test(lower))
+  ) {
+    return true;
+  }
   if (
     ANALYTICS_INTENT_TERMS.test(lower) &&
     /\b(data|source|table|sql)\b/.test(lower)