The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
GDGT-2874: Move AI analytics to Monitor (#78532)
Stas Gavrylovb34f244ffaad
diff --git a/e2e/support/timings.json b/e2e/support/timings.jsonindex 83d918d100a..a11ba0d6c84 100644--- a/e2e/support/timings.json+++ b/e2e/support/timings.json@@ -997,8 +997,8 @@"duration": 44417},{- "spec": "../test/scenarios/metabot/usage-auditing.cy.spec.ts",- "duration": 99790+ "spec": "../test/scenarios/monitor/ai-auditing/usage-auditing.cy.spec.ts",+ "duration": 98473},{"spec": "../test/scenarios/metrics/browse.cy.spec.ts",diff --git a/e2e/test/scenarios/metabot/mcp-analytics.cy.spec.ts b/e2e/test/scenarios/monitor/ai-auditing/mcp-analytics.cy.spec.tssimilarity index 95%rename from e2e/test/scenarios/metabot/mcp-analytics.cy.spec.tsrename to e2e/test/scenarios/monitor/ai-auditing/mcp-analytics.cy.spec.tsindex 57372994b66..77eb31dcae0 100644--- a/e2e/test/scenarios/metabot/mcp-analytics.cy.spec.ts+++ b/e2e/test/scenarios/monitor/ai-auditing/mcp-analytics.cy.spec.ts@@ -2,7 +2,7 @@ const { H } = cy;import { ADMIN_USER_ID } from "e2e/support/cypress_sample_instance_data";-const MCP_ANALYTICS_PATH = "/admin/metabot/usage-auditing/mcp";+const MCP_ANALYTICS_PATH = "/monitor/ai-auditing/mcp";const SEED_TOOL_NAME = "e2e_smoke_tool";const SEED_ERROR_TOOL = "e2e_error_tool";// error_code -32602 is JSON-RPC "Invalid params", which the view maps to error_type "Invalid params".@@ -37,7 +37,7 @@ function visitMcpAnalyticsPage(): void {cy.wait("@auditMetadata");}-describe("scenarios > metabot > mcp analytics", () => {+describe("scenarios > monitor > ai auditing > mcp analytics", () => {beforeEach(() => {H.restore();cy.signInAsAdmin();@@ -49,7 +49,7 @@ describe("scenarios > metabot > mcp analytics", () => {visitMcpAnalyticsPage();- cy.log("Nav item lives under the Auditing folder");+ cy.log("Nav item lives in the AI Auditing group");cy.findByRole("link", { name: "MCP analytics" }).should("be.visible");cy.log("The page renders with the seeded data (not the empty state)");diff --git a/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts b/e2e/test/scenarios/monitor/ai-auditing/usage-auditing.cy.spec.tssimilarity index 81%rename from e2e/test/scenarios/metabot/usage-auditing.cy.spec.tsrename to e2e/test/scenarios/monitor/ai-auditing/usage-auditing.cy.spec.tsindex 83c76e67f55..821affdee72 100644--- a/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts+++ b/e2e/test/scenarios/monitor/ai-auditing/usage-auditing.cy.spec.ts@@ -39,7 +39,7 @@ function seedUsageAuditingData(): void {function visitUsageStatsPage(): void {cy.intercept("GET", "/api/database/13371337/metadata*").as("auditMetadata");- cy.visit("/admin/metabot/usage-auditing");+ cy.visit("/monitor/ai-auditing/usage");cy.wait("@auditMetadata");}@@ -50,7 +50,7 @@ function visitConversationsPage(): void {cy.intercept("GET", "/api/ee/metabot-analytics/conversations/*").as("conversationDetail",);- cy.visit("/admin/metabot/usage-auditing/conversations?date=past7days~");+ cy.visit("/monitor/ai-auditing/conversations?date=past7days~");cy.wait("@conversations").its("response.statusCode").should("eq", 200);}@@ -70,11 +70,14 @@ function assertChartRendered(title: string): void {});}-describe("scenarios > metabot > usage auditing", () => {+describe("scenarios > monitor > ai auditing > usage auditing", () => {beforeEach(() => {H.restore();cy.signInAsAdmin();H.activateToken("pro-self-hosted");+ // MetabotAnalyticsAvailabilityLayout (usage stats + conversations) shows an empty+ // state with a "Go to AI Settings" CTA unless llm-metabot-configured? is true.+ H.updateSetting("llm-anthropic-api-key", "sk-ant-test-key");seedUsageAuditingData();});@@ -97,19 +100,21 @@ describe("scenarios > metabot > usage auditing", () => {visitConversationsPage();H.main()- .findByRole("table")+ .findByRole("treegrid", { name: "Conversations" }).within(() => {+ // The IP column sits behind horizontal scroll in the treegrid, so scroll+ // each match into view before asserting visibility.["Bobby Tables", "Robert Tableton", "NLQ", "10.0.0.1"].forEach((label) => {cy.findAllByText(label)- .filter(":visible")- .should("have.length.greaterThan", 0);+ .first()+ .scrollIntoView()+ .should("be.visible");},);});- cy.get("tbody")- .contains("tr", "NLQ")+ cy.contains('[data-testid="conversation"]', "NLQ").scrollIntoView().should("be.visible").realClick();diff --git a/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj b/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.cljindex 4f935f87cc4..d291baf2458 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj@@ -51,7 +51,7 @@(def ^:private SortColumn"Allow-list of columns the list endpoint can sort by."- [:enum "created_at" "message_count" "total_tokens" "cache_read_tokens" "user" "profile_id" "ip_address"])+ [:enum "created_at" "title" "message_count" "total_tokens" "cache_read_tokens" "user" "profile_id" "ip_address"])(def ^:private SortDirection[:enum "asc" "desc"])diff --git a/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj b/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.cljindex a8c75ff81fa..fb6f153497f 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj@@ -75,6 +75,7 @@direction). A vector lets a single sort key emit multiple ORDER BY terms thatshare the same direction (e.g. user sort orders by first_name then last_name)."{"created_at" [:c.created_at]+ "title" [:c.title]"message_count" [:message_count]"total_tokens" [:total_tokens]"cache_read_tokens" [:cache_read_tokens]diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.cljindex bfce11443bb..7f64288ebde 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj@@ -270,7 +270,7 @@(defn- with-sortable-conversations-fixture!"Seeds three conversations differentiated across every sortable column: user(first_name/last_name), profile_id, ip_address, created_at, message_count,- and total_tokens. Tests pick a sort key and verify the order of the+ title, and total_tokens. Tests pick a sort key and verify the order of theconvo-a / convo-m / convo-z handles. Seeded into a private 2026 date windowso a `date` filter isolates them from any other rows in the test app DB.@@ -285,8 +285,9 @@message_count: (m, z, a) counts 1, 2, 3total_tokens: (a, z, m) tokens 10, 20, 30cache_read_tokens: (z, a, m) cache reads 5, 15 (7+8), 25- (all six permutations of three handles are taken, so this one- necessarily repeats profile_id's ordering)"+ title: (z, m, a) Alpha request / Middle request / Zebra request+ (all six permutations of three handles are taken, so these+ necessarily repeat an earlier column's ordering)"[thunk](mt/with-premium-features #{:audit-app}(mt/with-temp [:model/User {user-a :id} {:email "[email protected]"@@ -316,11 +317,14 @@:data [{:type "text" :text "hi"}]}))](try(insert-conversation! {:conversation-id convo-a :user-id user-a- :created-at jan-1 :ip-address "10.0.0.3"})+ :created-at jan-1 :ip-address "10.0.0.3"+ :title "Zebra request"})(insert-conversation! {:conversation-id convo-m :user-id user-m- :created-at jan-2 :ip-address "10.0.0.2"})+ :created-at jan-2 :ip-address "10.0.0.2"+ :title "Middle request"})(insert-conversation! {:conversation-id convo-z :user-id user-z- :created-at jan-3 :ip-address "10.0.0.1"})+ :created-at jan-3 :ip-address "10.0.0.1"+ :title "Alpha request"})(seed-msg! convo-a "2-profile" 4)(seed-msg! convo-a "2-profile" 3)(seed-msg! convo-a "2-profile" 3)@@ -348,7 +352,8 @@["ip_address" [convo-z convo-m convo-a]]["message_count" [convo-m convo-z convo-a]]["total_tokens" [convo-a convo-z convo-m]]- ["cache_read_tokens" [convo-z convo-a convo-m]]]]+ ["cache_read_tokens" [convo-z convo-a convo-m]]+ ["title" [convo-z convo-m convo-a]]]](testing (str "sort_by=" sort-by " &sort_dir=asc")(let [response (mt/user-http-request :crowberto :get 200(str response-path "&sort_by=" sort-by "&sort_dir=asc"))]diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.tsxdeleted file mode 100644index 6d545f8a9d1..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.tsx+++ /dev/null@@ -1,223 +0,0 @@-import { useMemo } from "react";-import { match } from "ts-pattern";-import { t } from "ttag";--import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";-import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";-import { useSetting } from "metabase/common/hooks";-import { useUrlState } from "metabase/common/hooks/use-url-state";-import { useLocation } from "metabase/router";-import { Flex, Loader, SimpleGrid, Stack, Tabs, Title } from "metabase/ui";--import {- // The shared audit filter bar; aliased since it has nothing to do with Metabot "conversations".- ConversationFilters as CliCallsFilter,- useFilterOptions,-} from "../../metabot-analytics/components/ConversationFilters";-import { useAuditTable } from "../../metabot-analytics/hooks/useAuditTable";-import { VIEW_AGENT_API_CALLS, VIEW_GROUP_MEMBERS } from "../constants";-import { useCliHasData } from "../hooks/useCliHasData";-import { buildCallsByDayByStatusQuery } from "../query-utils";-import { cliUrlStateConfig } from "../url-state";--import { CliAnalyticsEmptyState } from "./CliAnalyticsEmptyState";-import { CliBreakoutChart } from "./CliBreakoutChart";-import { CliCallerLivenessTable } from "./CliCallerLivenessTable";-import { CliCallsTimelineChart } from "./CliCallsTimelineChart";-import { CliEventsTable } from "./CliEventsTable";--/**- * Admin CLI analytics page. Renders live ad-hoc queries over the `v_agent_api_calls` audit view- * across two tabs (Charts and a row-level Calls table), sharing URL-state date/user/group- * filters. Shows a single empty state (no tabs) when the filtered view has no activity.- */-export function CliAnalyticsPage() {- const location = useLocation();- const [- { date, user, group, tenant, tab, page, sort_column, sort_direction },- { patchUrlState },- ] = useUrlState(location, cliUrlStateConfig);-- const {- dateFilter,- userId,- groupId,- tenantId,- groupNoFilterValue,- userOptions,- groupOptions,- tenantOptions,- hasTenants,- } = useFilterOptions({ date, user, group, tenant });-- // IP address and error message are PII (null unless retention is on), so only surface those- // columns when they're collected.- const hasPii = useSetting("analytics-pii-retention-enabled") === true;-- const callsAudit = useAuditTable(VIEW_AGENT_API_CALLS);- const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);-- const dataSources = {- provider: callsAudit.provider,- table: callsAudit.table,- groupMembersTable: groupMembersAudit.table,- };-- const chartFilters = { dateFilter, userId, groupId, tenantId };-- // Keep this referentially stable: it feeds the events query's `useMemo`, and each rebuild mints- // fresh metabase-lib UUIDs, which change the query's serialized RTK cache key and trigger a- // redundant refetch (and loader flash) on every incidental re-render.- const sortingOptions = useMemo(- () => ({ sort_column, sort_direction }),- [sort_column, sort_direction],- );-- const { isInitialLoading, isRefetching, hasData, count } = useCliHasData({- ...dataSources,- ...chartFilters,- });- // Initial load shows a loader (never the empty state). After the first result, a filter- // change keeps the charts mounted so they show their own skeletons while refetching; the- // empty state only appears once a load has resolved to zero rows.- const showEmpty = !isInitialLoading && !isRefetching && !hasData;-- // Only surface the errors section when the current filters actually match failed calls, so a- // healthy instance doesn't show a row of empty error charts.- const { hasData: hasErrors } = useCliHasData({- ...dataSources,- ...chartFilters,- errorsOnly: true,- });-- return (- <MetabotAdminLayout fullWidth>- <SettingsPageWrapper mt="sm">- <Flex align="center" justify="space-between">- <Title order={2}>{t`CLI analytics`}</Title>-- <CliCallsFilter- date={date}- onDateChange={(val) => patchUrlState({ date: val })}- user={user}- onUserChange={(val) => patchUrlState({ user: val })}- userOptions={userOptions}- group={group}- onGroupChange={(val) => patchUrlState({ group: val })}- groupOptions={groupOptions}- groupNoFilterValue={groupNoFilterValue}- tenant={tenant}- onTenantChange={(val) => patchUrlState({ tenant: val })}- tenantOptions={tenantOptions}- hasTenants={hasTenants}- />- </Flex>-- {match({ isInitialLoading, showEmpty })- .with({ isInitialLoading: true }, () => (- <Flex mih="60vh" align="center" justify="center">- <Loader size="lg" />- </Flex>- ))- .with({ showEmpty: true }, () => <CliAnalyticsEmptyState />)- .otherwise(() => (- <Tabs- value={tab}- onChange={(value) => patchUrlState({ tab: value ?? undefined })}- keepMounted={false}- >- <Tabs.List mb="lg">- <Tabs.Tab value="charts">{t`Usage`}</Tabs.Tab>- <Tabs.Tab value="events">{t`Calls`}</Tabs.Tab>- </Tabs.List>-- <Tabs.Panel value="charts">- <Stack gap="lg">- <CliCallsTimelineChart- {...dataSources}- {...chartFilters}- title={t`Calls by client over time`}- />- <SimpleGrid cols={2} spacing="lg">- <CliBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Calls by client`}- display="pie"- breakoutColumn="client_display_name"- h={500}- />- <CliBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Calls by operation`}- display="row"- breakoutColumn="operation"- h={500}- />- </SimpleGrid>- <SimpleGrid cols={2} spacing="lg">- <CliBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Calls by user`}- display="row"- breakoutColumn="user_display_name"- h={500}- />- <CliCallerLivenessTable- {...dataSources}- {...chartFilters}- title={t`User activity`}- h={500}- />- </SimpleGrid>-- {hasErrors && (- <>- <Title order={3} mt="md">{t`Errors`}</Title>- <CliCallsTimelineChart- {...dataSources}- {...chartFilters}- title={t`Calls by status over time`}- buildQuery={buildCallsByDayByStatusQuery}- />- <CliBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Errors by operation`}- display="row"- breakoutColumn="operation"- errorsOnly- h={500}- />- </>- )}- </Stack>- </Tabs.Panel>-- <Tabs.Panel value="events">- <CliEventsTable- {...dataSources}- {...chartFilters}- hasTenants={hasTenants}- hasPii={hasPii}- page={page}- total={count}- onPageChange={(newPage) => patchUrlState({ page: newPage })}- sortingOptions={sortingOptions}- onSortingOptionsChange={(newSorting) =>- patchUrlState({- sort_column: newSorting.sort_column,- sort_direction: newSorting.sort_direction,- page: 0,- })- }- />- </Tabs.Panel>- </Tabs>- ))}- </SettingsPageWrapper>- </MetabotAdminLayout>- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.module.cssdeleted file mode 100644index 900621381e2..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.module.css+++ /dev/null@@ -1,8 +0,0 @@-/* Call rows can hold long values (operations, ids, error text); keep them on one line so the- body scrolls horizontally rather than wrapping into tall, hard-to-scan rows. */-.table thead th,-.table thead th *,-.table td,-.table th {- white-space: nowrap;-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.tsxdeleted file mode 100644index fb3c70be767..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.tsx+++ /dev/null@@ -1,269 +0,0 @@-import { type ReactNode, useMemo, useRef } from "react";-import { t } from "ttag";--import {- AdminDataTable,- type AdminDataTableColumn,-} from "metabase/admin/components/AdminDataTable";-import { DateTime } from "metabase/common/components/DateTime";-import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatNumber } from "metabase/utils/formatting";-import type {- CardMetadata,- MetadataProvider,- TableMetadata,-} from "metabase-lib";-import type { RowValue, RowValues, SortingOptions } from "metabase-types/api";--import { useCliEventsQuery } from "../hooks/useCliEventsQuery";-import type { CliEventSortColumn, CliFilters } from "../query-utils";-import { buildEventsQuery } from "../query-utils";--import S from "./CliEventsTable.module.css";--export const EVENTS_PAGE_SIZE = 25;--type EventColumn = {- /** View column name, matched case-insensitively against the result columns. */- key: string;- title: string;- /** Present when the column can be sorted server-side. */- sort?: CliEventSortColumn;- align?: "right";- render?: (value: RowValue) => ReactNode;-};--/**- * The curated columns surfaced in the events table, in display order. Only these are ever- * rendered — every other view column (raw ids, client_name, …) stays hidden by construction, so- * nothing sensitive can leak. `tenant_name` shows only when tenants are enabled; `ip_address` /- * `error_message` only when PII retention is on (they're null otherwise).- */-export function eventColumns(- hasTenants: boolean,- hasPii: boolean,-): EventColumn[] {- const columns: (EventColumn | false)[] = [- { key: "call_id", title: t`ID` },- {- key: "created_at",- title: t`Created at`,- sort: "created_at",- render: (value) =>- value == null ? (- EMPTY_CELL_PLACEHOLDER- ) : (- <DateTime value={String(value)} />- ),- },- { key: "operation", title: t`Operation`, sort: "operation" },- {- key: "client_display_name",- title: t`Client`,- sort: "client_display_name",- },- { key: "user_display_name", title: t`User`, sort: "user_display_name" },- hasTenants && { key: "tenant_name", title: t`Tenant` },- hasPii && { key: "ip_address", title: t`IP address` },- { key: "status", title: t`Status`, sort: "status" },- {- key: "duration_ms",- title: t`Duration (ms)`,- sort: "duration_ms",- align: "right",- render: (value) =>- value == null ? EMPTY_CELL_PLACEHOLDER : formatNumber(Number(value)),- },- hasPii && { key: "error_message", title: t`Error message` },- ];- return columns.filter((column): column is EventColumn => column !== false);-}--function renderCell(column: EventColumn, value: RowValue): ReactNode {- if (column.render) {- return column.render(value);- }- return value == null || value === "" ? EMPTY_CELL_PLACEHOLDER : String(value);-}--type PaginationProps = {- /** Current page, 0-indexed. */- page: number;- /** Total number of calls matching the filters (across all pages). */- total: number;- onPageChange: (page: number) => void;-};--type SortProps = {- sortingOptions: SortingOptions<CliEventSortColumn>;- onSortingOptionsChange: (- sortingOptions: SortingOptions<CliEventSortColumn>,- ) => void;-};--type Nullable<T> = { [K in keyof T]: T[K] | null };--// The audit metadata sources the inner table needs, all resolved.-type MetadataSources = {- provider: MetadataProvider;- table: TableMetadata | CardMetadata;- groupMembersTable: TableMetadata | CardMetadata;-};--type BaseProps = CliFilters &- PaginationProps &- SortProps & {- hasTenants: boolean;- hasPii: boolean;- };--// Sources are still loading in the outer props (hence nullable); the inner component only renders-// once they're resolved, so it takes them non-null.-type Props = BaseProps & Nullable<MetadataSources>;-type InnerProps = BaseProps & MetadataSources;--/**- * Retain the last non-nullish value so a component keeps rendering the previous result while the- * next one loads. RTK query hooks return `undefined` data mid-fetch; without this a consumer would- * blank out on every refetch.- */-function useRetainedValue<T>(value: T | undefined): T | undefined {- const ref = useRef(value);- if (value != null) {- ref.current = value;- }- return value ?? ref.current;-}--/**- * Row-level events table for the Events tab. Renders nothing until the audit metadata is- * loaded, then delegates to the inner component.- */-export function CliEventsTable({- provider,- table,- groupMembersTable,- ...rest-}: Props) {- if (!provider || !table || !groupMembersTable) {- return null;- }- return (- <CliEventsTableInner- provider={provider}- table={table}- groupMembersTable={groupMembersTable}- {...rest}- />- );-}--/**- * Loaded variant of {@link CliEventsTable}: builds the paginated, sorted row-level query, runs it,- * and renders the Agent API calls as a sortable table with pagination controls.- */-function CliEventsTableInner({- provider,- table,- groupMembersTable,- dateFilter,- userId,- groupId,- tenantId,- hasTenants,- hasPii,- page,- total,- onPageChange,- sortingOptions,- onSortingOptionsChange,-}: InnerProps) {- const query = useMemo(- () =>- buildEventsQuery({- provider,- table,- groupMembersTable,- dateFilter,- userId,- groupId,- tenantId,- sortColumn: sortingOptions.sort_column,- sortDirection: sortingOptions.sort_direction,- }),- [- provider,- table,- groupMembersTable,- dateFilter,- userId,- groupId,- tenantId,- sortingOptions,- ],- );-- const { data: latestData, isFetching } = useCliEventsQuery(- query,- page,- EVENTS_PAGE_SIZE,- );- // Retain the previous page while the next one loads, so the table doesn't blank out on every- // page or sort change; we overlay a spinner on the retained rows instead. From here on `data` is- // simply the warehouse result — the retention is an implementation detail of the hook.- const data = useRetainedValue(latestData);-- const columns = useMemo(- () => eventColumns(hasTenants, hasPii),- [hasTenants, hasPii],- );- const rows: RowValues[] = data?.data?.rows ?? [];- // The result columns (`data.data.cols`) are the full, warehouse-ordered set the query returns —- // not the curated `columns` we render. So we can't reuse the `columns` index; we map each curated- // column to its position in the result by name. Names are upper- or lower-cased depending on the- // warehouse (the audit DB is H2, which upper-cases; Postgres lower-cases), so match- // case-insensitively.- const columnIndex = useMemo(() => {- const cols = data?.data?.cols ?? [];- return new Map(cols.map((col, index) => [col.name.toLowerCase(), index]));- }, [data]);-- // Adapt the curated `columns` to the generic table: each render pulls its value out of the- // warehouse-ordered result row by the column's position in `columnIndex`.- const dataColumns = useMemo<- AdminDataTableColumn<RowValues, CliEventSortColumn>[]- >(- () =>- columns.map((column) => ({- key: column.key,- title: column.title,- sortKey: column.sort,- align: column.align,- render: (row) => {- const index = columnIndex.get(column.key);- const value = index != null ? row[index] : null;- return renderCell(column, value);- },- })),- [columns, columnIndex],- );-- return (- <AdminDataTable- columns={dataColumns}- rows={rows}- sorting={{ sortingOptions, onSortingOptionsChange }}- pagination={{- page,- pageSize: EVENTS_PAGE_SIZE,- total,- onPageChange,- showTotal: true,- }}- loading={isFetching}- emptyText={t`No calls found`}- maxBodyHeight="calc(100vh - 23rem)"- tableClassName={S.table}- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/nav.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/nav.tsxdeleted file mode 100644index b7e4f848fde..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/nav.tsx+++ /dev/null@@ -1,17 +0,0 @@-import { t } from "ttag";--import { AdminNavItem } from "metabase/admin/components/AdminNav";--/**- * The CLI analytics nav item, rendered as a child of the admin "Usage auditing" group- * (`metabot-analytics/nav`). Lives in EE-only code, so it's absent on OSS. Unlike MCP there's no- * enabled/disabled flag — the CLI page is always accessible whenever `audit_app` is present.- */-export function CliAnalyticsNavItem() {- return (- <AdminNavItem- label={t`CLI analytics`}- path="/admin/metabot/usage-auditing/cli"- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/routes.tsxdeleted file mode 100644index aab85620189..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/routes.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { Route } from "metabase/router";--import { CliAnalyticsPage } from "./components/CliAnalyticsPage";--/**- * The `/admin/metabot/usage-auditing/cli` route — nested under the `usage-auditing` namespace so- * the admin nav opens the "Usage auditing" folder (where the link lives) rather than the Metabot- * group. Wired into `PLUGIN_AUDIT` and only registered on EE instances with the `audit_app`- * feature, so navigating there renders nothing on OSS.- */-export function getCliAnalyticsRoutes() {- return (- <Route- key="cli-analytics"- path="usage-auditing/cli"- element={<CliAnalyticsPage />}- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/index.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/index.tsxindex 12de0321cb7..75d5b916e56 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/index.tsx@@ -8,19 +8,16 @@ import {} from "metabase/plugins";import { Menu } from "metabase/ui";import { isInternalUser } from "metabase/urls";+import { handleMetabotSlashCommand } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands";+import {+ getAiAuditingRoutes,+ getAiAuditingUpsellRoutes,+} from "metabase-enterprise/monitor/ai-auditing/routes";import { hasPremiumFeature } from "metabase-enterprise/settings";import type { User } from "metabase-types/api";-import { getCliAnalyticsRoutes } from "./cli-analytics/routes";import { InsightsLink } from "./components/InsightsLink";import { InsightsMenuItem } from "./components/InsightsMenuItem";-import { getMcpAnalyticsRoutes } from "./mcp-analytics/routes";-import { getMetabotAnalyticsNavItems } from "./metabot-analytics/nav";-import {- getAiAnalyticsRoutes,- getAiAnalyticsUpsellRoutes,-} from "./metabot-analytics/routes";-import { handleMetabotSlashCommand } from "./metabot-analytics/slash-commands";import { getUserMenuRoutes } from "./routes";import { isAuditDb } from "./utils";@@ -49,17 +46,10 @@ export function initializePlugin() {PLUGIN_AUDIT.isAuditDb = isAuditDb;PLUGIN_AUDIT.InsightsLink = InsightsLink;PLUGIN_AUDIT.InsightsMenuItem = InsightsMenuItem;- PLUGIN_AUDIT.getMcpAnalyticsRoutes = getMcpAnalyticsRoutes;- PLUGIN_AUDIT.getCliAnalyticsRoutes = getCliAnalyticsRoutes;- // Nav is registered for audit_app and decides Metabot (ai_controls) vs MCP (audit_app)- // children internally; only the routes split on ai_controls.- PLUGIN_AUDIT.getMetabotAnalyticsNavItems = getMetabotAnalyticsNavItems;- if (hasPremiumFeature("ai_controls")) {- PLUGIN_AUDIT.getAiAnalyticsRoutes = getAiAnalyticsRoutes;- } else {- PLUGIN_AUDIT.getAiAnalyticsRoutes = getAiAnalyticsUpsellRoutes;- }-+ PLUGIN_AUDIT.isAiAuditingEnabled = true;+ PLUGIN_AUDIT.getAiAuditingRoutes = hasPremiumFeature("ai_controls")+ ? getAiAuditingRoutes+ : getAiAuditingUpsellRoutes;PLUGIN_AUDIT.handleMetabotSlashCommand = handleMetabotSlashCommand;}}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/index.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/index.unit.spec.tsnew file mode 100644index 00000000000..47e81f395ad--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/index.unit.spec.ts@@ -0,0 +1,66 @@+import { PLUGIN_AUDIT, reinitialize } from "metabase/plugins";+import { hasPremiumFeature } from "metabase-enterprise/settings";++import {+ getAiAuditingRoutes,+ getAiAuditingUpsellRoutes,+} from "../monitor/ai-auditing/routes";++import { initializePlugin } from "./index";++jest.mock("metabase-enterprise/settings", () => ({+ hasPremiumFeature: jest.fn(),+}));++const mockHasPremiumFeature = jest.mocked(hasPremiumFeature);++const mockPremiumFeatures = ({+ auditApp,+ aiControls,+}: {+ auditApp: boolean;+ aiControls: boolean;+}) => {+ mockHasPremiumFeature.mockImplementation((feature) => {+ return (+ (feature === "audit_app" && auditApp) ||+ (feature === "ai_controls" && aiControls)+ );+ });+};++describe("metabase-enterprise/audit_app initializePlugin", () => {+ afterEach(() => {+ jest.clearAllMocks();+ reinitialize();+ });++ it("leaves the OSS AI Auditing defaults when audit_app is absent", () => {+ mockPremiumFeatures({ auditApp: false, aiControls: true });++ initializePlugin();++ expect(PLUGIN_AUDIT.isAiAuditingEnabled).toBe(false);+ expect(PLUGIN_AUDIT.getAiAuditingRoutes()).toBeNull();+ });++ it("registers the full AI Auditing routes when audit_app and ai_controls are present", () => {+ mockPremiumFeatures({ auditApp: true, aiControls: true });++ initializePlugin();++ expect(PLUGIN_AUDIT.isAiAuditingEnabled).toBe(true);+ expect(PLUGIN_AUDIT.getAiAuditingRoutes).toBe(getAiAuditingRoutes);+ expect(PLUGIN_AUDIT.getAiAuditingRoutes()).not.toBeNull();+ });++ it("registers the upsell routes when audit_app is present without ai_controls", () => {+ mockPremiumFeatures({ auditApp: true, aiControls: false });++ initializePlugin();++ expect(PLUGIN_AUDIT.isAiAuditingEnabled).toBe(true);+ expect(PLUGIN_AUDIT.getAiAuditingRoutes).toBe(getAiAuditingUpsellRoutes);+ expect(PLUGIN_AUDIT.getAiAuditingRoutes()).not.toBeNull();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.tsxdeleted file mode 100644index ba2ab486e59..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.tsx+++ /dev/null@@ -1,225 +0,0 @@-import { useEffect } from "react";-import { match } from "ts-pattern";-import { t } from "ttag";--import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";-import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";-import { useSetting } from "metabase/common/hooks";-import { useUrlState } from "metabase/common/hooks/use-url-state";-import { useLocation, useNavigate } from "metabase/router";-import { Flex, Loader, SimpleGrid, Stack, Tabs, Title } from "metabase/ui";--import {- // The shared audit filter bar; aliased since it has nothing to do with MCP "conversations".- ConversationFilters as McpToolCallsFilter,- useFilterOptions,-} from "../../metabot-analytics/components/ConversationFilters";-import { useAuditTable } from "../../metabot-analytics/hooks/useAuditTable";-import { VIEW_GROUP_MEMBERS, VIEW_MCP_TOOL_CALLS } from "../constants";-import { useMcpHasData } from "../hooks/useMcpHasData";-import { buildCallsByDayByStatusQuery } from "../query-utils";-import { mcpUrlStateConfig } from "../url-state";--import { McpAnalyticsEmptyState } from "./McpAnalyticsEmptyState";-import { McpBreakoutChart } from "./McpBreakoutChart";-import { McpCallsTimelineChart } from "./McpCallsTimelineChart";-import { McpEventsTable } from "./McpEventsTable";--/**- * Admin MCP analytics page. Renders live ad-hoc queries over the `v_mcp_tool_calls` audit view- * across two tabs (Charts and a row-level Events table), sharing URL-state date/user/group- * filters. Shows a single empty state (no tabs) when the filtered view has no activity.- */-export function McpAnalyticsPage() {- const location = useLocation();- const navigate = useNavigate();- const [- { date, user, group, tenant, tab, page, sort_column, sort_direction },- { patchUrlState },- ] = useUrlState(location, mcpUrlStateConfig);-- const {- dateFilter,- userId,- groupId,- tenantId,- groupNoFilterValue,- userOptions,- groupOptions,- tenantOptions,- hasTenants,- } = useFilterOptions({ date, user, group, tenant });-- // IP address and error message are PII (null unless retention is on), so only surface those- // columns when they're collected.- const hasPii = useSetting("analytics-pii-retention-enabled") === true;- // The MCP server can be turned off while its historical analytics still exist; when it's off the- // page is inaccessible (the nav item greys out — this also blocks direct URL access).- const mcpEnabled = useSetting("mcp-enabled?");-- const toolCallsAudit = useAuditTable(VIEW_MCP_TOOL_CALLS);- const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);-- const dataSources = {- provider: toolCallsAudit.provider,- table: toolCallsAudit.table,- groupMembersTable: groupMembersAudit.table,- };-- const chartFilters = { dateFilter, userId, groupId, tenantId };-- const { isInitialLoading, isRefetching, hasData, count } = useMcpHasData({- ...dataSources,- ...chartFilters,- });- // Initial load shows a loader (never the empty state). After the first result, a filter- // change keeps the charts mounted so they show their own skeletons while refetching; the- // empty state only appears once a load has resolved to zero rows.- const showEmpty = !isInitialLoading && !isRefetching && !hasData;-- // Only surface the errors section when the current filters actually match failed calls, so a- // healthy instance doesn't show a row of empty error charts.- const { hasData: hasErrors } = useMcpHasData({- ...dataSources,- ...chartFilters,- errorsOnly: true,- });-- // The MCP server can be off while its historical analytics still exist; when it's off the page- // is inaccessible — redirect away so it can't be reached by URL (the nav item also greys out).- useEffect(() => {- if (!mcpEnabled) {- navigate("/admin/metabot/usage-auditing", { replace: true });- }- }, [mcpEnabled, navigate]);-- if (!mcpEnabled) {- return null;- }-- return (- <MetabotAdminLayout fullWidth>- <SettingsPageWrapper mt="sm">- <Flex align="center" justify="space-between">- <Title order={2}>{t`MCP analytics`}</Title>-- <McpToolCallsFilter- date={date}- onDateChange={(val) => patchUrlState({ date: val, page: 0 })}- user={user}- onUserChange={(val) => patchUrlState({ user: val, page: 0 })}- userOptions={userOptions}- group={group}- onGroupChange={(val) => patchUrlState({ group: val, page: 0 })}- groupOptions={groupOptions}- groupNoFilterValue={groupNoFilterValue}- tenant={tenant}- onTenantChange={(val) => patchUrlState({ tenant: val, page: 0 })}- tenantOptions={tenantOptions}- hasTenants={hasTenants}- />- </Flex>-- {match({ isInitialLoading, showEmpty })- .with({ isInitialLoading: true }, () => (- <Flex mih="60vh" align="center" justify="center">- <Loader size="lg" />- </Flex>- ))- .with({ showEmpty: true }, () => <McpAnalyticsEmptyState />)- .otherwise(() => (- <Tabs- value={tab}- onChange={(value) => patchUrlState({ tab: value ?? undefined })}- keepMounted={false}- >- <Tabs.List mb="lg">- <Tabs.Tab value="charts">{t`Usage`}</Tabs.Tab>- <Tabs.Tab value="events">{t`Tool calls`}</Tabs.Tab>- </Tabs.List>-- <Tabs.Panel value="charts">- <Stack gap="lg">- <McpCallsTimelineChart- {...dataSources}- {...chartFilters}- title={t`Calls by client over time`}- />- <SimpleGrid cols={2} spacing="lg">- <McpBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Calls by tool`}- display="pie"- breakoutColumn="tool_name"- h={500}- />- <McpBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Calls by user`}- display="row"- breakoutColumn="user_display_name"- h={500}- />- </SimpleGrid>-- {hasErrors && (- <>- <Title order={3} mt="md">{t`Errors`}</Title>- <McpCallsTimelineChart- {...dataSources}- {...chartFilters}- title={t`Calls by status over time`}- buildQuery={buildCallsByDayByStatusQuery}- />- <SimpleGrid cols={2} spacing="lg">- <McpBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Errors by type`}- display="pie"- breakoutColumn="error_type"- errorsOnly- h={500}- />- <McpBreakoutChart- {...dataSources}- {...chartFilters}- title={t`Errors by tool`}- display="row"- breakoutColumn="tool_name"- errorsOnly- h={500}- />- </SimpleGrid>- </>- )}- </Stack>- </Tabs.Panel>-- <Tabs.Panel value="events">- <McpEventsTable- {...dataSources}- {...chartFilters}- hasTenants={hasTenants}- hasPii={hasPii}- page={page}- total={count}- onPageChange={(newPage) => patchUrlState({ page: newPage })}- sortingOptions={{ sort_column, sort_direction }}- onSortingOptionsChange={(newSorting) =>- patchUrlState({- sort_column: newSorting.sort_column,- sort_direction: newSorting.sort_direction,- page: 0,- })- }- />- </Tabs.Panel>- </Tabs>- ))}- </SettingsPageWrapper>- </MetabotAdminLayout>- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.module.cssdeleted file mode 100644index ade0d89e392..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.module.css+++ /dev/null@@ -1,8 +0,0 @@-/* Tool-call rows can hold long values (ids, user agents, error text); keep them on one line so the- body scrolls horizontally rather than wrapping into tall, hard-to-scan rows. */-.table thead th,-.table thead th *,-.table td,-.table th {- white-space: nowrap;-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.tsxdeleted file mode 100644index 7a5f19088c8..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.tsx+++ /dev/null@@ -1,275 +0,0 @@-import { type ReactNode, useMemo, useRef } from "react";-import { t } from "ttag";--import {- AdminDataTable,- type AdminDataTableColumn,-} from "metabase/admin/components/AdminDataTable";-import { DateTime } from "metabase/common/components/DateTime";-import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatNumber } from "metabase/utils/formatting";-import type {- CardMetadata,- MetadataProvider,- TableMetadata,-} from "metabase-lib";-import type { RowValue, RowValues, SortingOptions } from "metabase-types/api";--import { useMcpEventsQuery } from "../hooks/useMcpEventsQuery";-import type { McpEventSortColumn, McpFilters } from "../query-utils";-import { buildEventsQuery } from "../query-utils";--import S from "./McpEventsTable.module.css";--export const EVENTS_PAGE_SIZE = 25;--type EventColumn = {- /** View column name, matched case-insensitively against the result columns. */- key: string;- title: string;- /** Present when the column can be sorted server-side. */- sort?: McpEventSortColumn;- align?: "right";- render?: (value: RowValue) => ReactNode;-};--/**- * The curated columns surfaced in the events table, in display order. Only these are ever- * rendered — every other view column (raw ids, client_name, user_agent, …) stays hidden by- * construction, so nothing sensitive can leak. `tenant_name` shows only when tenants are enabled;- * `ip_address`/`error_message` only when PII retention is on (they're null otherwise).- */-export function eventColumns(- hasTenants: boolean,- hasPii: boolean,-): EventColumn[] {- const columns: (EventColumn | false)[] = [- { key: "tool_call_id", title: t`ID` },- {- key: "created_at",- title: t`Created at`,- sort: "created_at",- render: (value) =>- value == null ? (- EMPTY_CELL_PLACEHOLDER- ) : (- <DateTime value={String(value)} />- ),- },- { key: "tool_name", title: t`Tool`, sort: "tool_name" },- {- key: "client_display_name",- title: t`Client`,- sort: "client_display_name",- },- { key: "client_version", title: t`Client version` },- { key: "user_display_name", title: t`User`, sort: "user_display_name" },- hasTenants && { key: "tenant_name", title: t`Tenant` },- hasPii && { key: "ip_address", title: t`IP address` },- { key: "status", title: t`Status`, sort: "status" },- {- key: "duration_ms",- title: t`Duration (ms)`,- sort: "duration_ms",- align: "right",- render: (value) =>- value == null ? EMPTY_CELL_PLACEHOLDER : formatNumber(Number(value)),- },- { key: "error_type", title: t`Error type` },- hasPii && { key: "error_message", title: t`Error message` },- ];- return columns.filter((column): column is EventColumn => column !== false);-}--function renderCell(column: EventColumn, value: RowValue): ReactNode {- if (column.render) {- return column.render(value);- }- return value == null || value === "" ? EMPTY_CELL_PLACEHOLDER : String(value);-}--type PaginationProps = {- /** Current page, 0-indexed. */- page: number;- /** Total number of tool calls matching the filters (across all pages). */- total: number;- onPageChange: (page: number) => void;-};--type SortProps = {- sortingOptions: SortingOptions<McpEventSortColumn>;- onSortingOptionsChange: (- sortingOptions: SortingOptions<McpEventSortColumn>,- ) => void;-};--type Nullable<T> = { [K in keyof T]: T[K] | null };--// The audit metadata sources the inner table needs, all resolved.-type MetadataSources = {- provider: MetadataProvider;- table: TableMetadata | CardMetadata;- groupMembersTable: TableMetadata | CardMetadata;-};--type BaseProps = McpFilters &- PaginationProps &- SortProps & {- hasTenants: boolean;- hasPii: boolean;- };--// Sources are still loading in the outer props (hence nullable); the inner component only renders-// once they're resolved, so it takes them non-null.-type Props = BaseProps & Nullable<MetadataSources>;-type InnerProps = BaseProps & MetadataSources;--/**- * Retain the last non-nullish value so a component keeps rendering the previous result while the- * next one loads. RTK query hooks return `undefined` data mid-fetch; without this a consumer would- * blank out on every refetch.- */-function useRetainedValue<T>(value: T | undefined): T | undefined {- const ref = useRef(value);- if (value != null) {- ref.current = value;- }- return value ?? ref.current;-}--/**- * Row-level events table for the Events tab. Renders nothing until the audit metadata is- * loaded, then delegates to the inner component.- */-export function McpEventsTable({- provider,- table,- groupMembersTable,- ...rest-}: Props) {- if (!provider || !table || !groupMembersTable) {- return null;- }- return (- <McpEventsTableInner- provider={provider}- table={table}- groupMembersTable={groupMembersTable}- {...rest}- />- );-}--/**- * Loaded variant of {@link McpEventsTable}: builds the paginated, sorted row-level query, runs it,- * and renders the tool calls as a sortable table with pagination controls.- */-function McpEventsTableInner({- provider,- table,- groupMembersTable,- dateFilter,- userId,- groupId,- tenantId,- hasTenants,- hasPii,- page,- total,- onPageChange,- sortingOptions,- onSortingOptionsChange,-}: InnerProps) {- const query = useMemo(- () =>- buildEventsQuery({- provider,- table,- groupMembersTable,- dateFilter,- userId,- groupId,- tenantId,- sortColumn: sortingOptions.sort_column,- sortDirection: sortingOptions.sort_direction,- }),- // Depend on the primitive sort values, not the `sortingOptions` object: the object identity- // changes on every render of the parent, but rebuilding the query mints fresh metabase-lib- // UUIDs, which churn the RTK cache key and cause a redundant refetch on incidental re-renders.- [- provider,- table,- groupMembersTable,- dateFilter,- userId,- groupId,- tenantId,- sortingOptions.sort_column,- sortingOptions.sort_direction,- ],- );-- const { data: latestData, isFetching } = useMcpEventsQuery(- query,- page,- EVENTS_PAGE_SIZE,- );- // Retain the previous page while the next one loads, so the table doesn't blank out on every- // page or sort change; we overlay a spinner on the retained rows instead. From here on `data` is- // simply the warehouse result — the retention is an implementation detail of the hook.- const data = useRetainedValue(latestData);-- const columns = useMemo(- () => eventColumns(hasTenants, hasPii),- [hasTenants, hasPii],- );- const rows: RowValues[] = data?.data?.rows ?? [];- // The result columns (`data.data.cols`) are the full, warehouse-ordered set the query returns —- // not the curated `columns` we render. So we can't reuse the `columns` index; we map each curated- // column to its position in the result by name. Names are upper- or lower-cased depending on the- // warehouse (the audit DB is H2, which upper-cases; Postgres lower-cases), so match- // case-insensitively.- const columnIndex = useMemo(() => {- const cols = data?.data?.cols ?? [];- return new Map(cols.map((col, index) => [col.name.toLowerCase(), index]));- }, [data]);-- // Adapt the curated `columns` to the generic table: each render pulls its value out of the- // warehouse-ordered result row by the column's position in `columnIndex`.- const dataColumns = useMemo<- AdminDataTableColumn<RowValues, McpEventSortColumn>[]- >(- () =>- columns.map((column) => ({- key: column.key,- title: column.title,- sortKey: column.sort,- align: column.align,- render: (row) => {- const index = columnIndex.get(column.key);- const value = index != null ? row[index] : null;- return renderCell(column, value);- },- })),- [columns, columnIndex],- );-- return (- <AdminDataTable- columns={dataColumns}- rows={rows}- sorting={{ sortingOptions, onSortingOptionsChange }}- pagination={{- page,- pageSize: EVENTS_PAGE_SIZE,- total,- onPageChange,- showTotal: true,- }}- loading={isFetching}- emptyText={t`No tool calls found`}- maxBodyHeight="calc(100vh - 23rem)"- tableClassName={S.table}- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/nav.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/nav.tsxdeleted file mode 100644index 41d4f3dab13..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/nav.tsx+++ /dev/null@@ -1,18 +0,0 @@-import { t } from "ttag";--import { AdminNavItem } from "metabase/admin/components/AdminNav";--/**- * The MCP analytics nav item, rendered as a child of the admin "Usage auditing" group- * (`metabot-analytics/nav`). Lives in EE-only code, so it's absent on OSS. Disabled (greyed) when- * the MCP server is off — matching the route guard that redirects away from the page.- */-export function McpAnalyticsNavItem({ mcpEnabled }: { mcpEnabled: boolean }) {- return (- <AdminNavItem- label={t`MCP analytics`}- path="/admin/metabot/usage-auditing/mcp"- disabled={!mcpEnabled}- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/routes.tsxdeleted file mode 100644index 647c0fbd45b..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/routes.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { Route } from "metabase/router";--import { McpAnalyticsPage } from "./components/McpAnalyticsPage";--/**- * The `/admin/metabot/usage-auditing/mcp` route — nested under the `usage-auditing` namespace so- * the admin nav opens the "Usage auditing" folder (where the link lives) rather than the MCP- * group. Wired into `PLUGIN_AUDIT` and only registered on EE instances with the `audit_app`- * feature, so navigating there renders nothing on OSS.- */-export function getMcpAnalyticsRoutes() {- return (- <Route- key="mcp-analytics"- path="usage-auditing/mcp"- element={<McpAnalyticsPage />}- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.module.cssdeleted file mode 100644index 031178ad1df..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.module.css+++ /dev/null@@ -1,17 +0,0 @@-.metricTabs {- gap: 1rem;-}--.metricTab {- color: var(--mb-color-text-secondary);- border-radius: 99px;-- &[data-orientation="horizontal"] {- padding-inline: 0.75rem;- }-- &[data-active="true"] {- color: var(--mb-color-core-brand);- background-color: var(--mb-color-background_surface-brand-subtle);- }-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsxdeleted file mode 100644index a0f586e8c26..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx+++ /dev/null@@ -1,99 +0,0 @@-import { useMemo } from "react";-import { t } from "ttag";--import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";-import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";-import { useUrlState } from "metabase/common/hooks/use-url-state";-import { useLocation } from "metabase/router";-import { Flex, Title } from "metabase/ui";--import { useListMetabotAnalyticsConversationsQuery } from "../../api";-import { ConversationFilters, useFilterOptions } from "../ConversationFilters";--import { ConversationsTable } from "./ConversationsTable";-import { PAGE_SIZE, urlStateConfig } from "./utils";--export function ConversationsPage() {- const location = useLocation();- const [- { page, sort_column, sort_direction, date, user, group, tenant },- { patchUrlState },- ] = useUrlState(location, urlStateConfig);-- const {- userId,- groupId,- groupNoFilterValue,- tenantId,- userOptions,- groupOptions,- tenantOptions,- hasTenants,- } = useFilterOptions({ date, user, group, tenant });-- const {- data: conversationsData,- isLoading,- error,- } = useListMetabotAnalyticsConversationsQuery(- {- limit: PAGE_SIZE,- offset: page * PAGE_SIZE,- sort_by: sort_column,- sort_dir: sort_direction,- user_id: userId,- group_id: groupId,- tenant_id: tenantId,- date: date ?? undefined,- },- { refetchOnMountOrArgChange: true },- );-- const conversations = useMemo(- () => conversationsData?.data ?? [],- [conversationsData],- );- const total = conversationsData?.total ?? 0;-- return (- <MetabotAdminLayout fullWidth>- <SettingsPageWrapper mt="sm">- <Flex align="center" justify="space-between">- <Title order={2} display="flex" style={{ alignItems: "center" }}>- {t`Conversations`}- </Title>-- <ConversationFilters- date={date}- onDateChange={(val) => patchUrlState({ date: val, page: 0 })}- user={user}- onUserChange={(val) => patchUrlState({ user: val, page: 0 })}- group={group}- onGroupChange={(val) => patchUrlState({ group: val, page: 0 })}- groupNoFilterValue={groupNoFilterValue}- tenant={tenant}- onTenantChange={(val) => patchUrlState({ tenant: val, page: 0 })}- userOptions={userOptions}- groupOptions={groupOptions}- tenantOptions={tenantOptions}- hasTenants={hasTenants}- />- </Flex>-- <ConversationsTable- conversations={conversations}- isLoading={isLoading}- error={error}- sortingOptions={{ sort_column, sort_direction }}- onSortingOptionsChange={(newSortingOptions) =>- patchUrlState({ ...newSortingOptions, page: 0 })- }- page={page}- pageSize={PAGE_SIZE}- total={total}- onPageChange={(newPage) => patchUrlState({ page: newPage })}- />- </SettingsPageWrapper>- </MetabotAdminLayout>- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsxdeleted file mode 100644index c804724aaef..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx+++ /dev/null@@ -1,149 +0,0 @@-import { t } from "ttag";--import {- AdminDataTable,- type AdminDataTableColumn,-} from "metabase/admin/components/AdminDataTable";-import { DateTime } from "metabase/common/components/DateTime";-import { renderMetabotProfileLabel } from "metabase/metabot/constants";-import { useDispatch } from "metabase/redux";-import { push } from "metabase/router";-import { Badge, Ellipsified, Tooltip } from "metabase/ui";-import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatNumber } from "metabase/utils/formatting";-import { getUserName } from "metabase/utils/user";-import type { SortingOptions } from "metabase-types/api";--import type { ConversationSortColumn, ConversationSummary } from "../../types";--type Props = {- conversations: ConversationSummary[];- isLoading: boolean;- error: unknown;- sortingOptions: SortingOptions<ConversationSortColumn>;- onSortingOptionsChange: (- options: SortingOptions<ConversationSortColumn>,- ) => void;- page: number;- pageSize: number;- total: number;- onPageChange: (page: number) => void;-};--export function ConversationsTable({- conversations,- isLoading,- error,- sortingOptions,- onSortingOptionsChange,- page,- pageSize,- total,- onPageChange,-}: Props) {- const dispatch = useDispatch();-- const columns: AdminDataTableColumn<- ConversationSummary,- ConversationSortColumn- >[] = [- {- key: "title",- title: t`Title`,- render: (convo) => (- <Ellipsified style={{ maxWidth: 280 }}>- {convo.title ?? t`Untitled`}- </Ellipsified>- ),- },- {- key: "user",- title: t`User`,- sortKey: "user",- render: (convo) => (convo.user ? getUserName(convo.user) : t`Unknown`),- },- {- key: "profile_id",- title: t`Profile`,- sortKey: "profile_id",- render: (convo) =>- convo.profile_id ? (- <Badge color="brand" variant="filled">- {renderMetabotProfileLabel(convo.profile_id)}- </Badge>- ) : null,- },- {- key: "created_at",- title: t`Date`,- sortKey: "created_at",- render: (convo) => (- <Ellipsified style={{ maxWidth: 180 }}>- <DateTime value={convo.created_at} unit="day" />- </Ellipsified>- ),- },- {- key: "message_count",- title: t`Messages`,- sortKey: "message_count",- headerProps: { style: { width: "5rem" } },- render: (convo) => formatNumber(convo.message_count),- },- {- key: "total_tokens",- title: t`Tokens`,- sortKey: "total_tokens",- render: (convo) => formatNumber(convo.total_tokens),- },- {- key: "cache_read_tokens",- title: (- <Tooltip- label={t`Portion of tokens served from the provider cache. A subset of Tokens, not an additional count.`}- >- <span>{t`Cached tokens`}</span>- </Tooltip>- ),- sortKey: "cache_read_tokens",- render: (convo) => formatNumber(convo.cache_read_tokens),- },- {- key: "query_count",- title: t`Queries`,- render: (convo) => formatNumber(convo.query_count),- },- {- key: "search_count",- title: t`Searches`,- render: (convo) => formatNumber(convo.search_count),- },- {- key: "ip_address",- title: t`IP`,- sortKey: "ip_address",- render: (convo) => convo.ip_address ?? EMPTY_CELL_PLACEHOLDER,- },- ];-- return (- <AdminDataTable- columns={columns}- rows={conversations}- getRowKey={(convo) => convo.conversation_id}- sorting={{ sortingOptions, onSortingOptionsChange }}- pagination={{ page, pageSize, total, onPageChange }}- loading={isLoading}- error={error}- emptyText={t`No conversations found`}- maxBodyHeight="calc(100vh - 20rem)"- onRowClick={(convo) =>- dispatch(- push(- `/admin/metabot/usage-auditing/conversations/${convo.conversation_id}`,- ),- )- }- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/nav.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/nav.tsxdeleted file mode 100644index be34a6a2241..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/nav.tsx+++ /dev/null@@ -1,63 +0,0 @@-import { t } from "ttag";--import { AdminNavItem } from "metabase/admin/components/AdminNav";-import { UpsellGem } from "metabase/common/components/upsells/components";-import { useSetting } from "metabase/common/hooks";-import { hasPremiumFeature } from "metabase-enterprise/settings";--import { CliAnalyticsNavItem } from "../cli-analytics/nav";-import { McpAnalyticsNavItem } from "../mcp-analytics/nav";--export function getMetabotAnalyticsNavItems() {- return <MetabotAnalyticsNavItems />;-}--/**- * The admin "Auditing" nav folder, registered under `audit_app`, so the folder and its- * `audit_app`-gated MCP child appear whenever `audit_app` is present. The Metabot "Usage- * stats"/Conversations children additionally need `ai-features-enabled?` and `ai_controls`;- * without `ai_controls` an upsell-gem "Usage stats" stub is shown instead. `ai-features-enabled?`- * gates only the Metabot children — never the folder, the upsell, or the MCP child.- */-function MetabotAnalyticsNavItems() {- const isConfigured = useSetting("llm-metabot-configured?");- const areAiFeaturesEnabled = useSetting("ai-features-enabled?");- const mcpEnabled = useSetting("mcp-enabled?");- const hasAiControls = hasPremiumFeature("ai_controls");-- const showMetabotStats = areAiFeaturesEnabled && hasAiControls;-- return (- <AdminNavItem- icon="audit"- label={t`Auditing`}- folderPattern="usage-auditing"- disabled={!isConfigured}- >- {showMetabotStats ? (- <>- <AdminNavItem- label={t`Usage stats`}- path="/admin/metabot/usage-auditing"- disabled={!isConfigured}- />- <AdminNavItem- label={t`Conversations`}- path="/admin/metabot/usage-auditing/conversations"- disabled={!isConfigured}- />- </>- ) : (- !hasAiControls && (- <AdminNavItem- label={t`Usage stats`}- path="/admin/metabot/usage-auditing"- rightSection={<UpsellGem.New size={14} />}- />- )- )}- <McpAnalyticsNavItem mcpEnabled={mcpEnabled} />- <CliAnalyticsNavItem />- </AdminNavItem>- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsxdeleted file mode 100644index 175d8e3a82f..00000000000--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsx+++ /dev/null@@ -1,29 +0,0 @@-import { Route } from "metabase/router";--import { ConversationDetailPage } from "./components/ConversationDetailPage";-import { ConversationStatsPage } from "./components/ConversationStatsPage";-import { ConversationsPage } from "./components/ConversationsPage";-import { MetabotAnalyticsUpsellPage } from "./components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage";--export function getAiAnalyticsRoutes() {- return (- <Route key="usage-auditing" path="usage-auditing">- <Route index element={<ConversationStatsPage />} />- <Route path="conversations" element={<ConversationsPage />} />- <Route- path="conversations/:convoId"- element={<ConversationDetailPage />}- />- </Route>- );-}--export function getAiAnalyticsUpsellRoutes() {- return (- <Route- key="usage-auditing"- path="usage-auditing"- element={<MetabotAnalyticsUpsellPage />}- />- );-}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsEmptyState.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsEmptyState.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsEmptyState.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.tsxnew file mode 100644index 00000000000..ed5a9b8314d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.tsx@@ -0,0 +1,252 @@+import { useMemo } from "react";+import { match } from "ts-pattern";+import { t } from "ttag";++import { useSetting } from "metabase/common/hooks";+import { useUrlState } from "metabase/common/hooks/use-url-state";+import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { useLocation } from "metabase/router";+import { Flex, Loader, SimpleGrid, Stack, Tabs, Title } from "metabase/ui";+import {+ VIEW_AGENT_API_CALLS,+ VIEW_GROUP_MEMBERS,+} from "metabase-enterprise/monitor/ai-auditing/cli-analytics/constants";+import { useCliHasData } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliHasData";+import { buildCallsByDayByStatusQuery } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import type { CliTab } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/url-state";+import { cliUrlStateConfig } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/url-state";+import {+ // The shared audit filter bar; aliased since it has nothing to do with Metabot "conversations".+ ConversationFilters as CliCallsFilter,+ useFilterOptions,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters";+import { useAuditTable } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable";++import { CliAnalyticsEmptyState } from "./CliAnalyticsEmptyState";+import { CliBreakoutChart } from "./CliBreakoutChart";+import { CliCallerLivenessTable } from "./CliCallerLivenessTable";+import { CliCallsTimelineChart } from "./CliCallsTimelineChart";+import { CliEventsTable } from "./CliEventsTable";++/**+ * AI Auditing CLI analytics page. Renders live ad-hoc queries over the `v_agent_api_calls` audit view+ * across two tabs (Charts and a row-level Calls table), sharing URL-state date/user/group+ * filters. Shows a single empty state (no tabs) when the filtered view has no activity.+ */+export function CliAnalyticsPage() {+ const location = useLocation();+ const [+ { date, user, group, tenant, tab, page, sort_column, sort_direction },+ { patchUrlState },+ ] = useUrlState(location, cliUrlStateConfig);++ const {+ dateFilter,+ userId,+ groupId,+ tenantId,+ groupNoFilterValue,+ userOptions,+ groupOptions,+ tenantOptions,+ hasTenants,+ } = useFilterOptions({ date, user, group, tenant });++ const hasPii = useSetting("analytics-pii-retention-enabled") === true;++ const callsAudit = useAuditTable(VIEW_AGENT_API_CALLS);+ const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);++ const dataSources = {+ provider: callsAudit.provider,+ table: callsAudit.table,+ groupMembersTable: groupMembersAudit.table,+ };++ const chartFilters = { dateFilter, userId, groupId, tenantId };++ const sortingOptions = useMemo(+ () => ({ sort_column, sort_direction }),+ [sort_column, sort_direction],+ );++ const { isInitialLoading, isRefetching, hasData, count } = useCliHasData({+ ...dataSources,+ ...chartFilters,+ });+ const showEmpty = !isInitialLoading && !isRefetching && !hasData;++ // Only surface the errors section when the current filters actually match failed calls, so a+ // healthy instance doesn't show a row of empty error charts.+ const { hasData: hasErrors } = useCliHasData({+ ...dataSources,+ ...chartFilters,+ errorsOnly: true,+ });++ // The Calls tab is a data grid that should scroll internally.+ const isEventsTab = tab === "events";++ const content = (+ <MonitorMain>+ <Stack gap="lg" {...(isEventsTab ? { flex: 1, mih: 0 } : {})}>+ <MonitorHeaderTitle>{t`CLI analytics`}</MonitorHeaderTitle>++ <Tabs+ variant="pills"+ value={tab}+ // tab/val _is_ a CliTab, but Mantine's Tab only deals with strings ¯\_(ツ)_/¯+ onChange={(val) => patchUrlState({ tab: val as CliTab })}+ keepMounted={false}+ {...(isEventsTab+ ? {+ flex: 1,+ mih: 0,+ display: "flex",+ style: { flexDirection: "column" as const },+ }+ : {})}+ >+ <Tabs.List mb="md">+ <Tabs.Tab value="charts">{t`Usage`}</Tabs.Tab>+ <Tabs.Tab value="events">{t`Calls`}</Tabs.Tab>+ </Tabs.List>++ <CliCallsFilter+ date={date}+ onDateChange={(val) => patchUrlState({ date: val, page: 0 })}+ user={user}+ onUserChange={(val) => patchUrlState({ user: val, page: 0 })}+ userOptions={userOptions}+ group={group}+ onGroupChange={(val) => patchUrlState({ group: val, page: 0 })}+ groupOptions={groupOptions}+ groupNoFilterValue={groupNoFilterValue}+ tenant={tenant}+ onTenantChange={(val) => patchUrlState({ tenant: val, page: 0 })}+ tenantOptions={tenantOptions}+ hasTenants={hasTenants}+ />++ {match({ isInitialLoading, showEmpty })+ .with({ isInitialLoading: true }, () => (+ <Tabs.Panel value={tab} mt="md">+ <Flex mih="60vh" align="center" justify="center">+ <Loader size="lg" />+ </Flex>+ </Tabs.Panel>+ ))+ .with({ showEmpty: true }, () => (+ <Tabs.Panel value={tab} mt="md">+ <CliAnalyticsEmptyState />+ </Tabs.Panel>+ ))+ .otherwise(() => (+ <>+ <Tabs.Panel value="charts" mt="md">+ <Stack gap="lg">+ <CliCallsTimelineChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by client over time`}+ />+ <SimpleGrid cols={2} spacing="lg">+ <CliBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by client`}+ display="pie"+ breakoutColumn="client_display_name"+ h={500}+ />+ <CliBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by operation`}+ display="row"+ breakoutColumn="operation"+ h={500}+ />+ </SimpleGrid>+ <SimpleGrid cols={2} spacing="lg">+ <CliBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by user`}+ display="row"+ breakoutColumn="user_display_name"+ h={500}+ />+ <CliCallerLivenessTable+ {...dataSources}+ {...chartFilters}+ title={t`User activity`}+ h={500}+ />+ </SimpleGrid>++ {hasErrors && (+ <>+ <Title order={3} mt="md">{t`Errors`}</Title>+ <CliCallsTimelineChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by status over time`}+ buildQuery={buildCallsByDayByStatusQuery}+ />+ <CliBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Errors by operation`}+ display="row"+ breakoutColumn="operation"+ errorsOnly+ h={500}+ />+ </>+ )}+ </Stack>+ </Tabs.Panel>++ <Tabs.Panel+ value="events"+ mt="md"+ flex={1}+ mih={0}+ display="flex"+ style={{ flexDirection: "column" }}+ >+ <CliEventsTable+ {...dataSources}+ {...chartFilters}+ hasTenants={hasTenants}+ hasPii={hasPii}+ page={page}+ total={count}+ onPageChange={(newPage) => patchUrlState({ page: newPage })}+ sortingOptions={sortingOptions}+ onSortingOptionsChange={(newSorting) =>+ patchUrlState({+ sort_column: newSorting.sort_column,+ sort_direction: newSorting.sort_direction,+ page: 0,+ })+ }+ />+ </Tabs.Panel>+ </>+ ))}+ </Tabs>+ </Stack>+ </MonitorMain>+ );++ return isEventsTab ? (+ <Flex h="100%" wrap="nowrap">+ {content}+ </Flex>+ ) : (+ content+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.unit.spec.tsxsimilarity index 82%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.unit.spec.tsxindex 1cd53083911..972673db757 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliAnalyticsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsPage.unit.spec.tsx@@ -7,10 +7,17 @@ import {setupUsersEndpoints,} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import {+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";import { registerVisualizations } from "metabase/visualizations/register";+import { AUDIT_DB_ID } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/constants";import type { Database, Dataset, Field } from "metabase-types/api";import {createMockColumn,@@ -24,8 +31,6 @@ import {createMockUser,} from "metabase-types/api/mocks";-import { AUDIT_DB_ID } from "../constants";-import { CliAnalyticsPage } from "./CliAnalyticsPage";registerVisualizations();@@ -151,16 +156,16 @@ function setupEndpoints(dataset: Dataset = datasetResponse) {/** Render `CliAnalyticsPage` at its route with EE plugins + `audit_app`, optionally overriding the dataset response. */function setup({ dataset }: { dataset?: Dataset } = {}) {+ // TreeTable measures column/row sizes via the DOM; jsdom needs a stubbed rect+ // for its virtualized rows to render.+ mockGetBoundingClientRect({ width: 100, height: 100 });setupEnterprisePlugins();setupEndpoints(dataset);return renderWithProviders(- <Route- path="/admin/metabot/usage-auditing/cli"- element={<CliAnalyticsPage />}- />,+ <Route path="/monitor/ai-auditing/cli" element={<CliAnalyticsPage />} />,{- initialRoute: "/admin/metabot/usage-auditing/cli",+ initialRoute: "/monitor/ai-auditing/cli",withRouter: true,storeInitialState: createMockState({settings: mockSettings({@@ -202,15 +207,21 @@ describe("CliAnalyticsPage", () => {await userEvent.click(await screen.findByRole("tab", { name: "Calls" }));const eventsPanel = screen.getByRole("tabpanel");- expect(await within(eventsPanel).findByRole("table")).toBeInTheDocument();+ expect(+ await within(eventsPanel).findByRole("treegrid", { name: "Calls" }),+ ).toBeInTheDocument();// a curated column header and a cell value from the mocked page render- expect(within(eventsPanel).getByText("Operation")).toBeInTheDocument();+ expect(+ await within(eventsPanel).findByRole("columnheader", {+ name: "Operation",+ }),+ ).toBeInTheDocument();expect(await within(eventsPanel).findByText("POST /api/agent/v1/query"),).toBeInTheDocument();});- it("shows a single empty state (no tabs, no charts) when there is no activity", async () => {+ it("keeps the header, tabs, and filters visible and shows an empty state in place of the tab content when there is no activity", async () => {setup({ dataset: emptyDatasetResponse });expect(@@ -218,12 +229,16 @@ describe("CliAnalyticsPage", () => {).toBeInTheDocument();expect(await screen.findByText("No CLI activity")).toBeInTheDocument();- // No tabs render when the view is empty — so neither the charts nor the events table can.- expect(- screen.queryByRole("tab", { name: "Usage" }),- ).not.toBeInTheDocument();+ // Tabs and filters stay visible even when the view is empty — only the tab content swaps out.+ const usageTab = screen.getByRole("tab", { name: "Usage" });+ expect(usageTab).toBeInTheDocument();+ expect(screen.getByRole("tab", { name: "Calls" })).toBeInTheDocument();expect(- screen.queryByRole("tab", { name: "Calls" }),- ).not.toBeInTheDocument();+ screen.getByTestId("conversation-filters-date-select"),+ ).toBeInTheDocument();++ const panel = screen.getByRole("tabpanel");+ expect(usageTab).toHaveAttribute("aria-controls", panel.id);+ expect(within(panel).getByText("No CLI activity")).toBeInTheDocument();});});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliBreakoutChart.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliBreakoutChart.tsxsimilarity index 83%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliBreakoutChart.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliBreakoutChart.tsxindex f73a739755e..2e3b7910199 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliBreakoutChart.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliBreakoutChart.tsx@@ -2,6 +2,15 @@ import { useMemo } from "react";import { t } from "ttag";import { Skeleton, useMantineTheme } from "metabase/ui";+import type { CliFilters } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import {+ buildCountBreakoutQuery,+ buildErrorBreakoutQuery,+} from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import { toCountBreakoutRawSeries } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/raw-series";+import { BreakoutChartCard } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard";+import { mapBreakoutDimension } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/breakout-raw-series";+import { useAdhocBreakoutQuery } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAdhocBreakoutQuery";import type {CardMetadata,MetadataProvider,@@ -10,16 +19,6 @@ import type {} from "metabase-lib";import type { VisualizationDisplay } from "metabase-types/api";-import { BreakoutChartCard } from "../../metabot-analytics/components/ConversationStatsPage/BreakoutChartCard";-import { mapBreakoutDimension } from "../../metabot-analytics/components/ConversationStatsPage/breakout-raw-series";-import { useAdhocBreakoutQuery } from "../../metabot-analytics/hooks/useAdhocBreakoutQuery";-import type { CliFilters } from "../query-utils";-import {- buildCountBreakoutQuery,- buildErrorBreakoutQuery,-} from "../query-utils";-import { toCountBreakoutRawSeries } from "../raw-series";-const DEFAULT_CHART_HEIGHT = 350;const DEFAULT_MAX_CATEGORIES = 8;diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliCallerLivenessTable.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliCallerLivenessTable.tsxsimilarity index 88%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliCallerLivenessTable.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliCallerLivenessTable.tsxindex 71b6180a6d4..6fdf37b13e7 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliCallerLivenessTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliCallerLivenessTable.tsx@@ -2,6 +2,10 @@ import { useMemo } from "react";import { t } from "ttag";import { Skeleton } from "metabase/ui";+import type { CliFilters } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import { buildCallerLivenessQuery } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import { BreakoutChartCard } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard";+import { useAdhocBreakoutQuery } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAdhocBreakoutQuery";import type {CardMetadata,MetadataProvider,@@ -9,11 +13,6 @@ import type {} from "metabase-lib";import type { DatasetQuery } from "metabase-types/api";-import { BreakoutChartCard } from "../../metabot-analytics/components/ConversationStatsPage/BreakoutChartCard";-import { useAdhocBreakoutQuery } from "../../metabot-analytics/hooks/useAdhocBreakoutQuery";-import type { CliFilters } from "../query-utils";-import { buildCallerLivenessQuery } from "../query-utils";-const TABLE_HEIGHT = 500;type DataSources = {diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliCallsTimelineChart.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliCallsTimelineChart.tsxsimilarity index 81%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliCallsTimelineChart.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliCallsTimelineChart.tsxindex 97bfe6260ab..1e6bb7839b1 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliCallsTimelineChart.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliCallsTimelineChart.tsx@@ -2,6 +2,11 @@ import { useMemo } from "react";import { t } from "ttag";import { Skeleton } from "metabase/ui";+import type { CliFilters } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import { buildCallsByDayByClientQuery } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import { toSeriesByBreakoutRawSeries } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/raw-series";+import { BreakoutChartCard } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard";+import { useAdhocBreakoutQuery } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAdhocBreakoutQuery";import type {CardMetadata,MetadataProvider,@@ -9,12 +14,6 @@ import type {TableMetadata,} from "metabase-lib";-import { BreakoutChartCard } from "../../metabot-analytics/components/ConversationStatsPage/BreakoutChartCard";-import { useAdhocBreakoutQuery } from "../../metabot-analytics/hooks/useAdhocBreakoutQuery";-import type { CliFilters } from "../query-utils";-import { buildCallsByDayByClientQuery } from "../query-utils";-import { toSeriesByBreakoutRawSeries } from "../raw-series";-const CHART_HEIGHT = 320;type DataSources = {diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.tsxnew file mode 100644index 00000000000..cbaeb894f25--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.tsx@@ -0,0 +1,350 @@+import { type ReactNode, useMemo } from "react";+import { t } from "ttag";++import { DateTime } from "metabase/common/components/DateTime";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { PaginationControls } from "metabase/common/components/PaginationControls";+import { useScrollToTop, useSortingStateChange } from "metabase/common/hooks";+import { MonitorEmptyState } from "metabase/monitor/components/MonitorEmptyState";+import {+ Box,+ Card,+ Ellipsified,+ Flex,+ LoadingOverlay,+ Stack,+ TreeTable,+ type TreeTableColumnDef,+ TreeTableSkeleton,+ useTreeTableInstance,+} from "metabase/ui";+import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";+import { formatNumber } from "metabase/utils/formatting";+import { useCliEventsQuery } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliEventsQuery";+import {+ CLI_EVENT_SORT_COLUMNS,+ type CliEventSortColumn,+ type CliFilters,+ buildEventsQuery,+ cliEventColumnKeys,+} from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import type {+ CardMetadata,+ MetadataProvider,+ TableMetadata,+} from "metabase-lib";+import type { RowValue, RowValues, SortingOptions } from "metabase-types/api";++export const EVENTS_PAGE_SIZE = 25;++const DEFAULT_SORTING: SortingOptions<CliEventSortColumn> = {+ sort_column: "created_at",+ sort_direction: "desc",+};++type EventColumn = {+ key: CliEventSortColumn;+ title: string;+ sort?: CliEventSortColumn;+ align?: "right";+ grow?: boolean;+ render?: (value: RowValue) => ReactNode;+};++const EVENT_COLUMN_META: Record<+ CliEventSortColumn,+ () => Omit<EventColumn, "key">+> = {+ call_id: () => ({ title: t`ID`, sort: "call_id" }),+ created_at: () => ({+ title: t`Created at`,+ sort: "created_at",+ render: (value) =>+ value == null ? (+ EMPTY_CELL_PLACEHOLDER+ ) : (+ <DateTime value={String(value)} />+ ),+ }),+ operation: () => ({ title: t`Operation`, sort: "operation" }),+ client_display_name: () => ({+ title: t`Client`,+ sort: "client_display_name",+ }),+ user_display_name: () => ({ title: t`User`, sort: "user_display_name" }),+ tenant_name: () => ({ title: t`Tenant`, sort: "tenant_name" }),+ ip_address: () => ({ title: t`IP address`, sort: "ip_address" }),+ status: () => ({ title: t`Status`, sort: "status" }),+ duration_ms: () => ({+ title: t`Duration (ms)`,+ sort: "duration_ms",+ align: "right",+ render: (value) =>+ value == null ? EMPTY_CELL_PLACEHOLDER : formatNumber(Number(value)),+ }),+ error_message: () => ({+ title: t`Error message`,+ sort: "error_message",+ grow: true,+ render: (value) =>+ value == null || value === "" ? (+ EMPTY_CELL_PLACEHOLDER+ ) : (+ <Ellipsified>{String(value)}</Ellipsified>+ ),+ }),+};++export function eventColumns(+ hasTenants: boolean,+ hasPii: boolean,+): EventColumn[] {+ return cliEventColumnKeys(hasTenants, hasPii).map((key) => ({+ key,+ ...EVENT_COLUMN_META[key](),+ }));+}++function renderCell(column: EventColumn, value: RowValue): ReactNode {+ if (column.render) {+ return column.render(value);+ }+ return value == null || value === "" ? EMPTY_CELL_PLACEHOLDER : String(value);+}++type EventRow = { id: string } & Record<string, RowValue>;++type PaginationProps = {+ page: number;+ total: number;+ onPageChange: (page: number) => void;+};++type SortProps = {+ sortingOptions: SortingOptions<CliEventSortColumn>;+ onSortingOptionsChange: (+ sortingOptions: SortingOptions<CliEventSortColumn>,+ ) => void;+};++type Nullable<T> = { [K in keyof T]: T[K] | null };++type MetadataSources = {+ provider: MetadataProvider;+ table: TableMetadata | CardMetadata;+ groupMembersTable: TableMetadata | CardMetadata;+};++type BaseProps = CliFilters &+ PaginationProps &+ SortProps & {+ hasTenants: boolean;+ hasPii: boolean;+ };++type Props = BaseProps & Nullable<MetadataSources>;+type InnerProps = BaseProps & MetadataSources;++export function CliEventsTable({+ provider,+ table,+ groupMembersTable,+ ...rest+}: Props) {+ if (!provider || !table || !groupMembersTable) {+ return null;+ }+ return (+ <CliEventsTableInner+ provider={provider}+ table={table}+ groupMembersTable={groupMembersTable}+ {...rest}+ />+ );+}++function CliEventsTableInner({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ hasTenants,+ hasPii,+ page,+ total,+ onPageChange,+ sortingOptions,+ onSortingOptionsChange,+}: InnerProps) {+ const columns = useMemo(+ () => eventColumns(hasTenants, hasPii),+ [hasTenants, hasPii],+ );++ const { sort_column: sortColumn, sort_direction: sortDirection } =+ sortingOptions;+ const effectiveSorting = useMemo(() => {+ const visibleSortColumns = new Set(+ columns.map((column) => column.sort).filter(Boolean),+ );+ return visibleSortColumns.has(sortColumn)+ ? { sort_column: sortColumn, sort_direction: sortDirection }+ : DEFAULT_SORTING;+ }, [columns, sortColumn, sortDirection]);++ const query = useMemo(+ () =>+ buildEventsQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ sortColumn: effectiveSorting.sort_column,+ sortDirection: effectiveSorting.sort_direction,+ hasTenants,+ hasPii,+ }),+ [+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ effectiveSorting,+ hasTenants,+ hasPii,+ ],+ );++ const { data, isFetching, error } = useCliEventsQuery(+ query,+ page,+ EVENTS_PAGE_SIZE,+ );++ // The result columns (`data.data.cols`) are the full, warehouse-ordered set the query returns —+ // not the curated `columns` we render. So we map each curated column to its position in the+ // result by name. Names are upper- or lower-cased depending on the warehouse, so match case-insensitively.+ const columnIndex = useMemo(() => {+ const cols = data?.data?.cols ?? [];+ return new Map(cols.map((col, index) => [col.name.toLowerCase(), index]));+ }, [data]);++ const rows: EventRow[] = useMemo(() => {+ const rawRows: RowValues[] = data?.data?.rows ?? [];+ return rawRows.map((rawRow, rowIndex) => {+ const values = Object.fromEntries(+ columns.map((column) => {+ const index = columnIndex.get(column.key);+ return [column.key, index != null ? rawRow[index] : null];+ }),+ );+ const id = String(values.call_id ?? `${page}-${rowIndex}`);+ return { id, ...values };+ });+ }, [data, columns, columnIndex, page]);++ const treeColumns = useMemo<TreeTableColumnDef<EventRow>[]>(+ () =>+ columns.map((column) => ({+ id: column.key,+ header: column.title,+ ...(column.grow+ ? { minWidth: 120 }+ : { width: "auto" as const, minWidth: 120, maxAutoWidth: 320 }),+ enableSorting: !!column.sort,+ sortDescFirst: column.sort === "created_at",+ accessorFn: (row) => row[column.key],+ cell: ({ row }) => {+ const node = renderCell(column, row.original[column.key]);+ return column.align === "right" ? (+ <Box ta="right" w="100%">+ {node}+ </Box>+ ) : (+ node+ );+ },+ })),+ [columns],+ );++ const { sortingState, onSortingChange } = useSortingStateChange({+ sortingOptions: effectiveSorting,+ columns: CLI_EVENT_SORT_COLUMNS,+ defaultSorting: DEFAULT_SORTING,+ onSortingOptionsChange,+ });++ const treeTableInstance = useTreeTableInstance<EventRow>({+ data: rows,+ columns: treeColumns,+ sorting: sortingState,+ manualSorting: true,+ getNodeId: (row) => row.id,+ onSortingChange,+ });++ useScrollToTop({+ ref: treeTableInstance.containerRef,+ keys: [page, effectiveSorting],+ skip: isFetching,+ });++ const skeletonColumnWidths = columns.map(() => 1 / columns.length);++ return (+ <Stack gap="md" flex={1} mih={0}>+ <Card+ flex="0 1 auto"+ mih={0}+ p={0}+ pos="relative"+ withBorder+ data-testid="cli-events-table"+ >+ {error ? (+ <Flex mih="60vh" align="center" justify="center">+ <LoadingAndErrorWrapper loading={false} error={error} />+ </Flex>+ ) : !data ? (+ <TreeTableSkeleton columnWidths={skeletonColumnWidths} />+ ) : (+ <>+ <LoadingOverlay visible={isFetching} />+ <TreeTable+ instance={treeTableInstance}+ hierarchical={false}+ ariaLabel={t`Calls`}+ emptyState={<MonitorEmptyState label={t`No calls found`} />}+ getRowProps={() => ({ "data-testid": "cli-event" })}+ />+ </>+ )}+ </Card>++ {data && !error && (+ <Flex justify="flex-end">+ <PaginationControls+ page={page}+ pageSize={EVENTS_PAGE_SIZE}+ itemsLength={rows.length}+ total={total}+ showTotal+ onPreviousPage={() => onPageChange(page - 1)}+ onNextPage={() => onPageChange(page + 1)}+ />+ </Flex>+ )}+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.unit.spec.tsxsimilarity index 76%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.unit.spec.tsxindex 3b81c40e77e..4df3afdc290 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/components/CliEventsTable.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliEventsTable.unit.spec.tsx@@ -41,18 +41,9 @@ describe("eventColumns", () => {expect(all).not.toContain("group_name");});- it("marks the expected columns sortable and leaves the rest static", () => {+ it("marks every column sortable", () => {const columns = eventColumns(true, true);- const sortable = columns.filter((c) => c.sort).map((c) => c.key);- expect(sortable).toEqual([- "created_at",- "operation",- "client_display_name",- "user_display_name",- "status",- "duration_ms",- ]);- // the PK and free-text columns are not sortable- expect(columns.find((c) => c.key === "call_id")?.sort).toBeUndefined();+ expect(columns.every((c) => c.sort)).toBe(true);+ expect(columns.map((c) => c.sort)).toEqual(columns.map((c) => c.key));});});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/constants.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/constants.tssimilarity index 71%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/constants.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/constants.tsindex 6426b5518ce..89df3131dce 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/constants.ts@@ -1,7 +1,7 @@export {AUDIT_DB_ID,VIEW_GROUP_MEMBERS,-} from "../metabot-analytics/constants";+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/constants";// View name in the audit database for Agent API (CLI + other clients) call analytics.export const VIEW_AGENT_API_CALLS = "v_agent_api_calls";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/hooks/useCliEventsQuery.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliEventsQuery.tssimilarity index 75%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/hooks/useCliEventsQuery.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliEventsQuery.tsindex e6a6f21c757..4a404972e39 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/hooks/useCliEventsQuery.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliEventsQuery.ts@@ -1,15 +1,15 @@import { useMemo } from "react";import { skipToken, useGetAdhocQueryQuery } from "metabase/api";+import { paginateEventsQuery } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";import type { Query } from "metabase-lib";import * as Lib from "metabase-lib";import type { Dataset } from "metabase-types/api";-import { paginateEventsQuery } from "../query-utils";-type EventsPageResult = {data: Dataset | undefined;isFetching: boolean;+ error: unknown;};/**@@ -28,7 +28,9 @@ export function useCliEventsQuery([query, page, pageSize],);- const { data, isFetching } = useGetAdhocQueryQuery(jsQuery ?? skipToken);+ const { data, isFetching, error } = useGetAdhocQueryQuery(+ jsQuery ?? skipToken,+ );- return { data, isFetching };+ return { data, isFetching, error };}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/hooks/useCliHasData.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliHasData.tssimilarity index 87%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/hooks/useCliHasData.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliHasData.tsindex 2b8d1fca06c..4d40cdc4467 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/hooks/useCliHasData.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/hooks/useCliHasData.ts@@ -1,15 +1,14 @@import { useMemo, useRef } from "react";+import type { CliFilters } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import { buildTotalCountQuery } from "metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils";+import { useAdhocBreakoutQuery } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAdhocBreakoutQuery";import type {CardMetadata,MetadataProvider,TableMetadata,} from "metabase-lib";-import { useAdhocBreakoutQuery } from "../../metabot-analytics/hooks/useAdhocBreakoutQuery";-import type { CliFilters } from "../query-utils";-import { buildTotalCountQuery } from "../query-utils";-type DataSources = {provider: MetadataProvider | null;table: TableMetadata | CardMetadata | null;diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/index.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/query-utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils.tssimilarity index 90%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/query-utils.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils.tsindex 870cf2291f2..57dc075f944 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/query-utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils.ts@@ -1,6 +1,14 @@import type { DateFilterValue } from "metabase/querying/common/types";+import {+ applyDateFilter,+ applyIdFilter,+ breakoutByColumn,+ findColumn,+ joinGroupMembers,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-utils";import type {CardMetadata,+ ColumnMetadata,MetadataProvider,Query,TableMetadata,@@ -8,14 +16,6 @@ import type {import * as Lib from "metabase-lib";import type { SortDirection } from "metabase-types/api";-import {- applyDateFilter,- applyIdFilter,- breakoutByColumn,- findColumn,- joinGroupMembers,-} from "../metabot-analytics/components/ConversationStatsPage/query-utils";-export type CliFilters = {dateFilter: DateFilterValue;userId?: number;@@ -333,16 +333,38 @@ export function buildTotalCountQuery({}export const CLI_EVENT_SORT_COLUMNS = [+ "call_id","created_at","operation","client_display_name","user_display_name",+ "tenant_name",+ "ip_address","status","duration_ms",+ "error_message",] as const;export type CliEventSortColumn = (typeof CLI_EVENT_SORT_COLUMNS)[number];+export function cliEventColumnKeys(+ hasTenants: boolean,+ hasPii: boolean,+): CliEventSortColumn[] {+ return [+ "call_id",+ "created_at",+ "operation",+ "client_display_name",+ "user_display_name",+ ...(hasTenants ? (["tenant_name"] as const) : []),+ ...(hasPii ? (["ip_address"] as const) : []),+ "status",+ "duration_ms",+ ...(hasPii ? (["error_message"] as const) : []),+ ];+}+/** Append an order-by on `columnName` in `direction` if it's orderable. No-op if absent. */function orderByColumn(query: Query,@@ -353,20 +375,25 @@ function orderByColumn(return col ? Lib.orderBy(query, 0, col, direction) : query;}+function projectToEventColumns(+ query: Query,+ hasTenants: boolean,+ hasPii: boolean,+): Query {+ const fields = cliEventColumnKeys(hasTenants, hasPii)+ .map((name) => findColumn(query, name, Lib.fieldableColumns))+ .filter((column): column is ColumnMetadata => column != null);+ return Lib.withFields(query, 0, fields);+}+type EventsQueryOpts = CliFilters &CliDataSources & {sortColumn?: CliEventSortColumn;sortDirection?: SortDirection;+ hasTenants: boolean;+ hasPii: boolean;};-/**- * Build the row-level events query for the Events tab: the filtered view with no aggregation,- * ordered by the chosen sort column (default `created_at` descending), then by the `call_id`- * primary key as a tiebreaker. The tiebreaker makes the sort a total order — without it,- * pagination can skip or duplicate rows across page boundaries when the sort column has ties (the- * DB is free to order ties differently between requests). Pagination is applied separately via- * {@link paginateEventsQuery}.- */export function buildEventsQuery({provider,table,@@ -377,6 +404,8 @@ export function buildEventsQuery({tenantId,sortColumn = "created_at",sortDirection = "desc",+ hasTenants,+ hasPii,}: EventsQueryOpts): Query {let query = buildBaseQuery({provider,@@ -390,6 +419,7 @@ export function buildEventsQuery({query = orderByColumn(query, sortColumn, sortDirection);query = orderByColumn(query, "call_id", "desc");+ query = projectToEventColumns(query, hasTenants, hasPii);return query;}diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils.unit.spec.tsnew file mode 100644index 00000000000..cafb76b14f9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/query-utils.unit.spec.ts@@ -0,0 +1,44 @@+import { cliEventColumnKeys } from "./query-utils";++describe("cliEventColumnKeys", () => {+ it("returns only the base columns when tenants and PII retention are both off", () => {+ expect(cliEventColumnKeys(false, false)).toEqual([+ "call_id",+ "created_at",+ "operation",+ "client_display_name",+ "user_display_name",+ "status",+ "duration_ms",+ ]);+ });++ it("includes tenant_name only when tenants are enabled", () => {+ const withTenants = cliEventColumnKeys(true, false);+ expect(withTenants).toContain("tenant_name");+ expect(withTenants).not.toContain("ip_address");+ expect(withTenants).not.toContain("error_message");+ });++ it("includes ip_address and error_message only when PII retention is on", () => {+ const withPii = cliEventColumnKeys(false, true);+ expect(withPii).toContain("ip_address");+ expect(withPii).toContain("error_message");+ expect(withPii).not.toContain("tenant_name");+ });++ it("includes every column when both tenants and PII retention are enabled", () => {+ expect(cliEventColumnKeys(true, true)).toEqual([+ "call_id",+ "created_at",+ "operation",+ "client_display_name",+ "user_display_name",+ "tenant_name",+ "ip_address",+ "status",+ "duration_ms",+ "error_message",+ ]);+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/raw-series.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/raw-series.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/raw-series.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/raw-series.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/raw-series.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/raw-series.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/raw-series.unit.spec.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/raw-series.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/url-state.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/url-state.tssimilarity index 95%rename from enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/url-state.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/url-state.tsindex 247873ecf77..d01b61ea342 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/cli-analytics/url-state.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/url-state.ts@@ -3,13 +3,12 @@ import {type UrlStateConfig,getFirstParamValue,} from "metabase/common/hooks/use-url-state";-import type { SortDirection } from "metabase-types/api";-import {type FilterUrlState,filterUrlStateConfig,mergeUrlStateConfig,-} from "../metabot-analytics/components/ConversationFilters/url-state";+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/url-state";+import type { SortDirection } from "metabase-types/api";import { CLI_EVENT_SORT_COLUMNS, type CliEventSortColumn } from "./query-utils";diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.tsxnew file mode 100644index 00000000000..b1b5a33e855--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.tsx@@ -0,0 +1,98 @@+import { t } from "ttag";++import EmptyDashboardBot from "assets/img/dashboard-empty.svg";+import { EmptyState } from "metabase/common/components/EmptyState";+import { useSetting } from "metabase/common/hooks";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { Outlet } from "metabase/router";+import { Flex } from "metabase/ui";+import * as Urls from "metabase/urls";++type UnavailablePageProps = {+ title: string;+ message: string;+ action: string;+ link: string;+};++function UnavailablePage({+ title,+ message,+ action,+ link,+}: UnavailablePageProps) {+ return (+ <MonitorMain align="center" h="100%">+ <Flex flex={1} align="center" justify="center">+ <EmptyState+ illustrationElement={+ <img src={EmptyDashboardBot} alt="" width={100} height={100} />+ }+ title={title}+ message={message}+ action={action}+ link={link}+ actionVariant="default"+ />+ </Flex>+ </MonitorMain>+ );+}++export function MetabotAnalyticsAvailabilityLayout() {+ const aiFeaturesEnabled = !!useSetting("ai-features-enabled?");+ const isConfigured = !!useSetting("llm-metabot-configured?");++ if (!aiFeaturesEnabled) {+ return (+ <UnavailablePage+ title={t`AI features are disabled`}+ message={t`Enable AI features in Admin settings to view AI usage and conversations.`}+ action={t`Go to AI Settings`}+ link={Urls.adminAiSettings()}+ />+ );+ }++ if (!isConfigured) {+ return (+ <UnavailablePage+ title={t`Set up AI to view analytics`}+ message={t`Configure an AI provider in Admin settings to view AI usage and conversations.`}+ action={t`Go to AI Settings`}+ link={Urls.adminAiSettings()}+ />+ );+ }++ return <Outlet />;+}++export function McpAnalyticsAvailabilityLayout() {+ const aiFeaturesEnabled = !!useSetting("ai-features-enabled?");+ const mcpEnabled = !!useSetting("mcp-enabled?");++ if (!aiFeaturesEnabled) {+ return (+ <UnavailablePage+ title={t`AI features are disabled`}+ message={t`Enable AI features in Admin settings to view MCP analytics.`}+ action={t`Go to AI Settings`}+ link={Urls.adminAiSettings()}+ />+ );+ }++ if (!mcpEnabled) {+ return (+ <UnavailablePage+ title={t`MCP is disabled`}+ message={t`Enable MCP in Admin settings to view MCP analytics.`}+ action={t`Go to MCP settings`}+ link={Urls.adminMcpSettings()}+ />+ );+ }++ return <Outlet />;+}diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.unit.spec.tsxnew file mode 100644index 00000000000..555f1992859--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.unit.spec.tsx@@ -0,0 +1,152 @@+import type { ReactElement } from "react";++import { mockSettings } from "__support__/settings";+import { renderWithProviders, screen } from "__support__/ui";+import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";+import * as Urls from "metabase/urls";++import {+ McpAnalyticsAvailabilityLayout,+ MetabotAnalyticsAvailabilityLayout,+} from "./AvailabilityLayouts";++type SetupOpts = {+ aiFeaturesEnabled?: boolean;+ isConfigured?: boolean;+ mcpEnabled?: boolean;+};++function setup(+ element: ReactElement,+ {+ aiFeaturesEnabled = true,+ isConfigured = true,+ mcpEnabled = true,+ }: SetupOpts = {},+) {+ renderWithProviders(+ <Route path="/monitor/ai-auditing" element={element}>+ <Route path="*" element={<div>Analytics content</div>} />+ </Route>,+ {+ initialRoute: "/monitor/ai-auditing/test",+ withRouter: true,+ storeInitialState: createMockState({+ settings: mockSettings({+ "ai-features-enabled?": aiFeaturesEnabled,+ "llm-metabot-configured?": isConfigured,+ "mcp-enabled?": mcpEnabled,+ }),+ }),+ },+ );+}++describe("MetabotAnalyticsAvailabilityLayout", () => {+ it("links to AI Settings when AI features are disabled", () => {+ setup(<MetabotAnalyticsAvailabilityLayout />, {+ aiFeaturesEnabled: false,+ });++ expect(screen.getByText("AI features are disabled")).toBeInTheDocument();+ expect(screen.queryByText("Analytics content")).not.toBeInTheDocument();+ expect(+ screen.getByRole("link", { name: "Go to AI Settings" }),+ ).toHaveAttribute("href", Urls.adminAiSettings());+ });++ it("links to AI Settings when no AI provider is configured", () => {+ setup(<MetabotAnalyticsAvailabilityLayout />, { isConfigured: false });++ expect(screen.getByText("Set up AI to view analytics")).toBeInTheDocument();+ expect(screen.queryByText("Analytics content")).not.toBeInTheDocument();+ expect(+ screen.getByRole("link", { name: "Go to AI Settings" }),+ ).toHaveAttribute("href", Urls.adminAiSettings());+ });++ it("shows the dashboard-bot illustration and secondary CTA for the AI-disabled state", () => {+ setup(<MetabotAnalyticsAvailabilityLayout />, { aiFeaturesEnabled: false });++ expect(document.querySelector("img")).toBeInTheDocument();+ expect(+ screen+ .getByRole("link", { name: "Go to AI Settings" })+ .querySelector("button"),+ ).toHaveAttribute("data-variant", "default");+ });++ it("shows the dashboard-bot illustration and secondary CTA for the not-configured state", () => {+ setup(<MetabotAnalyticsAvailabilityLayout />, { isConfigured: false });++ expect(document.querySelector("img")).toBeInTheDocument();+ expect(+ screen+ .getByRole("link", { name: "Go to AI Settings" })+ .querySelector("button"),+ ).toHaveAttribute("data-variant", "default");+ });++ it("renders the child route when AI is enabled and configured", () => {+ setup(<MetabotAnalyticsAvailabilityLayout />);++ expect(screen.getByText("Analytics content")).toBeInTheDocument();+ });+});++describe("McpAnalyticsAvailabilityLayout", () => {+ it("links to AI Settings when AI features are disabled", () => {+ setup(<McpAnalyticsAvailabilityLayout />, {+ aiFeaturesEnabled: false,+ mcpEnabled: false,+ });++ expect(screen.getByText("AI features are disabled")).toBeInTheDocument();+ expect(screen.queryByText("Analytics content")).not.toBeInTheDocument();+ expect(+ screen.getByRole("link", { name: "Go to AI Settings" }),+ ).toHaveAttribute("href", Urls.adminAiSettings());+ });++ it("links to MCP settings when MCP is disabled", () => {+ setup(<McpAnalyticsAvailabilityLayout />, { mcpEnabled: false });++ expect(screen.getByText("MCP is disabled")).toBeInTheDocument();+ expect(screen.queryByText("Analytics content")).not.toBeInTheDocument();+ expect(+ screen.getByRole("link", { name: "Go to MCP settings" }),+ ).toHaveAttribute("href", Urls.adminMcpSettings());+ });++ it("shows the dashboard-bot illustration and secondary CTA for the MCP-disabled state", () => {+ setup(<McpAnalyticsAvailabilityLayout />, { mcpEnabled: false });++ expect(document.querySelector("img")).toBeInTheDocument();+ expect(+ screen+ .getByRole("link", { name: "Go to MCP settings" })+ .querySelector("button"),+ ).toHaveAttribute("data-variant", "default");+ });++ it("shows the dashboard-bot illustration and secondary CTA for the MCP AI-disabled state", () => {+ setup(<McpAnalyticsAvailabilityLayout />, {+ aiFeaturesEnabled: false,+ mcpEnabled: false,+ });++ expect(document.querySelector("img")).toBeInTheDocument();+ expect(+ screen+ .getByRole("link", { name: "Go to AI Settings" })+ .querySelector("button"),+ ).toHaveAttribute("data-variant", "default");+ });++ it("renders the child route when MCP is enabled", () => {+ setup(<McpAnalyticsAvailabilityLayout />);++ expect(screen.getByText("Analytics content")).toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/index.tsnew file mode 100644index 00000000000..02769610723--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/index.ts@@ -0,0 +1 @@+export * from "./AvailabilityLayouts";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsEmptyState.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsEmptyState.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsEmptyState.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.tsxnew file mode 100644index 00000000000..0c80619a12e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.tsx@@ -0,0 +1,263 @@+import { useMemo } from "react";+import { P, match } from "ts-pattern";+import { t } from "ttag";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useSetting } from "metabase/common/hooks";+import { useUrlState } from "metabase/common/hooks/use-url-state";+import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { useLocation } from "metabase/router";+import { Flex, Loader, SimpleGrid, Stack, Tabs, Title } from "metabase/ui";+import {+ VIEW_GROUP_MEMBERS,+ VIEW_MCP_TOOL_CALLS,+} from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/constants";+import { useMcpHasData } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpHasData";+import { buildCallsByDayByStatusQuery } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils";+import { mcpUrlStateConfig } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/url-state";+import {+ // The shared audit filter bar; aliased since it has nothing to do with MCP "conversations".+ ConversationFilters as McpToolCallsFilter,+ useFilterOptions,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters";+import { useAuditTable } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable";++import { McpAnalyticsEmptyState } from "./McpAnalyticsEmptyState";+import { McpBreakoutChart } from "./McpBreakoutChart";+import { McpCallsTimelineChart } from "./McpCallsTimelineChart";+import { McpEventsTable } from "./McpEventsTable";++/**+ * AI Auditing MCP analytics page. Renders live ad-hoc queries over the `v_mcp_tool_calls` audit view+ * across two tabs (Charts and a row-level Events table), sharing URL-state date/user/group+ * filters.+ */+export function McpAnalyticsPage() {+ const location = useLocation();+ const [+ { date, user, group, tenant, tab, page, sort_column, sort_direction },+ { patchUrlState },+ ] = useUrlState(location, mcpUrlStateConfig);++ const {+ dateFilter,+ userId,+ groupId,+ tenantId,+ groupNoFilterValue,+ userOptions,+ groupOptions,+ tenantOptions,+ hasTenants,+ } = useFilterOptions({ date, user, group, tenant });++ // IP address and error message are PII (null unless retention is on), so only surface those+ // columns when they're collected.+ const hasPii = useSetting("analytics-pii-retention-enabled") === true;+ const toolCallsAudit = useAuditTable(VIEW_MCP_TOOL_CALLS);+ const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);++ const dataSources = {+ provider: toolCallsAudit.provider,+ table: toolCallsAudit.table,+ groupMembersTable: groupMembersAudit.table,+ };++ const chartFilters = { dateFilter, userId, groupId, tenantId };++ const sortingOptions = useMemo(+ () => ({ sort_column, sort_direction }),+ [sort_column, sort_direction],+ );++ const { isInitialLoading, isRefetching, hasData, count, error } =+ useMcpHasData({+ ...dataSources,+ ...chartFilters,+ });+ // Initial load shows a loader (never the empty state). After the first result, a filter+ // change keeps the charts mounted so they show their own skeletons while refetching; the+ // empty state only appears once a load has resolved to zero rows.+ const showEmpty = !isInitialLoading && !isRefetching && !hasData;++ // Only surface the errors section when the current filters actually match failed calls, so a+ // healthy instance doesn't show a row of empty error charts.+ const { hasData: hasErrors } = useMcpHasData({+ ...dataSources,+ ...chartFilters,+ errorsOnly: true,+ });++ // The events (Tool calls) tab is a data grid that should scroll internally.+ const isEventsTab = tab === "events";++ const content = (+ <MonitorMain>+ <Stack gap="lg" {...(isEventsTab ? { flex: 1, mih: 0 } : {})}>+ <MonitorHeaderTitle>{t`MCP analytics`}</MonitorHeaderTitle>++ <Tabs+ variant="pills"+ value={tab}+ onChange={(val) =>+ patchUrlState({ tab: val === "events" ? "events" : "charts" })+ }+ keepMounted={false}+ {...(isEventsTab+ ? {+ flex: 1,+ mih: 0,+ display: "flex",+ style: { flexDirection: "column" },+ }+ : {})}+ >+ <Tabs.List mb="md">+ <Tabs.Tab value="charts">{t`Usage`}</Tabs.Tab>+ <Tabs.Tab value="events">{t`Tool calls`}</Tabs.Tab>+ </Tabs.List>++ <McpToolCallsFilter+ date={date}+ onDateChange={(val) => patchUrlState({ date: val, page: 0 })}+ user={user}+ onUserChange={(val) => patchUrlState({ user: val, page: 0 })}+ userOptions={userOptions}+ group={group}+ onGroupChange={(val) => patchUrlState({ group: val, page: 0 })}+ groupOptions={groupOptions}+ groupNoFilterValue={groupNoFilterValue}+ tenant={tenant}+ onTenantChange={(val) => patchUrlState({ tenant: val, page: 0 })}+ tenantOptions={tenantOptions}+ hasTenants={hasTenants}+ />++ {match({ isInitialLoading, showEmpty, error })+ .with({ error: P.nonNullable }, () => (+ <Tabs.Panel value={tab} mt="md">+ <Flex mih="60vh" align="center" justify="center">+ <LoadingAndErrorWrapper loading={false} error={error} />+ </Flex>+ </Tabs.Panel>+ ))+ .with({ isInitialLoading: true }, () => (+ // Keeps the active tab's panel/tabpanel relationship intact (aria-controls on the+ // selected tab must point at a rendered element) while the initial load is pending.+ <Tabs.Panel value={tab} mt="md">+ <Flex mih="60vh" align="center" justify="center">+ <Loader size="lg" />+ </Flex>+ </Tabs.Panel>+ ))+ .with({ showEmpty: true }, () => (+ <Tabs.Panel value={tab} mt="md">+ <McpAnalyticsEmptyState />+ </Tabs.Panel>+ ))+ .otherwise(() => (+ <>+ <Tabs.Panel value="charts" mt="md">+ <Stack gap="lg">+ <McpCallsTimelineChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by client over time`}+ />+ <SimpleGrid cols={2} spacing="lg">+ <McpBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by tool`}+ display="pie"+ breakoutColumn="tool_name"+ h={500}+ />+ <McpBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by user`}+ display="row"+ breakoutColumn="user_display_name"+ h={500}+ />+ </SimpleGrid>++ {hasErrors && (+ <>+ <Title order={3} mt="md">{t`Errors`}</Title>+ <McpCallsTimelineChart+ {...dataSources}+ {...chartFilters}+ title={t`Calls by status over time`}+ buildQuery={buildCallsByDayByStatusQuery}+ />+ <SimpleGrid cols={2} spacing="lg">+ <McpBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Errors by type`}+ display="pie"+ breakoutColumn="error_type"+ errorsOnly+ h={500}+ />+ <McpBreakoutChart+ {...dataSources}+ {...chartFilters}+ title={t`Errors by tool`}+ display="row"+ breakoutColumn="tool_name"+ errorsOnly+ h={500}+ />+ </SimpleGrid>+ </>+ )}+ </Stack>+ </Tabs.Panel>++ <Tabs.Panel+ value="events"+ mt="md"+ flex={1}+ mih={0}+ display="flex"+ style={{ flexDirection: "column" }}+ >+ <McpEventsTable+ {...dataSources}+ {...chartFilters}+ hasTenants={hasTenants}+ hasPii={hasPii}+ page={page}+ total={count}+ onPageChange={(newPage) =>+ patchUrlState({ page: newPage }, { immediate: true })+ }+ sortingOptions={sortingOptions}+ onSortingOptionsChange={(newSorting) =>+ patchUrlState({+ sort_column: newSorting.sort_column,+ sort_direction: newSorting.sort_direction,+ page: 0,+ })+ }+ />+ </Tabs.Panel>+ </>+ ))}+ </Tabs>+ </Stack>+ </MonitorMain>+ );++ return isEventsTab ? (+ <Flex h="100%" wrap="nowrap">+ {content}+ </Flex>+ ) : (+ content+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsxsimilarity index 79%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsxindex 065090a1f08..c2a1e64233f 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx@@ -7,10 +7,17 @@ import {setupUsersEndpoints,} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import {+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";import { registerVisualizations } from "metabase/visualizations/register";+import { AUDIT_DB_ID } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/constants";import type { Database, Dataset, Field } from "metabase-types/api";import {createMockColumn,@@ -24,8 +31,6 @@ import {createMockUser,} from "metabase-types/api/mocks";-import { AUDIT_DB_ID } from "../constants";-import { McpAnalyticsPage } from "./McpAnalyticsPage";registerVisualizations();@@ -168,7 +173,10 @@ const emptyDatasetResponse: Dataset = createMockDataset({});/** Mock the audit-DB metadata, users/groups, and the `/api/dataset` adhoc endpoint (with the given dataset). */-function setupEndpoints(dataset: Dataset = datasetResponse) {+function setupEndpoints(+ dataset: Dataset = datasetResponse,+ datasetError = false,+) {fetchMock.get(`path:/api/database/${AUDIT_DB_ID}/metadata`, auditDatabase);// useAuditTable pulls the table's fields (and its FK targets') from here.fetchMock.post("path:/api/dataset/query_metadata", {@@ -178,21 +186,31 @@ function setupEndpoints(dataset: Dataset = datasetResponse) {});setupUsersEndpoints([createMockUser({ id: 1, first_name: "Ada" })]);setupGroupsEndpoint([createMockGroup({ id: 1, name: "All Users" })]);- fetchMock.post("path:/api/dataset", dataset, { name: "dataset" });+ if (datasetError) {+ fetchMock.post("path:/api/dataset", {+ status: 500,+ body: { message: "Audit query failed" },+ });+ } else {+ fetchMock.post("path:/api/dataset", dataset, { name: "dataset" });+ }}/** Render `McpAnalyticsPage` at its route with EE plugins + `audit_app`, optionally overriding the dataset response. */-function setup({ dataset }: { dataset?: Dataset } = {}) {+function setup({+ dataset,+ datasetError,+}: { dataset?: Dataset; datasetError?: boolean } = {}) {+ // TreeTable measures column/row sizes via the DOM; jsdom needs a stubbed rect+ // for its virtualized rows to render.+ mockGetBoundingClientRect({ width: 100, height: 100 });setupEnterprisePlugins();- setupEndpoints(dataset);+ setupEndpoints(dataset, datasetError);return renderWithProviders(- <Route- path="/admin/metabot/usage-auditing/mcp"- element={<McpAnalyticsPage />}- />,+ <Route path="/monitor/ai-auditing/mcp" element={<McpAnalyticsPage />} />,{- initialRoute: "/admin/metabot/usage-auditing/mcp",+ initialRoute: "/monitor/ai-auditing/mcp",withRouter: true,storeInitialState: createMockState({settings: mockSettings({@@ -262,7 +280,9 @@ describe("McpAnalyticsPage", () => {);const eventsPanel = screen.getByRole("tabpanel");- expect(await within(eventsPanel).findByRole("table")).toBeInTheDocument();+ expect(+ await within(eventsPanel).findByRole("treegrid", { name: "Tool calls" }),+ ).toBeInTheDocument();// curated column header + a cell value from the mocked dataset rowexpect(within(eventsPanel).getByText("Tool")).toBeInTheDocument();expect(@@ -279,7 +299,9 @@ describe("McpAnalyticsPage", () => {);// The Tool header is sortable; clicking it re-sorts ascending (it wasn't the active column).- await userEvent.click(await screen.findByRole("button", { name: "Tool" }));+ await userEvent.click(+ await screen.findByRole("columnheader", { name: "Tool" }),+ );await waitFor(() => {const sortedAscending = eventsDatasetStages().some(@@ -316,6 +338,22 @@ describe("McpAnalyticsPage", () => {});});+ it("updates the page URL param immediately when Next is clicked", async () => {+ const { history } = setup({ dataset: multiPageDatasetResponse });++ await screen.findByRole("heading", { name: "MCP analytics" });+ await userEvent.click(+ await screen.findByRole("tab", { name: "Tool calls" }),+ );++ const pagination = await screen.findByRole("navigation", {+ name: "pagination",+ });+ await userEvent.click(within(pagination).getByLabelText("Next page"));++ expect(history?.getCurrentLocation().search).toContain("page=1");+ });+it("issues exactly one events query per page change (no redundant refetch)", async () => {const { history } = setup({ dataset: multiPageDatasetResponse });@@ -323,7 +361,7 @@ describe("McpAnalyticsPage", () => {await userEvent.click(await screen.findByRole("tab", { name: "Tool calls" }),);- await within(screen.getByRole("tabpanel")).findByRole("table");+ await within(screen.getByRole("tabpanel")).findByRole("treegrid");// Dataset calls for the events query's second page (MBQL `:page` is 1-indexed, so UI page 1).const page2EventsCalls = () =>@@ -364,7 +402,7 @@ describe("McpAnalyticsPage", () => {});});- it("shows a single empty state (no tabs, no charts) when there is no activity", async () => {+ it("keeps the header, tabs, and filters visible and shows an empty state in place of the tab content when there is no activity", async () => {setup({ dataset: emptyDatasetResponse });expect(@@ -372,12 +410,28 @@ describe("McpAnalyticsPage", () => {).toBeInTheDocument();expect(await screen.findByText("No MCP activity")).toBeInTheDocument();- // No tabs render when the view is empty — so neither the charts nor the events table can.+ // Tabs and filters stay visible even when the view is empty — only the tab content swaps out.+ const usageTab = screen.getByRole("tab", { name: "Usage" });+ expect(usageTab).toBeInTheDocument();+ expect(screen.getByRole("tab", { name: "Tool calls" })).toBeInTheDocument();expect(- screen.queryByRole("tab", { name: "Usage" }),- ).not.toBeInTheDocument();+ screen.getByTestId("conversation-filters-date-select"),+ ).toBeInTheDocument();++ const panel = screen.getByRole("tabpanel");+ expect(usageTab).toHaveAttribute("aria-controls", panel.id);+ expect(within(panel).getByText("No MCP activity")).toBeInTheDocument();+ });++ it("shows an error instead of spinning forever when the count query fails", async () => {+ setup({ datasetError: true });+expect(- screen.queryByRole("tab", { name: "Tool calls" }),- ).not.toBeInTheDocument();+ await screen.findByRole("heading", { name: "MCP analytics" }),+ ).toBeInTheDocument();+ // Regression: the count query erroring (e.g. a 500) used to leave isInitialLoading+ // stuck true forever, so the page never got past the loader.+ expect(await screen.findByText("Audit query failed")).toBeInTheDocument();+ expect(screen.queryByText("Calls by tool")).not.toBeInTheDocument();});});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpBreakoutChart.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpBreakoutChart.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpBreakoutChart.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpBreakoutChart.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpCallsTimelineChart.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpCallsTimelineChart.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpCallsTimelineChart.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpCallsTimelineChart.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.tsxnew file mode 100644index 00000000000..f297968233f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.tsx@@ -0,0 +1,350 @@+import { type ReactNode, useMemo } from "react";+import { t } from "ttag";++import { DateTime } from "metabase/common/components/DateTime";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { PaginationControls } from "metabase/common/components/PaginationControls";+import { useScrollToTop, useSortingStateChange } from "metabase/common/hooks";+import { MonitorEmptyState } from "metabase/monitor/components/MonitorEmptyState";+import {+ Box,+ Card,+ Flex,+ LoadingOverlay,+ Stack,+ TreeTable,+ type TreeTableColumnDef,+ TreeTableSkeleton,+ useTreeTableInstance,+} from "metabase/ui";+import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";+import { formatNumber } from "metabase/utils/formatting";+import { useMcpEventsQuery } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpEventsQuery";+import {+ MCP_EVENT_SORT_COLUMNS,+ type McpEventSortColumn,+ type McpFilters,+ mcpEventColumnKeys,+} from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils";+import { buildEventsQuery } from "metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils";+import type {+ CardMetadata,+ MetadataProvider,+ TableMetadata,+} from "metabase-lib";+import type { RowValue, RowValues, SortingOptions } from "metabase-types/api";++export const EVENTS_PAGE_SIZE = 25;++const DEFAULT_SORTING: SortingOptions<McpEventSortColumn> = {+ sort_column: "created_at",+ sort_direction: "desc",+};++type EventColumn = {+ key: McpEventSortColumn;+ title: string;+ sort?: McpEventSortColumn;+ align?: "right";+ render?: (value: RowValue) => ReactNode;+};++const EVENT_COLUMN_META: Record<+ McpEventSortColumn,+ () => Omit<EventColumn, "key">+> = {+ tool_call_id: () => ({ title: t`ID`, sort: "tool_call_id" }),+ created_at: () => ({+ title: t`Created at`,+ sort: "created_at",+ render: (value) =>+ value == null ? (+ EMPTY_CELL_PLACEHOLDER+ ) : (+ <DateTime value={String(value)} />+ ),+ }),+ tool_name: () => ({ title: t`Tool`, sort: "tool_name" }),+ client_display_name: () => ({+ title: t`Client`,+ sort: "client_display_name",+ }),+ client_version: () => ({+ title: t`Client version`,+ sort: "client_version",+ }),+ user_display_name: () => ({ title: t`User`, sort: "user_display_name" }),+ tenant_name: () => ({ title: t`Tenant`, sort: "tenant_name" }),+ ip_address: () => ({ title: t`IP address`, sort: "ip_address" }),+ status: () => ({ title: t`Status`, sort: "status" }),+ duration_ms: () => ({+ title: t`Duration (ms)`,+ sort: "duration_ms",+ align: "right",+ render: (value) =>+ value == null ? EMPTY_CELL_PLACEHOLDER : formatNumber(Number(value)),+ }),+ error_type: () => ({ title: t`Error type`, sort: "error_type" }),+ error_message: () => ({ title: t`Error message`, sort: "error_message" }),+};++/**+ * The curated columns surfaced in the events table, in display order. Derived from the same+ * {@link mcpEventColumnKeys} the row-level query projects to (see `buildEventsQuery`). Any other view column (raw ids, client_name, user_agent, …) is never even requested, and+ * `tenant_name`/`ip_address`/`error_message` are only requested when tenants/PII retention are+ * enabled.+ */+export function eventColumns(+ hasTenants: boolean,+ hasPii: boolean,+): EventColumn[] {+ return mcpEventColumnKeys(hasTenants, hasPii).map((key) => ({+ key,+ ...EVENT_COLUMN_META[key](),+ }));+}++function renderCell(column: EventColumn, value: RowValue): ReactNode {+ if (column.render) {+ return column.render(value);+ }+ return value == null || value === "" ? EMPTY_CELL_PLACEHOLDER : String(value);+}++type EventRow = { id: string } & Record<string, RowValue>;++type PaginationProps = {+ page: number;+ total: number;+ onPageChange: (page: number) => void;+};++type SortProps = {+ sortingOptions: SortingOptions<McpEventSortColumn>;+ onSortingOptionsChange: (+ sortingOptions: SortingOptions<McpEventSortColumn>,+ ) => void;+};++type Nullable<T> = { [K in keyof T]: T[K] | null };++type MetadataSources = {+ provider: MetadataProvider;+ table: TableMetadata | CardMetadata;+ groupMembersTable: TableMetadata | CardMetadata;+};++type BaseProps = McpFilters &+ PaginationProps &+ SortProps & {+ hasTenants: boolean;+ hasPii: boolean;+ };++type Props = BaseProps & Nullable<MetadataSources>;+type InnerProps = BaseProps & MetadataSources;++export function McpEventsTable({+ provider,+ table,+ groupMembersTable,+ ...rest+}: Props) {+ if (!provider || !table || !groupMembersTable) {+ return null;+ }+ return (+ <McpEventsTableInner+ provider={provider}+ table={table}+ groupMembersTable={groupMembersTable}+ {...rest}+ />+ );+}++function McpEventsTableInner({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ hasTenants,+ hasPii,+ page,+ total,+ onPageChange,+ sortingOptions,+ onSortingOptionsChange,+}: InnerProps) {+ const columns = useMemo(+ () => eventColumns(hasTenants, hasPii),+ [hasTenants, hasPii],+ );++ const { sort_column: sortColumn, sort_direction: sortDirection } =+ sortingOptions;+ const effectiveSorting = useMemo(() => {+ const visibleSortColumns = new Set(+ columns.map((column) => column.sort).filter(Boolean),+ );+ return visibleSortColumns.has(sortColumn)+ ? { sort_column: sortColumn, sort_direction: sortDirection }+ : DEFAULT_SORTING;+ }, [columns, sortColumn, sortDirection]);++ const query = useMemo(+ () =>+ buildEventsQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ sortColumn: effectiveSorting.sort_column,+ sortDirection: effectiveSorting.sort_direction,+ hasTenants,+ hasPii,+ }),+ [+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ effectiveSorting,+ hasTenants,+ hasPii,+ ],+ );++ const { data, isFetching, error } = useMcpEventsQuery(+ query,+ page,+ EVENTS_PAGE_SIZE,+ );++ // The result columns (`data.data.cols`) are the full, warehouse-ordered set the query returns —+ // not the curated `columns` we render. So we map each curated column to its position in the+ // result by name. Names are upper- or lower-cased depending on the warehouse (the audit DB is H2,+ // which upper-cases; Postgres lower-cases), so match case-insensitively.+ const columnIndex = useMemo(() => {+ const cols = data?.data?.cols ?? [];+ return new Map(cols.map((col, index) => [col.name.toLowerCase(), index]));+ }, [data]);++ const rows: EventRow[] = useMemo(() => {+ const rawRows: RowValues[] = data?.data?.rows ?? [];+ return rawRows.map((rawRow, rowIndex) => {+ const values = Object.fromEntries(+ columns.map((column) => {+ const index = columnIndex.get(column.key);+ return [column.key, index != null ? rawRow[index] : null];+ }),+ );+ const id = String(values.tool_call_id ?? `${page}-${rowIndex}`);+ return { id, ...values };+ });+ }, [data, columns, columnIndex, page]);++ const treeColumns = useMemo<TreeTableColumnDef<EventRow>[]>(+ () =>+ columns.map((column) => ({+ id: column.key,+ header: column.title,+ width: "auto",+ minWidth: 120,+ maxAutoWidth: 320,+ enableSorting: !!column.sort,+ sortDescFirst: column.sort === "created_at",+ accessorFn: (row) => row[column.key],+ cell: ({ row }) => {+ const node = renderCell(column, row.original[column.key]);+ return column.align === "right" ? (+ <Box ta="right" w="100%">+ {node}+ </Box>+ ) : (+ node+ );+ },+ })),+ [columns],+ );++ const { sortingState, onSortingChange } = useSortingStateChange({+ sortingOptions: effectiveSorting,+ columns: MCP_EVENT_SORT_COLUMNS,+ defaultSorting: DEFAULT_SORTING,+ onSortingOptionsChange,+ });++ const treeTableInstance = useTreeTableInstance<EventRow>({+ data: rows,+ columns: treeColumns,+ sorting: sortingState,+ manualSorting: true,+ getNodeId: (row) => row.id,+ onSortingChange,+ });++ useScrollToTop({+ ref: treeTableInstance.containerRef,+ keys: [page, effectiveSorting],+ skip: isFetching,+ });++ const skeletonColumnWidths = columns.map(() => 1 / columns.length);++ return (+ <Stack gap="md" flex={1} mih={0}>+ <Card+ flex="0 1 auto"+ mih={0}+ p={0}+ pos="relative"+ withBorder+ data-testid="mcp-events-table"+ >+ {error ? (+ <Flex mih="60vh" align="center" justify="center">+ <LoadingAndErrorWrapper loading={false} error={error} />+ </Flex>+ ) : !data ? (+ <TreeTableSkeleton columnWidths={skeletonColumnWidths} />+ ) : (+ <>+ <LoadingOverlay visible={isFetching} />+ <TreeTable+ instance={treeTableInstance}+ hierarchical={false}+ ariaLabel={t`Tool calls`}+ emptyState={<MonitorEmptyState label={t`No tool calls found`} />}+ getRowProps={() => ({ "data-testid": "mcp-event" })}+ />+ </>+ )}+ </Card>++ {data && !error && (+ <Flex justify="flex-end">+ <PaginationControls+ page={page}+ pageSize={EVENTS_PAGE_SIZE}+ itemsLength={rows.length}+ total={total}+ showTotal+ onPreviousPage={() => onPageChange(page - 1)}+ onNextPage={() => onPageChange(page + 1)}+ />+ </Flex>+ )}+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.unit.spec.tsxsimilarity index 78%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.unit.spec.tsxindex 18e626ce9d2..a509a7d7685 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpEventsTable.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpEventsTable.unit.spec.tsx@@ -45,18 +45,10 @@ describe("eventColumns", () => {expect(all).not.toContain("mcp_session_id");});- it("marks the expected columns sortable and leaves the rest static", () => {+ it("marks every column sortable, keyed by its own view column name", () => {const columns = eventColumns(true, true);- const sortable = columns.filter((c) => c.sort).map((c) => c.key);- expect(sortable).toEqual([- "created_at",- "tool_name",- "client_display_name",- "user_display_name",- "status",- "duration_ms",- ]);- // the PK and free-text columns are not sortable- expect(columns.find((c) => c.key === "tool_call_id")?.sort).toBeUndefined();+ for (const column of columns) {+ expect(column.sort).toBe(column.key);+ }});});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/constants.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/constants.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/constants.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/constants.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/hooks/useMcpEventsQuery.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpEventsQuery.tssimilarity index 70%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/hooks/useMcpEventsQuery.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpEventsQuery.tsindex 03bd24d071e..e1e5c5eac96 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/hooks/useMcpEventsQuery.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpEventsQuery.ts@@ -1,6 +1,7 @@import { useMemo } from "react";-import { skipToken, useGetAdhocQueryQuery } from "metabase/api";+import { skipToken, useLazyGetAdhocQueryQuery } from "metabase/api";+import { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";import type { Query } from "metabase-lib";import * as Lib from "metabase-lib";import type { Dataset } from "metabase-types/api";@@ -10,6 +11,7 @@ import { paginateEventsQuery } from "../query-utils";type EventsPageResult = {data: Dataset | undefined;isFetching: boolean;+ error: unknown;};/**@@ -28,7 +30,10 @@ export function useMcpEventsQuery([query, page, pageSize],);- const { data, isFetching } = useGetAdhocQueryQuery(jsQuery ?? skipToken);+ const { data, isFetching, error } = useAbortableQuery(+ useLazyGetAdhocQueryQuery,+ jsQuery ?? skipToken,+ );- return { data, isFetching };+ return { data, isFetching, error };}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/hooks/useMcpHasData.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpHasData.tssimilarity index 85%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/hooks/useMcpHasData.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpHasData.tsindex 4222508bac7..7a94d092929 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/hooks/useMcpHasData.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/hooks/useMcpHasData.ts@@ -25,6 +25,8 @@ type Result = {hasData: boolean;/** Total number of tool calls matching the current filters — drives the events pagination. */count: number;+ /** Set when the count query itself failed (e.g. a 500) — the page should show an error, not spin forever. */+ error: unknown;};/**@@ -68,11 +70,13 @@ export function useMcpHasData({],);- const { data, isFetching } = useAdhocBreakoutQuery(query);+ const { data, isFetching, error } = useAdhocBreakoutQuery(query);- // Latch once the first count resolves; from then on a fetch is a refetch, not initial load.+ // Latch once the first count resolves (successfully or not); from then on a fetch is a+ // refetch, not initial load.const hasLoadedOnce = useRef(false);- const resolved = query != null && !isFetching && data != null;+ const resolved =+ query != null && !isFetching && (data != null || error != null);if (resolved) {hasLoadedOnce.current = true;}@@ -86,5 +90,6 @@ export function useMcpHasData({isRefetching: hasLoadedOnce.current && isFetching,hasData: count > 0,count,+ error,};}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/index.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/query-utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils.tssimilarity index 87%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/query-utils.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils.tsindex 78386e21c75..7565c1a372b 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/query-utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils.ts@@ -1,6 +1,14 @@import type { DateFilterValue } from "metabase/querying/common/types";+import {+ applyDateFilter,+ applyIdFilter,+ breakoutByColumn,+ findColumn,+ joinGroupMembers,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-utils";import type {CardMetadata,+ ColumnMetadata,MetadataProvider,Query,TableMetadata,@@ -8,14 +16,6 @@ import type {import * as Lib from "metabase-lib";import type { SortDirection } from "metabase-types/api";-import {- applyDateFilter,- applyIdFilter,- breakoutByColumn,- findColumn,- joinGroupMembers,-} from "../metabot-analytics/components/ConversationStatsPage/query-utils";-export type McpFilters = {dateFilter: DateFilterValue;userId?: number;@@ -32,12 +32,6 @@ type McpDataSources = {// Name of the count aggregation column produced by `Lib.aggregateByCount`.const COUNT_COLUMN = "count";-/**- * Apply the shared user/group/tenant filters to a query. The group filter joins the audit- * `v_group_members` view and filters by `group_id` (a user can belong to several groups); the- * user and tenant filters are plain `user_id` / `tenant_id` equalities. Each no-ops when its id- * is unset.- */function applyScopeFilters(query: Query,{@@ -271,18 +265,44 @@ export function buildTotalCountQuery({return query;}-/** View columns the events table can sort by (server-side). Others render but aren't sortable. */+/** View columns the events table can sort by (server-side). */export const MCP_EVENT_SORT_COLUMNS = [+ "tool_call_id","created_at","tool_name","client_display_name",+ "client_version","user_display_name",+ "tenant_name",+ "ip_address","status","duration_ms",+ "error_type",+ "error_message",] as const;export type McpEventSortColumn = (typeof MCP_EVENT_SORT_COLUMNS)[number];+export function mcpEventColumnKeys(+ hasTenants: boolean,+ hasPii: boolean,+): McpEventSortColumn[] {+ return [+ "tool_call_id",+ "created_at",+ "tool_name",+ "client_display_name",+ "client_version",+ "user_display_name",+ ...(hasTenants ? (["tenant_name"] as const) : []),+ ...(hasPii ? (["ip_address"] as const) : []),+ "status",+ "duration_ms",+ "error_type",+ ...(hasPii ? (["error_message"] as const) : []),+ ];+}+/** Append an order-by on `columnName` in `direction` if it's orderable. No-op if absent. */function orderByColumn(query: Query,@@ -297,16 +317,21 @@ type EventsQueryOpts = McpFilters &McpDataSources & {sortColumn?: McpEventSortColumn;sortDirection?: SortDirection;+ hasTenants: boolean;+ hasPii: boolean;};-/**- * Build the row-level events query for the Events tab: the filtered view with no aggregation,- * ordered by the chosen sort column (default `created_at` descending), then by the `tool_call_id`- * primary key as a tiebreaker. The tiebreaker makes the sort a total order — without it,- * pagination can skip or duplicate rows across page boundaries when the sort column has ties (the- * DB is free to order ties differently between requests). Pagination is applied separately via- * {@link paginateEventsQuery}.- */+function projectToEventColumns(+ query: Query,+ hasTenants: boolean,+ hasPii: boolean,+): Query {+ const fields = mcpEventColumnKeys(hasTenants, hasPii)+ .map((name) => findColumn(query, name, Lib.fieldableColumns))+ .filter((column): column is ColumnMetadata => column != null);+ return Lib.withFields(query, 0, fields);+}+export function buildEventsQuery({provider,table,@@ -317,6 +342,8 @@ export function buildEventsQuery({tenantId,sortColumn = "created_at",sortDirection = "desc",+ hasTenants,+ hasPii,}: EventsQueryOpts): Query {let query = buildBaseQuery({provider,@@ -330,6 +357,7 @@ export function buildEventsQuery({query = orderByColumn(query, sortColumn, sortDirection);query = orderByColumn(query, "tool_call_id", "desc");+ query = projectToEventColumns(query, hasTenants, hasPii);return query;}diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils.unit.spec.tsnew file mode 100644index 00000000000..3754e22cd1c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/query-utils.unit.spec.ts@@ -0,0 +1,48 @@+import { mcpEventColumnKeys } from "./query-utils";++describe("mcpEventColumnKeys", () => {+ it("returns only the base columns when tenants and PII retention are both off", () => {+ expect(mcpEventColumnKeys(false, false)).toEqual([+ "tool_call_id",+ "created_at",+ "tool_name",+ "client_display_name",+ "client_version",+ "user_display_name",+ "status",+ "duration_ms",+ "error_type",+ ]);+ });++ it("includes tenant_name only when tenants are enabled", () => {+ const withTenants = mcpEventColumnKeys(true, false);+ expect(withTenants).toContain("tenant_name");+ expect(withTenants).not.toContain("ip_address");+ expect(withTenants).not.toContain("error_message");+ });++ it("includes ip_address and error_message only when PII retention is on", () => {+ const withPii = mcpEventColumnKeys(false, true);+ expect(withPii).toContain("ip_address");+ expect(withPii).toContain("error_message");+ expect(withPii).not.toContain("tenant_name");+ });++ it("includes every column when both tenants and PII retention are enabled", () => {+ expect(mcpEventColumnKeys(true, true)).toEqual([+ "tool_call_id",+ "created_at",+ "tool_name",+ "client_display_name",+ "client_version",+ "user_display_name",+ "tenant_name",+ "ip_address",+ "status",+ "duration_ms",+ "error_type",+ "error_message",+ ]);+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/raw-series.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/raw-series.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/raw-series.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/raw-series.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/url-state.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/url-state.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/url-state.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/url-state.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/api.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/api.tssimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/api.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/api.tsindex 290499c801d..a5cc59ce3f8 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/api.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/api.ts@@ -50,6 +50,7 @@ export const metabotAnalyticsApi = EnterpriseApi.injectEndpoints({export const {useListMetabotAnalyticsConversationsQuery,+ useLazyListMetabotAnalyticsConversationsQuery,useGetMetabotAnalyticsConversationQuery,useGetDataComplexityScoresQuery,useRefreshDataComplexityScoresMutation,diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.module.css b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.module.cssrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxsimilarity index 68%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxindex 7320ce2f761..d9f190a8970 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx@@ -1,7 +1,7 @@-import { useMemo } from "react";+import { useElementSize } from "@mantine/hooks";+import { useEffect, useMemo, useRef, useState } from "react";import { t } from "ttag";-import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";import { skipToken, useGetAdhocQueryMetadataQuery } from "metabase/api";import { CodeEditor } from "metabase/common/components/CodeEditor";import { ExternalLink } from "metabase/common/components/ExternalLink";@@ -15,8 +15,11 @@ import { useBranchableMessages } from "metabase/metabot/hooks";import type {MetabotAgentTextChatMessage,MetabotChatMessage,+ MetabotDebugToolCallMessage,} from "metabase/metabot/state/types";import { normalizeFetchedChatMessages } from "metabase/metabot/utils/normalize-fetched-chat-messages";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { Sidebar } from "metabase/monitor/components/MonitorLayout/Sidebar";import { Notebook } from "metabase/querying/notebook/components/Notebook";import { useSelector } from "metabase/redux";import { useParams } from "metabase/router";@@ -35,21 +38,50 @@ import {Text,Title,} from "metabase/ui";+import * as Urls from "metabase/urls";import { question as ML_getUrl } from "metabase/urls/questions";import { formatNumber } from "metabase/utils/formatting";+import { checkNotNull } from "metabase/utils/types";import { getUserName } from "metabase/utils/user";-import * as EnterpriseUrls from "metabase-enterprise/urls";+import { useGetMetabotAnalyticsConversationQuery } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/api";+import type {+ ConversationFeedback,+ GeneratedQuery,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/types";import Question from "metabase-lib/v1/Question";import type { DatasetQuery, VisualizationDisplay } from "metabase-types/api";-import { useGetMetabotAnalyticsConversationQuery } from "../../api";-import type { ConversationFeedback, GeneratedQuery } from "../../types";-import { ConversationHeader } from "./ConversationHeader";import { ForkBoundary } from "./ForkBoundary";+import { ToolCallDetailsSidebar } from "./ToolCallDetailsSidebar";export function ConversationDetailPage() {- const { convoId = "" } = useParams();+ const params = useParams();+ // The route always matches with a :convoId segment.+ const convoId = checkNotNull(params.convoId);+ const { ref: containerRef, width: containerWidth } = useElementSize();+ const [selectedToolCall, setSelectedToolCall] =+ useState<MetabotDebugToolCallMessage | null>(null);++ useEffect(() => {+ setSelectedToolCall(null);+ }, [convoId]);++ // The element that opened the sidebar, so focus can return to it on close.+ const triggerElementRef = useRef<HTMLElement | null>(null);+ const handleToolCallSelect = (message: MetabotDebugToolCallMessage) => {+ const isClosing = selectedToolCall?.id === message.id;+ if (!isClosing) {+ const active = document.activeElement;+ triggerElementRef.current = active instanceof HTMLElement ? active : null;+ }+ setSelectedToolCall(isClosing ? null : message);+ };++ const handleSidebarClose = () => {+ setSelectedToolCall(null);+ triggerElementRef.current?.focus();+ };const {data: conversation,@@ -80,9 +112,9 @@ export function ConversationDetailPage() {if (isLoading || error) {return (- <MetabotAdminLayout>+ <MonitorMain><LoadingAndErrorWrapper loading={isLoading} error={error} />- </MetabotAdminLayout>+ </MonitorMain>);}@@ -102,9 +134,7 @@ export function ConversationDetailPage() {} = conversation;const forkBoundaryHref = forked_from_conversation_id- ? EnterpriseUrls.adminMetabotUsageAuditingConversation(- forked_from_conversation_id,- )+ ? Urls.monitorAiAuditingConversationDetail(forked_from_conversation_id): undefined;const forkBoundaryMessage = fork_boundary_message_id@@ -116,75 +146,99 @@ export function ConversationDetailPage() {: undefined;return (- <MetabotAdminLayout>- <Stack gap="2.5rem">- <ConversationHeader conversation={conversation} />-- <SimpleGrid cols={4}>- <StatCard label={t`Messages`} value={formatNumber(message_count)} />- <StatCard- label={t`Total tokens`}- value={formatNumber(total_tokens)}- />- <StatCard label={t`Queries run`} value={formatNumber(query_count)} />- <StatCard label={t`Searches`} value={formatNumber(search_count)} />- </SimpleGrid>-- {feedback.length > 0 && (- <Stack gap="md">- <Title order={3}>{t`Feedback`}</Title>- <Stack gap="sm">- {feedback.map((item) => (- <FeedbackCard- key={item.id}- feedback={item}- chatMessages={feedbackChatMessages}+ <Flex ref={containerRef} wrap="nowrap">+ <MonitorMain>+ <Box w="100%" maw={800} mx="auto">+ <Stack gap="xl">+ <ConversationHeader conversation={conversation} />++ <SimpleGrid cols={4}>+ <StatCard+ label={t`Messages`}+ value={formatNumber(message_count)}+ />+ <StatCard+ label={t`Total tokens`}+ value={formatNumber(total_tokens)}+ />+ <StatCard+ label={t`Queries run`}+ value={formatNumber(query_count)}+ />+ <StatCard+ label={t`Searches`}+ value={formatNumber(search_count)}+ />+ </SimpleGrid>++ {feedback.length > 0 && (+ <Stack gap="md">+ <Title order={3}>{t`Feedback`}</Title>+ <Stack gap="sm">+ {feedback.map((item) => (+ <FeedbackCard+ key={item.id}+ feedback={item}+ chatMessages={feedbackChatMessages}+ conversationId={convoId}+ />+ ))}+ </Stack>+ </Stack>+ )}++ <Stack gap="md">+ <Flex align="baseline" justify="space-between">+ <Title order={3}>{t`Conversation`}</Title>+ {conversation.slack_permalink && (+ <ExternalLink href={conversation.slack_permalink}>+ {t`Open in Slack`}+ </ExternalLink>+ )}+ </Flex>+ <Card withBorder shadow="none" p="xl">+ <Messages+ messages={messages}+ getExtraActions={getExtraActions}+ isDoingScience={false}+ debug+ readonlyconversationId={convoId}+ onToolCallSelect={handleToolCallSelect}+ renderAfterMessage={(message) =>+ message === forkBoundaryMessage ? (+ <ForkBoundary href={forkBoundaryHref} />+ ) : null+ }/>- ))}+ </Card></Stack>- </Stack>- )}- <Stack gap="md">- <Flex align="baseline" justify="space-between">- <Title order={3}>{t`Conversation`}</Title>- {conversation.slack_permalink && (- <ExternalLink href={conversation.slack_permalink}>- {t`Open in Slack`}- </ExternalLink>+ {queries.length > 0 && (+ <Stack gap="md">+ <Title order={3}>{t`Queries generated`}</Title>+ {queries.map((query) => (+ <GeneratedQueryCard+ key={+ query.call_id ?? `${query.message_id}-${query.query_id}`+ }+ query={query}+ />+ ))}+ </Stack>)}- </Flex>- <Card withBorder shadow="none" p="xl">- <Messages- messages={messages}- getExtraActions={getExtraActions}- isDoingScience={false}- debug- readonly- conversationId={convoId}- renderAfterMessage={(message) =>- message === forkBoundaryMessage ? (- <ForkBoundary href={forkBoundaryHref} />- ) : null- }- />- </Card>- </Stack>-- {queries.length > 0 && (- <Stack gap="md">- <Title order={3}>{t`Queries generated`}</Title>- {queries.map((query) => (- <GeneratedQueryCard- key={query.call_id ?? `${query.message_id}-${query.query_id}`}- query={query}- />- ))}</Stack>- )}- </Stack>- </MetabotAdminLayout>+ </Box>+ </MonitorMain>+ {selectedToolCall && (+ <Sidebar containerWidth={containerWidth}>+ <ToolCallDetailsSidebar+ message={selectedToolCall}+ onClose={handleSidebarClose}+ />+ </Sidebar>+ )}+ </Flex>);}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsxsimilarity index 79%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsxindex d82ad9cedd8..2f4a9240e88 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx@@ -7,14 +7,21 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, within } from "__support__/ui";import { Route } from "metabase/router";+import * as Urls from "metabase/urls";+import type {+ ConversationDetail,+ ConversationFeedback,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/types";import { createMockUser } from "metabase-types/api/mocks";-import type { ConversationDetail, ConversationFeedback } from "../../types";-import { ConversationDetailPage } from "./ConversationDetailPage";-jest.mock("metabase/admin/ai/MetabotAdminLayout", () => ({- MetabotAdminLayout: ({ children }: { children: React.ReactNode }) => children,+jest.mock("metabase/monitor/components/MonitorLayout", () => ({+ MonitorMain: ({ children }: { children: React.ReactNode }) => children,+}));++jest.mock("metabase/monitor/components/MonitorLayout/Sidebar", () => ({+ Sidebar: ({ children }: { children: React.ReactNode }) => children,}));type ConversationMessage = ConversationDetail["messages"][number];@@ -58,6 +65,19 @@ function inProgressMessage(id: string, parentId: string): ConversationMessage {};}+function toolCallMessage(id: string, parentId: string): ConversationMessage {+ return {+ id,+ parent_message_id: parentId,+ role: "agent",+ type: "tool_call",+ name: "search",+ status: "ended",+ args: JSON.stringify({ query: "orders" }),+ result: JSON.stringify({ count: 3 }),+ };+}+function createConversation(messages: ConversationMessage[],feedback: ConversationFeedback[] = [],@@ -145,7 +165,7 @@ describe("ConversationDetailPage", () => {});expect(forkBoundaryLink).toHaveAttribute("href",- "/admin/metabot/usage-auditing/conversations/convo-0",+ Urls.monitorAiAuditingConversationDetail("convo-0"),);const forkedLink = await screen.findByRole("link", {@@ -153,7 +173,7 @@ describe("ConversationDetailPage", () => {});expect(forkedLink).toHaveAttribute("href",- "/admin/metabot/usage-auditing/conversations/convo-0",+ Urls.monitorAiAuditingConversationDetail("convo-0"),);});@@ -329,4 +349,57 @@ describe("ConversationDetailPage", () => {expect(await screen.findByText("discarded answer")).toBeInTheDocument();});++ it("shows tool call details in a sidebar, and closes it", async () => {+ setup(+ createConversation([+ userMessage("u1", null, "search orders"),+ toolCallMessage("t1", "u1"),+ agentMessage("a1", "t1", "found 3 orders"),+ ]),+ );++ expect(await screen.findByText("search")).toBeInTheDocument();+ expect(+ screen.queryByTestId("tool-call-details-sidebar"),+ ).not.toBeInTheDocument();++ await userEvent.click(screen.getByText("search"));++ const sidebar = await screen.findByTestId("tool-call-details-sidebar");+ expect(within(sidebar).getByText("Tool Call")).toBeInTheDocument();+ expect(within(sidebar).getAllByText("search")).not.toHaveLength(0);++ await userEvent.click(+ within(sidebar).getByRole("button", { name: "Close" }),+ );++ expect(+ screen.queryByTestId("tool-call-details-sidebar"),+ ).not.toBeInTheDocument();+ });++ it("closes the sidebar when the same tool call is clicked again", async () => {+ setup(+ createConversation([+ userMessage("u1", null, "search orders"),+ toolCallMessage("t1", "u1"),+ agentMessage("a1", "t1", "found 3 orders"),+ ]),+ );++ await screen.findByText("search");+ const toolCallRow = screen.getAllByTestId("metabot-chat-message")[1];++ await userEvent.click(within(toolCallRow).getByText("search"));+ expect(+ await screen.findByTestId("tool-call-details-sidebar"),+ ).toBeInTheDocument();++ await userEvent.click(within(toolCallRow).getByText("search"));++ expect(+ screen.queryByTestId("tool-call-details-sidebar"),+ ).not.toBeInTheDocument();+ });});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsxsimilarity index 91%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsxindex 62f87aee36b..dd2451ab644 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx@@ -8,25 +8,15 @@ import {useListPermissionsGroupsQuery,useListUserMembershipsQuery,} from "metabase/api";-import {- Breadcrumbs,- type Crumb,-} from "metabase/common/components/Breadcrumbs";+import type { Crumb } from "metabase/common/components/Breadcrumbs";import { DateTime } from "metabase/common/components/DateTime";import { ForwardRefLink } from "metabase/common/components/Link";import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";import { renderMetabotProfileLabel } from "metabase/metabot/constants";+import { MonitorBreadcrumbs } from "metabase/monitor/components/MonitorBreadcrumbs";+import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";import { PLUGIN_TENANTS } from "metabase/plugins";-import {- ActionIcon,- Anchor,- Flex,- Icon,- Menu,- Stack,- Text,- Title,-} from "metabase/ui";+import { ActionIcon, Anchor, Flex, Icon, Menu, Stack, Text } from "metabase/ui";import * as Urls from "metabase/urls";import { getUserName } from "metabase/utils/user";import { useGetTenantQuery } from "metabase-enterprise/api";@@ -63,10 +53,10 @@ export function ConversationHeader({const crumbs = useMemo<Crumb[]>(() =>_.compact([- [t`Conversations`, "/admin/metabot/usage-auditing/conversations"],+ [t`Conversations`, Urls.monitorAiAuditingConversations()],conversation.user && [userName,- `/admin/metabot/usage-auditing/conversations?user=${conversation.user.id}`,+ `${Urls.monitorAiAuditingConversations()}?user=${conversation.user.id}`,],<DateTime key="created_at" value={conversation.created_at} />,]),@@ -75,14 +65,14 @@ export function ConversationHeader({return (<>- <Breadcrumbs crumbs={crumbs} />+ <MonitorBreadcrumbs crumbs={crumbs} /><Flex justify="space-between" align="flex-start" gap="md"><Stack gap="sm">- <Flex align="baseline">- <Title order={2}>+ <Flex align="center">+ <MonitorHeaderTitle>{conversation.title || t`Conversation with ${userName}`}- </Title>+ </MonitorHeaderTitle>{conversation.user && (<Menu shadow="md" position="bottom-start" withinPortal><Menu.Target>@@ -146,7 +136,7 @@ export function ConversationHeader({<Icon name="git_branch" size={16} c="text-disabled" /><Anchorcomponent={ForwardRefLink}- to={EnterpriseUrls.adminMetabotUsageAuditingConversation(+ to={Urls.monitorAiAuditingConversationDetail(conversation.forked_from_conversation_id,)}c="text-secondary"diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ForkBoundary.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ForkBoundary.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ForkBoundary.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ForkBoundary.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.module.css b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.module.cssnew file mode 100644index 00000000000..77c6b127301--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.module.css@@ -0,0 +1,5 @@+.sidebar {+ flex: 1 1 auto;+ overflow: auto;+ border-left: 1px solid var(--mb-color-border-neutral);+}diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.tsxnew file mode 100644index 00000000000..32f86cde444--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.tsx@@ -0,0 +1,59 @@+import { useEffect, useId, useRef } from "react";+import { t } from "ttag";++import { ToolCallDetailsContent } from "metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage";+import type { MetabotDebugToolCallMessage } from "metabase/metabot/state";+import { ActionIcon, Badge, Flex, Icon, Stack, Text } from "metabase/ui";++import S from "./ToolCallDetailsSidebar.module.css";++type ToolCallDetailsSidebarProps = {+ message: MetabotDebugToolCallMessage;+ onClose: () => void;+};++export function ToolCallDetailsSidebar({+ message,+ onClose,+}: ToolCallDetailsSidebarProps) {+ const headingId = useId();+ const closeButtonRef = useRef<HTMLButtonElement>(null);++ // Move focus into the newly-opened panel+ // so keyboard/screen-reader users land on the details.+ useEffect(() => {+ closeButtonRef.current?.focus();+ }, [message.id]);++ return (+ <Stack+ className={S.sidebar}+ p="lg"+ gap="lg"+ bg="background_page-primary"+ data-testid="tool-call-details-sidebar"+ role="region"+ aria-labelledby={headingId}+ >+ <Stack gap="xs">+ <Flex align="center" justify="space-between" gap="md" wrap="nowrap">+ <Text id={headingId} fw="bold">{t`Tool Call`}</Text>+ <ActionIcon+ ref={closeButtonRef}+ aria-label={t`Close`}+ onClick={onClose}+ >+ <Icon name="close" />+ </ActionIcon>+ </Flex>+ <Flex align="center" gap="sm">+ <Text c="text-secondary">{message.name}</Text>+ <Badge color="brand" size="sm" variant="light">+ {message.id}+ </Badge>+ </Flex>+ </Stack>+ <ToolCallDetailsContent message={message} />+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/index.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/index.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/url-state.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/url-state.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/url-state.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/url-state.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChart.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChart.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChart.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChart.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChart.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChart.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChart.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChart.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ChartCard.module.css b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ChartCard.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ChartCard.module.cssrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ChartCard.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsxsimilarity index 82%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsxindex 407b55e4814..71a0e7261df 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx@@ -2,35 +2,45 @@ import dayjs from "dayjs";import { useCallback, useMemo } from "react";import { t } from "ttag";-import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";-import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";import { getErrorMessage } from "metabase/api/utils";import { useToast } from "metabase/common/hooks";import { useUrlState } from "metabase/common/hooks/use-url-state";+import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { serializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";import { useDispatch } from "metabase/redux";import { push, queryToSearch, useLocation } from "metabase/router";-import { Button, Flex, SimpleGrid, Tabs, Text, Title } from "metabase/ui";-import { hasPremiumFeature } from "metabase-enterprise/settings";-+import {+ Button,+ Flex,+ SimpleGrid,+ Stack,+ Tabs,+ Text,+ Title,+} from "metabase/ui";+import * as Urls from "metabase/urls";import {useGetDataComplexityScoresQuery,useRefreshDataComplexityScoresMutation,-} from "../../api";+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/api";import {- VIEW_CONVERSATIONS,- VIEW_GROUP_MEMBERS,- VIEW_USAGE_LOG,-} from "../../constants";-import { useAuditTable } from "../../hooks/useAuditTable";-import { ConversationFilters, useFilterOptions } from "../ConversationFilters";+ ConversationFilters,+ useFilterOptions,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters";import {type UrlState as ConversationsUrlState,urlStateConfig as conversationsUrlStateConfig,-} from "../ConversationsPage/utils";+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/utils";+import {+ VIEW_CONVERSATIONS,+ VIEW_GROUP_MEMBERS,+ VIEW_USAGE_LOG,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/constants";+import { useAuditTable } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable";+import { hasPremiumFeature } from "metabase-enterprise/settings";import { BreakoutChart } from "./BreakoutChart";-import S from "./ConversationStatsPage.module.css";import {ConversationsByDayChart,isSingleDayFilter,@@ -193,7 +203,7 @@ export function ConversationStatsPage() {(filterOverrides: Partial<ConversationsUrlState>) => {dispatch(push({- pathname: "/admin/metabot/usage-auditing/conversations",+ pathname: Urls.monitorAiAuditingConversations(),search: queryToSearch(conversationsUrlStateConfig.serialize({page: 0,@@ -260,60 +270,42 @@ export function ConversationStatsPage() {);return (- <MetabotAdminLayout fullWidth>- <SettingsPageWrapper- mt="sm"- title={hasDataComplexityFeature ? t`Usage stats` : undefined}- >- <Flex align="center" justify="space-between">- {hasDataComplexityFeature ? (- <Title order={3} display="flex" style={{ alignItems: "center" }}>- {t`Usage metrics`}- </Title>- ) : (- <Title order={2} display="flex" style={{ alignItems: "center" }}>- {t`Usage stats`}- </Title>- )}-- <ConversationFilters- date={date}- onDateChange={(val) => patchUrlState({ date: val })}- user={user}- onUserChange={(val) => patchUrlState({ user: val })}- group={group}- onGroupChange={(val) => patchUrlState({ group: val })}- groupNoFilterValue={groupNoFilterValue}- tenant={tenant}- onTenantChange={(val) => patchUrlState({ tenant: val })}- userOptions={userOptions}- groupOptions={groupOptions}- tenantOptions={tenantOptions}- hasTenants={hasTenants}- />- </Flex>+ <MonitorMain>+ <Stack gap="lg">+ <MonitorHeaderTitle>+ {hasDataComplexityFeature ? t`Usage metrics` : t`Usage stats`}+ </MonitorHeaderTitle><Tabsvariant="pills"value={metric}onChange={(value) => patchUrlState({ metric: value ?? undefined })}>- <Tabs.List className={S.metricTabs}>- <Tabs.Tab- className={S.metricTab}- value="conversations"- >{t`Conversations`}</Tabs.Tab>- <Tabs.Tab- className={S.metricTab}- value="tokens"- >{t`Tokens`}</Tabs.Tab>- <Tabs.Tab- className={S.metricTab}- value="messages"- >{t`Messages`}</Tabs.Tab>+ <Tabs.List>+ <Tabs.Tab value="conversations">{t`Conversations`}</Tabs.Tab>+ <Tabs.Tab value="tokens">{t`Tokens`}</Tabs.Tab>+ <Tabs.Tab value="messages">{t`Messages`}</Tabs.Tab></Tabs.List></Tabs>-+ </Stack>++ <ConversationFilters+ date={date}+ onDateChange={(val) => patchUrlState({ date: val })}+ user={user}+ onUserChange={(val) => patchUrlState({ user: val })}+ group={group}+ onGroupChange={(val) => patchUrlState({ group: val })}+ groupNoFilterValue={groupNoFilterValue}+ tenant={tenant}+ onTenantChange={(val) => patchUrlState({ tenant: val })}+ userOptions={userOptions}+ groupOptions={groupOptions}+ tenantOptions={tenantOptions}+ hasTenants={hasTenants}+ />++ <Stack gap="lg"><ConversationsByDayChart{...sharedChartProps}onDimensionClick={handleDayClick}@@ -375,8 +367,8 @@ export function ConversationStatsPage() {</SimpleGrid><DataComplexitySection />- </SettingsPageWrapper>- </MetabotAdminLayout>+ </Stack>+ </MonitorMain>);}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsxsimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsxindex e874572b32c..6a6a62e69ed 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx@@ -11,17 +11,9 @@ import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor, within } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";+import * as Urls from "metabase/urls";import { parseSearchQuery } from "metabase/utils/browser";-import type { ClickObject } from "metabase-lib";-import type { Dataset, RawSeries, RowValue } from "metabase-types/api";-import {- createMockColumn,- createMockDataset,- createMockDatasetData,- createMockTokenFeatures,-} from "metabase-types/api/mocks";--import { AUDIT_DB_ID } from "../../constants";+import { AUDIT_DB_ID } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/constants";import {ADMIN_GROUP,ALL_USERS_GROUP,@@ -31,15 +23,19 @@ import {ROBERT,ROBERT_TENANT,selectFilterOption,-} from "../../tests/fixtures";+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/tests/fixtures";+import type { ClickObject } from "metabase-lib";+import type { Dataset, RawSeries, RowValue } from "metabase-types/api";+import {+ createMockColumn,+ createMockDataset,+ createMockDatasetData,+ createMockTokenFeatures,+} from "metabase-types/api/mocks";import { ConversationStatsPage } from "./ConversationStatsPage";import { buildAuditViewsFixture } from "./audit-views-fixture";-jest.mock("metabase/admin/ai/MetabotAdminLayout", () => ({- MetabotAdminLayout: ({ children }: { children: React.ReactNode }) => children,-}));-jest.mock("metabase/visualizations/components/Visualization", () => {type StubProps = {rawSeries?: RawSeries | null;@@ -83,8 +79,8 @@ jest.mock("metabase/visualizations/components/Visualization", () => {return { __esModule: true, default: StubVisualization };});-const STATS_PATH = "/admin/metabot/usage-auditing";-const CONVERSATIONS_PATH = "/admin/metabot/usage-auditing/conversations";+const STATS_PATH = Urls.monitorAiAuditingUsage();+const CONVERSATIONS_PATH = Urls.monitorAiAuditingConversations();const { database: auditDatabase } = buildAuditViewsFixture();diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.module.css b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.module.cssrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityHeader.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityHeader.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexityHeader.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexitySection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexitySection.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexitySection.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/DataComplexitySection.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snap b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snapsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snaprename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snapdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/query-snapshots.unit.spec.ts.snap b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/query-snapshots.unit.spec.ts.snapsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/query-snapshots.unit.spec.ts.snaprename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/query-snapshots.unit.spec.ts.snapdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/audit-views-fixture.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/audit-views-fixture.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/audit-views-fixture.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/audit-views-fixture.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.unit.spec.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/index.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-snapshots.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-snapshots.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-snapshots.unit.spec.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-snapshots.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-summary.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-summary.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-summary.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-summary.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-utils.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-utils.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.unit.spec.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/query-utils.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/types.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/types.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/types.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/types.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/utils.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.tsxnew file mode 100644index 00000000000..b909484ae85--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx@@ -0,0 +1,117 @@+import { useMemo } from "react";+import { t } from "ttag";++import { PaginationControls } from "metabase/common/components/PaginationControls";+import { useAbortableQuery } from "metabase/common/hooks/use-abortable-query";+import { useUrlState } from "metabase/common/hooks/use-url-state";+import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTitle";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";+import { useLocation } from "metabase/router";+import { Flex } from "metabase/ui";+import { useLazyListMetabotAnalyticsConversationsQuery } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/api";+import {+ ConversationFilters,+ useFilterOptions,+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters";++import { ConversationsTable } from "./ConversationsTable";+import { PAGE_SIZE, urlStateConfig } from "./utils";++export function ConversationsPage() {+ const location = useLocation();+ const [+ { page, sort_column, sort_direction, date, user, group, tenant },+ { patchUrlState },+ ] = useUrlState(location, urlStateConfig);++ const {+ userId,+ groupId,+ groupNoFilterValue,+ tenantId,+ userOptions,+ groupOptions,+ tenantOptions,+ hasTenants,+ } = useFilterOptions({ date, user, group, tenant });++ const {+ data: conversationsData,+ isLoading,+ isFetching,+ error,+ } = useAbortableQuery(+ useLazyListMetabotAnalyticsConversationsQuery,+ {+ limit: PAGE_SIZE,+ offset: page * PAGE_SIZE,+ sort_by: sort_column,+ sort_dir: sort_direction,+ user_id: userId,+ group_id: groupId,+ tenant_id: tenantId,+ date: date ?? undefined,+ },+ { refetchOnMountOrArgChange: true },+ );++ const conversations = useMemo(+ () => conversationsData?.data ?? [],+ [conversationsData],+ );+ const total = conversationsData?.total ?? 0;++ return (+ <Flex h="100%" wrap="nowrap">+ <MonitorMain>+ <MonitorHeaderTitle mb="sm">{t`Conversations`}</MonitorHeaderTitle>++ <ConversationFilters+ date={date}+ onDateChange={(val) => patchUrlState({ date: val, page: 0 })}+ user={user}+ onUserChange={(val) => patchUrlState({ user: val, page: 0 })}+ group={group}+ onGroupChange={(val) => patchUrlState({ group: val, page: 0 })}+ groupNoFilterValue={groupNoFilterValue}+ tenant={tenant}+ onTenantChange={(val) => patchUrlState({ tenant: val, page: 0 })}+ userOptions={userOptions}+ groupOptions={groupOptions}+ tenantOptions={tenantOptions}+ hasTenants={hasTenants}+ />++ <ConversationsTable+ conversations={conversations}+ isLoading={isLoading}+ isFetching={isFetching}+ error={error}+ page={page}+ sortingOptions={{ sort_column, sort_direction }}+ onSortingOptionsChange={(newSortingOptions) =>+ patchUrlState({ ...newSortingOptions, page: 0 })+ }+ />++ {!isLoading && !error && (+ <Flex justify="flex-end">+ <PaginationControls+ onPreviousPage={() =>+ patchUrlState({ page: page - 1 }, { immediate: true })+ }+ onNextPage={() =>+ patchUrlState({ page: page + 1 }, { immediate: true })+ }+ page={page}+ pageSize={PAGE_SIZE}+ itemsLength={conversations.length}+ total={total}+ showTotal+ />+ </Flex>+ )}+ </MonitorMain>+ </Flex>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsxsimilarity index 74%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsxindex 63bcff86539..f353be464c8 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsx@@ -1,3 +1,4 @@+import { act } from "@testing-library/react";import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";@@ -9,15 +10,17 @@ import {setupUsersEndpoints,} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";+import {+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";+import * as Urls from "metabase/urls";import { parseSearchQuery } from "metabase/utils/browser";-import {- createMockTokenFeatures,- createMockUser,-} from "metabase-types/api/mocks";-import {ALL_USERS_GROUP,BOBBY,@@ -26,16 +29,16 @@ import {ROBERT,ROBERT_TENANT,selectFilterOption,-} from "../../tests/fixtures";-import type { ConversationSummary } from "../../types";+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/tests/fixtures";+import type { ConversationSummary } from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/types";+import {+ createMockTokenFeatures,+ createMockUser,+} from "metabase-types/api/mocks";import { ConversationsPage } from "./ConversationsPage";-jest.mock("metabase/admin/ai/MetabotAdminLayout", () => ({- MetabotAdminLayout: ({ children }: { children: React.ReactNode }) => children,-}));--const CONVERSATIONS_PATH = "/admin/metabot/usage-auditing/conversations";+const CONVERSATIONS_PATH = Urls.monitorAiAuditingConversations();const CONVERSATIONS_ENDPOINT = "path:/api/ee/metabot-analytics/conversations";function createSummary(@@ -43,7 +46,7 @@ function createSummary(Pick<ConversationSummary, "conversation_id">,): ConversationSummary {return {- created_at: "2026-01-01T00:00:00Z",+ created_at: "2026-01-15T00:00:00Z",user_id: 1,title: null,message_count: 0,@@ -72,7 +75,8 @@ const BOBBY_CONVERSATION = createSummary({profile_id: "nlq",ip_address: "10.0.0.1",message_count: 4,- total_tokens: 1200,+ total_tokens: 12345,+ cache_read_tokens: 6789,user: {id: BOBBY.id,first_name: BOBBY.first_name,@@ -107,6 +111,9 @@ function setup({initialRoute = CONVERSATIONS_PATH,hasTenants = false,}: SetupOpts = {}) {+ // TreeTable measures column/row sizes via the DOM; jsdom needs a stubbed rect+ // for its virtualized rows to render.+ mockGetBoundingClientRect({ width: 2000, height: 100 });setupEnterprisePlugins();setupListMetabotAnalyticsConversationsEndpoint(conversations, total);setupUsersEndpoints([BOBBY, ROBERT]);@@ -148,25 +155,39 @@ async function assertRequestedWithParams(});}+function findTable() {+ return screen.findByRole("treegrid", { name: "Conversations" });+}+describe("ConversationsPage", () => {describe("table", () => {it("renders the title, user, profile label and IP address of each conversation", async () => {setup();- expect(await screen.findByText("How many orders?")).toBeInTheDocument();- expect(- screen.getByRole("columnheader", { name: "Title" }),- ).toBeInTheDocument();-- const [, titledRow, untitledRow] = screen.getAllByRole("row");- expect(within(titledRow).getAllByRole("cell")[0]).toHaveTextContent(- "How many orders?",- );- expect(within(untitledRow).getAllByRole("cell")[0]).toHaveTextContent(- "Untitled",- );+ const table = await findTable();++ const columnHeaders = [+ "Title",+ "User",+ "Profile",+ "Date",+ "Messages",+ "Tokens",+ "Cached tokens",+ "Queries",+ "Searches",+ "IP",+ ];+ for (const name of columnHeaders) {+ expect(+ within(table).getByRole("columnheader", {+ name: new RegExp(`^${name}\\b`),+ }),+ ).toBeInTheDocument();+ }- const table = screen.getByRole("table");+ expect(within(table).getByText("How many orders?")).toBeInTheDocument();+ expect(within(table).getByText("Untitled")).toBeInTheDocument();expect(within(table).getByText("Bobby Tables")).toBeInTheDocument();expect(within(table).getByText("NLQ")).toBeInTheDocument();expect(within(table).getByText("10.0.0.1")).toBeInTheDocument();@@ -175,6 +196,14 @@ describe("ConversationsPage", () => {expect(within(table).getByText("10.0.0.3")).toBeInTheDocument();});+ it("formats the numeric cells", async () => {+ const table = (setup(), await findTable());++ expect(within(table).getByText("4")).toBeInTheDocument();+ expect(within(table).getByText("12,345")).toBeInTheDocument();+ expect(within(table).getByText("6,789")).toBeInTheDocument();+ });+it("shows an empty state when no conversations match", async () => {setup({ conversations: [] });@@ -186,14 +215,21 @@ describe("ConversationsPage", () => {it("opens the conversation detail page when a row is clicked", async () => {const { history } = setup();- await userEvent.click(await screen.findByText("How many orders?"));+ await findTable();++ await userEvent.click(screen.getAllByTestId("conversation")[0]);expect(await screen.findByTestId("conversation-detail-page"),).toBeInTheDocument();expect(history?.getCurrentLocation().pathname).toBe(- `${CONVERSATIONS_PATH}/${BOBBY_CONVERSATION.conversation_id}`,+ Urls.monitorAiAuditingConversationDetail(+ BOBBY_CONVERSATION.conversation_id,+ ),);++ act(() => history?.goBack());+ expect(history?.getCurrentLocation().pathname).toBe(CONVERSATIONS_PATH);});});@@ -201,7 +237,7 @@ describe("ConversationsPage", () => {it("requests the default sort on first load", async () => {setup();- await screen.findByRole("table");+ await findTable();await assertRequestedWithParams({sort_by: "created_at",sort_dir: "desc",@@ -209,20 +245,20 @@ describe("ConversationsPage", () => {});it.each([- { headerLabel: /^User/, sortBy: "user" },- { headerLabel: /^Profile/, sortBy: "profile_id" },- { headerLabel: /^Date/, sortBy: "created_at" },- { headerLabel: /^Messages/, sortBy: "message_count" },- { headerLabel: /^Tokens/, sortBy: "total_tokens" },- { headerLabel: /^Cached tokens/, sortBy: "cache_read_tokens" },- { headerLabel: /^IP/, sortBy: "ip_address" },+ { headerLabel: /^User\b/, sortBy: "user" },+ { headerLabel: /^Profile\b/, sortBy: "profile_id" },+ { headerLabel: /^Date\b/, sortBy: "created_at" },+ { headerLabel: /^Messages\b/, sortBy: "message_count" },+ { headerLabel: /^Tokens\b/, sortBy: "total_tokens" },+ { headerLabel: /^Cached tokens\b/, sortBy: "cache_read_tokens" },+ { headerLabel: /^IP\b/, sortBy: "ip_address" },])("sorts by $sortBy", async ({ headerLabel, sortBy }) => {setup();- const table = await screen.findByRole("table");+ const table = await findTable();fetchMock.clearHistory();await userEvent.click(- within(table).getByRole("button", { name: headerLabel }),+ within(table).getByRole("columnheader", { name: headerLabel }),);await assertRequestedWithParams({ sort_by: sortBy, sort_dir: "asc" });@@ -236,7 +272,7 @@ describe("ConversationsPage", () => {initialRoute: `${CONVERSATIONS_PATH}?user=${ROBERT.id}&group=${DATA_GROUP.id}&tenant=${BOBBY_TENANT.id}&date=past6days~`,});- await screen.findByRole("table");+ await findTable();await assertRequestedWithParams({user_id: String(ROBERT.id),group_id: String(DATA_GROUP.id),@@ -258,7 +294,7 @@ describe("ConversationsPage", () => {it("filters by user", async () => {const { history } = setup();- await screen.findByRole("table");+ await findTable();await selectFilterOption("conversation-filters-user-select","Robert Tableton",@@ -277,7 +313,7 @@ describe("ConversationsPage", () => {it("filters by group", async () => {setup();- await screen.findByRole("table");+ await findTable();await selectFilterOption("conversation-filters-group-select", "data");await assertRequestedWithParams({ group_id: String(DATA_GROUP.id) });@@ -286,7 +322,7 @@ describe("ConversationsPage", () => {it("filters by date", async () => {setup();- await screen.findByRole("table");+ await findTable();await selectFilterOption("conversation-filters-date-select","Last 7 days",@@ -319,7 +355,7 @@ describe("ConversationsPage", () => {it("hides the tenant filter when tenants are disabled", async () => {setup();- await screen.findByRole("table");+ await findTable();expect(screen.queryByTestId("conversation-filters-tenant-select"),).not.toBeInTheDocument();@@ -334,11 +370,12 @@ describe("ConversationsPage", () => {title: `Conversation ${index}`,}),);- setup({ conversations });+ const { history } = setup({ conversations });expect(await screen.findByText("Conversation 0")).toBeInTheDocument();- await userEvent.click(screen.getByLabelText("Next page"));+ await userEvent.click(screen.getByTestId("next-page-btn"));+ expect(history?.getCurrentLocation().search).toContain("page=1");await assertRequestedWithParams({ offset: "25", limit: "25" });expect(await screen.findByText("Conversation 25")).toBeInTheDocument();expect(screen.queryByText("Conversation 0")).not.toBeInTheDocument();diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsTable.tsxnew file mode 100644index 00000000000..cd485206098--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx@@ -0,0 +1,292 @@+import type { Row } from "@tanstack/react-table";+import { useCallback, useMemo } from "react";+import { t } from "ttag";++import { DateTime } from "metabase/common/components/DateTime";+import { Link } from "metabase/common/components/Link";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { useScrollToTop } from "metabase/common/hooks";+import { useSortingStateChange } from "metabase/common/hooks/use-sorting-state-change";+import { renderMetabotProfileLabel } from "metabase/metabot/constants";+import { MonitorEmptyState } from "metabase/monitor/components/MonitorEmptyState";+import { useDispatch } from "metabase/redux";+import { push } from "metabase/router";+import {+ Badge,+ Card,+ Center,+ Ellipsified,+ type RenderRowLink,+ SortableHeaderPill,+ Tooltip,+ TreeTable,+ type TreeTableColumnDef,+ TreeTableSkeleton,+ useTreeTableInstance,+} from "metabase/ui";+import * as Urls from "metabase/urls";+import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";+import { formatNumber } from "metabase/utils/formatting";+import { getUserName } from "metabase/utils/user";+import type { SortingOptions } from "metabase-types/api";++import {+ CONVERSATION_SORT_COLUMNS,+ type ConversationSortColumn,+ type ConversationSummary,+} from "../../types";++const SKELETON_COLUMN_WIDTHS = [+ 0.14, 0.14, 0.11, 0.12, 0.08, 0.09, 0.1, 0.08, 0.08, 0.06,+];++const DEFAULT_SORTING: SortingOptions<ConversationSortColumn> = {+ sort_column: "created_at",+ sort_direction: "desc",+};++type ConversationRow = ConversationSummary & { id: string };++type Props = {+ conversations: ConversationSummary[];+ isLoading: boolean;+ isFetching: boolean;+ error: unknown;+ page: number;+ sortingOptions: SortingOptions<ConversationSortColumn>;+ onSortingOptionsChange: (+ options: SortingOptions<ConversationSortColumn>,+ ) => void;+};++export function ConversationsTable({+ conversations,+ isLoading,+ isFetching,+ error,+ page,+ sortingOptions,+ onSortingOptionsChange,+}: Props) {+ const dispatch = useDispatch();++ const rows: ConversationRow[] = useMemo(+ () =>+ conversations.map((convo) => ({ ...convo, id: convo.conversation_id })),+ [conversations],+ );+ const columns = useMemo(() => getColumns(), []);++ const { sortingState, onSortingChange } = useSortingStateChange({+ sortingOptions,+ columns: CONVERSATION_SORT_COLUMNS,+ defaultSorting: DEFAULT_SORTING,+ onSortingOptionsChange,+ });++ const getRowHref = useCallback(+ (row: Row<ConversationRow>) =>+ Urls.monitorAiAuditingConversationDetail(row.original.conversation_id),+ [],+ );++ const renderRowLink = useCallback<RenderRowLink<ConversationRow>>(+ (row, props) => <Link to={getRowHref(row)} {...props} />,+ [getRowHref],+ );++ // This only covers keyboard activation (Enter on a keyboard-focused row).+ const handleRowActivate = useCallback(+ (row: Row<ConversationRow>) => {+ dispatch(push(getRowHref(row)));+ },+ [dispatch, getRowHref],+ );++ const treeTableInstance = useTreeTableInstance<ConversationRow>({+ data: rows,+ columns,+ sorting: sortingState,+ manualSorting: true,+ getNodeId: (convo) => convo.id,+ onRowActivate: handleRowActivate,+ onSortingChange,+ });++ useScrollToTop({+ ref: treeTableInstance.containerRef,+ keys: [page, sortingOptions],+ skip: isFetching,+ });++ if (error) {+ return (+ <Card+ flex="0 1 auto"+ mih={0}+ p={0}+ withBorder+ data-testid="conversations-table"+ >+ <Center p="xl">+ <LoadingAndErrorWrapper loading={false} error={error} />+ </Center>+ </Card>+ );+ }++ return (+ <Card+ flex="0 1 auto"+ mih={0}+ p={0}+ withBorder+ data-testid="conversations-table"+ >+ {isLoading ? (+ <TreeTableSkeleton columnWidths={SKELETON_COLUMN_WIDTHS} />+ ) : (+ <TreeTable+ instance={treeTableInstance}+ hierarchical={false}+ ariaLabel={t`Conversations`}+ emptyState={<MonitorEmptyState label={t`No conversations found`} />}+ getRowProps={() => ({ "data-testid": "conversation" })}+ renderRowLink={renderRowLink}+ />+ )}+ </Card>+ );+}++function getColumns(): TreeTableColumnDef<ConversationRow>[] {+ return [+ {+ id: "title",+ header: t`Title`,+ width: "auto",+ minWidth: 160,+ maxAutoWidth: 280,+ enableSorting: true,+ sortDescFirst: false,+ accessorFn: (convo) => convo.title ?? "",+ cell: ({ row }) => (+ <Ellipsified style={{ maxWidth: 280 }}>+ {row.original.title ?? t`Untitled`}+ </Ellipsified>+ ),+ },+ {+ id: "user",+ header: t`User`,+ width: "auto",+ minWidth: 120,+ maxAutoWidth: 240,+ enableSorting: true,+ sortDescFirst: false,+ accessorFn: (convo) =>+ convo.user ? getUserName(convo.user) : t`Unknown`,+ cell: ({ row }) =>+ row.original.user ? getUserName(row.original.user) : t`Unknown`,+ },+ {+ id: "profile_id",+ header: t`Profile`,+ width: "auto",+ minWidth: 100,+ maxAutoWidth: 200,+ enableSorting: true,+ sortDescFirst: false,+ accessorFn: (convo) => convo.profile_id ?? "",+ cell: ({ row }) =>+ row.original.profile_id ? (+ <Badge color="brand" variant="filled">+ {renderMetabotProfileLabel(row.original.profile_id)}+ </Badge>+ ) : (+ EMPTY_CELL_PLACEHOLDER+ ),+ },+ {+ id: "created_at",+ header: t`Date`,+ width: "auto",+ minWidth: 120,+ enableSorting: true,+ sortDescFirst: true,+ accessorFn: (convo) => convo.created_at,+ cell: ({ row }) => (+ <Ellipsified style={{ maxWidth: 180 }}>+ <DateTime value={row.original.created_at} unit="day" />+ </Ellipsified>+ ),+ },+ {+ id: "message_count",+ header: t`Messages`,+ width: "auto",+ minWidth: 80,+ enableSorting: true,+ sortDescFirst: false,+ accessorFn: (convo) => convo.message_count,+ cell: ({ row }) => formatNumber(row.original.message_count),+ },+ {+ id: "total_tokens",+ header: t`Tokens`,+ width: "auto",+ minWidth: 90,+ enableSorting: true,+ sortDescFirst: false,+ accessorFn: (convo) => convo.total_tokens,+ cell: ({ row }) => formatNumber(row.original.total_tokens),+ },+ {+ id: "cache_read_tokens",+ header: ({ column }) => (+ <Tooltip+ label={t`Portion of tokens served from the provider cache. A subset of Tokens, not an additional count.`}+ >+ <SortableHeaderPill+ name={t`Cached tokens`}+ sort={column.getIsSorted() || undefined}+ />+ </Tooltip>+ ),+ minWidth: 130,+ width: "auto",+ enableSorting: true,+ sortDescFirst: false,+ accessorFn: (convo) => convo.cache_read_tokens,+ cell: ({ row }) => formatNumber(row.original.cache_read_tokens),+ },+ {+ id: "query_count",+ header: t`Queries`,+ width: "auto",+ minWidth: 80,+ enableSorting: false,+ accessorFn: (convo) => convo.query_count,+ cell: ({ row }) => formatNumber(row.original.query_count),+ },+ {+ id: "search_count",+ header: t`Searches`,+ width: "auto",+ minWidth: 80,+ enableSorting: false,+ accessorFn: (convo) => convo.search_count,+ cell: ({ row }) => formatNumber(row.original.search_count),+ },+ {+ id: "ip_address",+ header: t`IP`,+ width: "auto",+ minWidth: 100,+ enableSorting: true,+ sortDescFirst: false,+ accessorFn: (convo) => convo.ip_address ?? "",+ cell: ({ row }) => row.original.ip_address ?? EMPTY_CELL_PLACEHOLDER,+ },+ ];+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/index.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/utils.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/utils.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage.tsxsimilarity index 88%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage.tsxindex 60955475e6b..00ba3aaa29e 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage.tsx@@ -1,11 +1,11 @@import { t } from "ttag";-import { MetabotAdminLayout } from "metabase/admin/ai/MetabotAdminLayout";import { DottedBackground } from "metabase/common/components/upsells/components/DottedBackground";import { LineDecorator } from "metabase/common/components/upsells/components/LineDecorator";import { useUpgradeAction } from "metabase/common/components/upsells/components/UpgradeModal";import { UpsellCardContent } from "metabase/common/components/upsells/components/UpsellCardContent";import { UPGRADE_URL } from "metabase/common/components/upsells/constants";+import { MonitorMain } from "metabase/monitor/components/MonitorLayout";import { Stack } from "metabase/ui";export function MetabotAnalyticsUpsellPage() {@@ -19,10 +19,7 @@ export function MetabotAnalyticsUpsellPage() {});return (- <MetabotAdminLayout- fullWidth- innerContentProps={{ fullWidth: true, fullHeight: true }}- >+ <MonitorMain p={0}><DottedBackground p="4rem"><Stack align="center" p={40}><LineDecorator>@@ -39,6 +36,6 @@ export function MetabotAnalyticsUpsellPage() {</LineDecorator></Stack></DottedBackground>- </MetabotAdminLayout>+ </MonitorMain>);}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/MetabotAnalyticsUpsellPage/index.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/MetabotAnalyticsUpsellPage/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/MetabotAnalyticsUpsellPage/index.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/MetabotAnalyticsUpsellPage/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/constants.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/constants.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/constants.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/constants.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAdhocBreakoutQuery.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAdhocBreakoutQuery.tssimilarity index 84%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAdhocBreakoutQuery.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAdhocBreakoutQuery.tsindex f6e39e2ad10..90d84f28ee2 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAdhocBreakoutQuery.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAdhocBreakoutQuery.ts@@ -9,6 +9,7 @@ type AdhocQueryResult = {data: Dataset | undefined;jsQuery: DatasetQuery | null;isFetching: boolean;+ error: unknown;};export function useAdhocBreakoutQuery(query: Query | null): AdhocQueryResult {@@ -18,11 +19,11 @@ export function useAdhocBreakoutQuery(query: Query | null): AdhocQueryResult {[query],);- const { data, isFetching } = useGetAdhocQueryQuery(+ const { data, isFetching, error } = useGetAdhocQueryQuery(// Unjustified type cast. FIXMEjsQuery ?? ({} as DatasetQuery),{ skip: !jsQuery },);- return { data, jsQuery, isFetching };+ return { data, jsQuery, isFetching, error };}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/hooks/useAuditTable.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands.tssimilarity index 85%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands.tsindex 4448b4a0565..297bcd878a9 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/slash-commands.ts@@ -3,8 +3,7 @@ import type { MetabotSlashCommandHandler } from "metabase/plugins/oss/audit";import { addUndo } from "metabase/redux/undo";import { push } from "metabase/router";import { getUserIsAdmin } from "metabase/selectors/user";--import * as EnterpriseUrls from "../../urls";+import * as Urls from "metabase/urls";export const handleMetabotSlashCommand: MetabotSlashCommandHandler = ({command,@@ -27,8 +26,6 @@ export const handleMetabotSlashCommand: MetabotSlashCommandHandler = ({dispatch(addUndo({ message: "No message history to inspect" }));return true;}- dispatch(- push(EnterpriseUrls.adminMetabotUsageAuditingConversation(conversationId)),- );+ dispatch(push(Urls.monitorAiAuditingConversationDetail(conversationId)));return true;};diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/tests/fixtures.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/tests/fixtures.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/tests/fixtures.tsxrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/tests/fixtures.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/types.tssimilarity index 99%rename from enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.tsrename to enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/types.tsindex 98a6a2826e9..295e3d1a463 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/types.ts@@ -39,6 +39,7 @@ export type ConversationSummary = {export const CONVERSATION_SORT_COLUMNS = ["created_at",+ "title","message_count","total_tokens","cache_read_tokens",diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.tsxnew file mode 100644index 00000000000..89283dd7ebb--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.tsx@@ -0,0 +1,45 @@+import { Route, redirect } from "metabase/router";++import { CliAnalyticsPage } from "./cli-analytics/components/CliAnalyticsPage";+import {+ McpAnalyticsAvailabilityLayout,+ MetabotAnalyticsAvailabilityLayout,+} from "./components/AvailabilityLayouts";+import { McpAnalyticsPage } from "./mcp-analytics/components/McpAnalyticsPage";+import { ConversationDetailPage } from "./metabot-analytics/components/ConversationDetailPage";+import { ConversationStatsPage } from "./metabot-analytics/components/ConversationStatsPage";+import { ConversationsPage } from "./metabot-analytics/components/ConversationsPage";+import { MetabotAnalyticsUpsellPage } from "./metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage";++export function getAiAuditingRoutes() {+ return (+ <>+ <Route index element={redirect("usage")} />+ <Route element={<MetabotAnalyticsAvailabilityLayout />}>+ <Route path="usage" element={<ConversationStatsPage />} />+ <Route path="conversations" element={<ConversationsPage />} />+ <Route+ path="conversations/:convoId"+ element={<ConversationDetailPage />}+ />+ </Route>+ <Route element={<McpAnalyticsAvailabilityLayout />}>+ <Route path="mcp" element={<McpAnalyticsPage />} />+ </Route>+ <Route path="cli" element={<CliAnalyticsPage />} />+ </>+ );+}++export function getAiAuditingUpsellRoutes() {+ return (+ <>+ <Route index element={redirect("usage")} />+ <Route path="usage" element={<MetabotAnalyticsUpsellPage />} />+ <Route element={<McpAnalyticsAvailabilityLayout />}>+ <Route path="mcp" element={<McpAnalyticsPage />} />+ </Route>+ <Route path="cli" element={<CliAnalyticsPage />} />+ </>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.unit.spec.tsxnew file mode 100644index 00000000000..9d506adcf79--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.unit.spec.tsx@@ -0,0 +1,169 @@+import { mockSettings } from "__support__/settings";+import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { createMockState } from "metabase/redux/store/mocks";+import { Route } from "metabase/router";+import * as Urls from "metabase/urls";++import { getAiAuditingRoutes, getAiAuditingUpsellRoutes } from "./routes";++jest.mock("./metabot-analytics/components/ConversationStatsPage", () => ({+ ConversationStatsPage: () => <div>Usage stats page</div>,+}));+jest.mock("./metabot-analytics/components/ConversationsPage", () => ({+ ConversationsPage: () => <div>Conversations page</div>,+}));+jest.mock("./metabot-analytics/components/ConversationDetailPage", () => ({+ ConversationDetailPage: () => <div>Conversation detail page</div>,+}));+jest.mock(+ "./metabot-analytics/components/MetabotAnalyticsUpsellPage/MetabotAnalyticsUpsellPage",+ () => ({+ MetabotAnalyticsUpsellPage: () => <div>Usage stats upsell</div>,+ }),+);+jest.mock("./mcp-analytics/components/McpAnalyticsPage", () => ({+ McpAnalyticsPage: () => <div>MCP analytics page</div>,+}));+jest.mock("./cli-analytics/components/CliAnalyticsPage", () => ({+ CliAnalyticsPage: () => <div>CLI analytics page</div>,+}));++type SetupOpts = {+ route: string;+ upsell?: boolean;+ aiFeaturesEnabled?: boolean;+ isConfigured?: boolean;+ mcpEnabled?: boolean;+};++function setup({+ route,+ upsell = false,+ aiFeaturesEnabled = true,+ isConfigured = true,+ mcpEnabled = true,+}: SetupOpts) {+ return renderWithProviders(+ <Route path="/monitor/ai-auditing">+ {upsell ? getAiAuditingUpsellRoutes() : getAiAuditingRoutes()}+ </Route>,+ {+ initialRoute: route,+ withRouter: true,+ storeInitialState: createMockState({+ settings: mockSettings({+ "ai-features-enabled?": aiFeaturesEnabled,+ "llm-metabot-configured?": isConfigured,+ "mcp-enabled?": mcpEnabled,+ }),+ }),+ },+ );+}++describe("AI Auditing routes", () => {+ it.each([false, true])(+ "redirects the section root to Usage stats and preserves the query when upsell is %s",+ async (upsell) => {+ const { history } = setup({+ route: `${Urls.monitorAiAuditing()}?date=past7days~`,+ upsell,+ });++ await waitFor(() => {+ expect(history?.getCurrentLocation()).toMatchObject({+ pathname: Urls.monitorAiAuditingUsage(),+ search: "?date=past7days~",+ });+ });+ },+ );++ it.each([+ [Urls.monitorAiAuditingUsage(), "Usage stats page"],+ ["/monitor/ai-auditing/conversations", "Conversations page"],+ ["/monitor/ai-auditing/conversations/42", "Conversation detail page"],+ ])("blocks %s when AI features are disabled", (route, pageText) => {+ setup({ route, aiFeaturesEnabled: false });++ expect(screen.getByText("AI features are disabled")).toBeInTheDocument();+ expect(screen.queryByText(pageText)).not.toBeInTheDocument();+ });++ it.each([false, true])(+ "prioritizes globally disabled AI on the MCP route when upsell is %s",+ (upsell) => {+ setup({+ route: "/monitor/ai-auditing/mcp",+ upsell,+ aiFeaturesEnabled: false,+ mcpEnabled: false,+ });++ expect(screen.getByText("AI features are disabled")).toBeInTheDocument();+ expect(screen.queryByText("MCP analytics page")).not.toBeInTheDocument();+ expect(+ screen.getByRole("link", { name: "Go to AI Settings" }),+ ).toHaveAttribute("href", Urls.adminAiSettings());+ },+ );++ it("renders Usage stats at the canonical route", () => {+ setup({ route: Urls.monitorAiAuditingUsage() });++ expect(screen.getByText("Usage stats page")).toBeInTheDocument();+ });++ it("renders full Metabot analytics when enabled and configured", () => {+ setup({ route: "/monitor/ai-auditing/conversations" });++ expect(screen.getByText("Conversations page")).toBeInTheDocument();+ });++ it("blocks MCP analytics when MCP is disabled", () => {+ setup({ route: "/monitor/ai-auditing/mcp", mcpEnabled: false });++ expect(screen.getByText("MCP is disabled")).toBeInTheDocument();+ expect(screen.queryByText("MCP analytics page")).not.toBeInTheDocument();+ });++ it("keeps the license upsell ahead of AI configuration", () => {+ setup({+ route: Urls.monitorAiAuditingUsage(),+ upsell: true,+ aiFeaturesEnabled: false,+ isConfigured: false,+ });++ expect(screen.getByText("Usage stats upsell")).toBeInTheDocument();+ expect(+ screen.queryByText("AI features are disabled"),+ ).not.toBeInTheDocument();+ });++ it.each([false, true])(+ "renders CLI analytics unconditionally when upsell is %s",+ (upsell) => {+ setup({+ route: Urls.monitorAiAuditingCli(),+ upsell,+ aiFeaturesEnabled: false,+ isConfigured: false,+ mcpEnabled: false,+ });++ expect(screen.getByText("CLI analytics page")).toBeInTheDocument();+ },+ );++ it("applies MCP availability to the upsell route set", () => {+ setup({+ route: "/monitor/ai-auditing/mcp",+ upsell: true,+ mcpEnabled: false,+ });++ expect(screen.getByText("MCP is disabled")).toBeInTheDocument();+ expect(screen.queryByText("MCP analytics page")).not.toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsxindex 02d613c3493..c9a3cc9d65d 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/tools/ErrorOverview/ErrorOverview.tsx@@ -57,10 +57,7 @@ export const ErrorOverview = () => {);const [runCardQuery] = useLazyGetCardQueryQuery();- const cards = useMemo(- () => (data == null ? [] : getErroringQuestions(data)),- [data],- );+ const cards = useMemo(() => (data ? getErroringQuestions(data) : []), [data]);const total = data?.total_count ?? 0;const pageError = error ?? data?.error;@@ -84,14 +81,14 @@ export const ErrorOverview = () => {const handlePageChange = (nextPage: number) => {setRowSelection({});- patchUrlState({ page: nextPage });+ patchUrlState({ page: nextPage }, { immediate: true });};// A stale/shrunk `?page=N` can point past the result set: the backend returns// no rows and a total of 0, which hides the pagination controls and strands// the user on an empty page. Once the query settles, recover to the first page.const isStrandedPage =- !isFetching && pageError == null && cards.length === 0 && page > 0;+ !isFetching && !pageError && cards.length === 0 && page > 0;useEffect(() => {if (isStrandedPage) {patchUrlState({ page: 0 });@@ -141,7 +138,7 @@ export const ErrorOverview = () => {onFiltersChange={handleFiltersChange}/>- {pageError != null ? (+ {pageError ? (<Center flex={1}><DelayedLoadingAndErrorWrapperloading={isFetching}diff --git a/enterprise/frontend/src/metabase-enterprise/urls.ts b/enterprise/frontend/src/metabase-enterprise/urls.tsindex cd83b5973a7..37e76959bee 100644--- a/enterprise/frontend/src/metabase-enterprise/urls.ts+++ b/enterprise/frontend/src/metabase-enterprise/urls.ts@@ -43,7 +43,3 @@ export function reactivateTenant(tenantId: Tenant["id"]) {export function editUserStrategy(page: "people" | "tenants") {return `/admin/people${page === "tenants" ? "/tenants" : ""}/user-strategy`;}--export function adminMetabotUsageAuditingConversation(conversationId: string) {- return `/admin/metabot/usage-auditing/conversations/${conversationId}`;-}diff --git a/frontend/src/metabase-types/analytics/event.ts b/frontend/src/metabase-types/analytics/event.tsindex 270276ae1df..fe01799e774 100644--- a/frontend/src/metabase-types/analytics/event.ts+++ b/frontend/src/metabase-types/analytics/event.ts@@ -91,5 +91,9 @@ export type MonitorSectionClickedEvent = ValidateEvent<{| "tasks"| "jobs"| "logs"- | "model-caching";+ | "model-caching"+ | "ai-auditing-usage-stats"+ | "ai-auditing-conversations"+ | "ai-auditing-mcp"+ | "ai-auditing-cli";}>;diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.tsxindex dfd9074519d..c762561eaa2 100644--- a/frontend/src/metabase/admin/ai/MetabotNavPane.tsx+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.tsx@@ -5,12 +5,11 @@ import {AdminNavWrapper,} from "metabase/admin/components/AdminNav";import { useSetting } from "metabase/common/hooks";-import { PLUGIN_AI_CONTROLS, PLUGIN_AUDIT } from "metabase/plugins";+import { PLUGIN_AI_CONTROLS } from "metabase/plugins";import { Flex } from "metabase/ui";export function MetabotNavPane() {const AiControlsNavItems = PLUGIN_AI_CONTROLS.getAiControlsNavItems();- const AiAnalyticsNavItems = PLUGIN_AUDIT.getMetabotAnalyticsNavItems();const areAiFeaturesEnabled = useSetting("ai-features-enabled?") !== false;return (@@ -39,7 +38,6 @@ export function MetabotNavPane() {/></AdminNavItem>{AiControlsNavItems}- {AiAnalyticsNavItems}</AdminNavWrapper></Flex>);diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsxindex 112b9bbd7a2..7c9da63b378 100644--- a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx@@ -94,6 +94,14 @@ describe("MetabotNavPane", () => {).toBeInTheDocument();});+ it("no longer exposes the Auditing folder or CLI analytics with audit_app", async () => {+ setup({ aiControlsEnabled: true, auditAppEnabled: true });++ expect(await screen.findByText("AI Settings")).toBeInTheDocument();+ expect(screen.queryByText("Auditing")).not.toBeInTheDocument();+ expect(screen.queryByText("CLI analytics")).not.toBeInTheDocument();+ });+it("displays the ai controls upsell links when the ai controls feature is unavailable", async () => {setup({ aiControlsEnabled: false, aiFeaturesEnabled: true });@@ -123,72 +131,4 @@ describe("MetabotNavPane", () => {screen.getByRole("link", { name: "Authorizations" }),).toHaveAttribute("href", "/admin/metabot/mcp/authorizations");});-- it("shows usage auditing as a folder with MCP analytics (audit app) and an upsell Stats when ai controls is unavailable", async () => {- setup({- aiControlsEnabled: false,- auditAppEnabled: true,- aiFeaturesEnabled: true,- });-- expect(await screen.findByText("AI Settings")).toBeInTheDocument();-- // Expand "Auditing" to reveal its children- await userEvent.click(await screen.findByText("Auditing"));-- // MCP analytics is available with audit_app alone (no ai_controls needed)- expect(- await screen.findByRole("link", { name: "MCP analytics" }),- ).toHaveAttribute("href", "/admin/metabot/usage-auditing/mcp");-- // Metabot stats stays an upsell (still links to usage-auditing); Conversations needs ai_controls- expect(screen.getByRole("link", { name: /Usage stats/ })).toHaveAttribute(- "href",- "/admin/metabot/usage-auditing",- );- expect(screen.queryByText("Conversations")).not.toBeInTheDocument();- });-- it("keeps MCP analytics (and the upsell Stats) available when AI features are disabled", async () => {- // Regression guard: `ai-features-enabled?` must gate only the Metabot children, never the- // `audit_app`-gated MCP analytics child or the upsell stub.- setup({- aiControlsEnabled: false,- auditAppEnabled: true,- aiFeaturesEnabled: false,- });-- await userEvent.click(await screen.findByText("Auditing"));-- expect(- await screen.findByRole("link", { name: "MCP analytics" }),- ).toHaveAttribute("href", "/admin/metabot/usage-auditing/mcp");- expect(screen.getByRole("link", { name: /Usage stats/ })).toHaveAttribute(- "href",- "/admin/metabot/usage-auditing",- );- expect(screen.queryByText("Conversations")).not.toBeInTheDocument();- });-- it("shows usage auditing with Stats, Conversations and MCP analytics when ai controls is available", async () => {- setup({- aiControlsEnabled: true,- auditAppEnabled: true,- aiFeaturesEnabled: true,- });-- await userEvent.click(await screen.findByText("Auditing"));-- expect(- await screen.findByRole("link", { name: "Usage stats" }),- ).toHaveAttribute("href", "/admin/metabot/usage-auditing");- expect(screen.getByRole("link", { name: "Conversations" })).toHaveAttribute(- "href",- "/admin/metabot/usage-auditing/conversations",- );- expect(screen.getByRole("link", { name: "MCP analytics" })).toHaveAttribute(- "href",- "/admin/metabot/usage-auditing/mcp",- );- });});diff --git a/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsx b/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsxindex 5d8065f4090..57618253805 100644--- a/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsx+++ b/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsx@@ -23,7 +23,7 @@ export const ApplicationPermissionsHelp = () => {<Text>{jt`${(<strong key="label">{t`Monitoring:`}</strong>- )} monitoring access grants permissions to the Tools, Auditing, and Troubleshooting tabs in the Admin panel.`}+ )} monitoring access grants permission to use Monitor tools.`}</Text><Text>{jt`${(diff --git a/frontend/src/metabase/admin/routes.tsx b/frontend/src/metabase/admin/routes.tsxindex f8fd586359e..8206220ecb8 100644--- a/frontend/src/metabase/admin/routes.tsx+++ b/frontend/src/metabase/admin/routes.tsx@@ -38,7 +38,6 @@ import { DataModelV1 } from "metabase/metadata/pages/DataModelV1";import {PLUGIN_ADMIN_USER_MENU_ROUTES,PLUGIN_AI_CONTROLS,- PLUGIN_AUDIT,PLUGIN_CACHING,PLUGIN_DB_ROUTING,PLUGIN_SECURITY_CENTER,@@ -286,9 +285,6 @@ export const getRoutes = (path="metabot"element={createElement(createAdminRouteGuard("metabot"))}>- {PLUGIN_AUDIT.getAiAnalyticsRoutes()}- {PLUGIN_AUDIT.getMcpAnalyticsRoutes()}- {PLUGIN_AUDIT.getCliAnalyticsRoutes()}<Route key="index-layout" element={<MetabotAdminLayout />}><Route index key="index" element={<AISettingsPage />} /><Route key="mcp" path="mcp" element={<McpSettingsPage />} />diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxindex 3865f4dc6ba..dd0cc0adcfb 100644--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx@@ -1,6 +1,7 @@import userEvent from "@testing-library/user-event";import {+ mockTextOverflow,renderWithProviders,screen,getIcon as testGetIcon,@@ -119,24 +120,12 @@ describe("PinnedItemCard", () => {});describe("description", () => {- const getBoundingClientRect = HTMLElement.prototype.getBoundingClientRect;- const rangeGetBoundingClientRect = Range.prototype.getBoundingClientRect;-beforeAll(() => {- // Mock return values so that getIsTruncated can kick in- HTMLElement.prototype.getBoundingClientRect = jest- .fn()- .mockReturnValue({ height: 1, width: 1 });- Range.prototype.getBoundingClientRect = jest- .fn()- .mockReturnValue({ height: 1, width: 2 });+ mockTextOverflow();});afterAll(() => {- HTMLElement.prototype.getBoundingClientRect = getBoundingClientRect;- Range.prototype.getBoundingClientRect = rangeGetBoundingClientRect;-- jest.resetAllMocks();+ jest.restoreAllMocks();});it("should render description markdown as plain text", () => {diff --git a/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx b/frontend/src/metabase/common/components/EmptyState/EmptyState.tsxindex 160bc6dc174..2cae4950004 100644--- a/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx+++ b/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx@@ -2,6 +2,7 @@ import cx from "classnames";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import type { ButtonProps } from "metabase/ui";import { Box, Button, Flex, Icon, Text, isValidIconName } from "metabase/ui";import type { IconName } from "metabase-types/api";@@ -45,6 +46,7 @@ type EmptyStateProps = {icon?: IconName;image?: string;spacing?: "sm" | "md";+ actionVariant?: ButtonProps["variant"];};export const EmptyState = ({@@ -58,6 +60,7 @@ export const EmptyState = ({icon,image,spacing = "md",+ actionVariant = "filled",...rest}: EmptyStateProps) => (<div className={className}>@@ -92,11 +95,11 @@ export const EmptyState = ({<Flex className={S.footer} align="center" mx="auto">{action && link && (<Link to={link} target={link.startsWith("http") ? "_blank" : ""}>- <Button variant="filled">{action}</Button>+ <Button variant={actionVariant}>{action}</Button></Link>)}{action && onActionClick && (- <Button onClick={onActionClick} variant="filled">+ <Button onClick={onActionClick} variant={actionVariant}>{action}</Button>)}diff --git a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.tsindex 1585a71c943..4fa345f1734 100644--- a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts+++ b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts@@ -1,4 +1,4 @@-import { useCallback, useEffect, useState } from "react";+import { useCallback, useEffect, useRef, useState } from "react";import { useEffectOnce, useLatest } from "react-use";import _ from "underscore";@@ -17,8 +17,18 @@ export type UrlStateConfig<State extends BaseState> = {serialize: (state: State) => UrlStateQuery;};+type PatchUrlStateOptions = {+ /**+ * Sync this patch to the URL right away instead of waiting out the debounce.+ */+ immediate?: boolean;+};+type UrlStateActions<State extends BaseState> = {- patchUrlState: (patch: Partial<State>) => void;+ patchUrlState: (+ patch: Partial<State>,+ options?: PatchUrlStateOptions,+ ) => void;};export const URL_UPDATE_DEBOUNCE_DELAY = 300;@@ -35,11 +45,29 @@ export function useUrlState<State extends BaseState>(const [state, setState] = useState(() =>parse(parseSearchQuery(location.search)),);- const urlState = useDebouncedValue(state, URL_UPDATE_DEBOUNCE_DELAY);- const patchUrlState = useCallback((patch: Partial<State>) => {- setState((state) => ({ ...state, ...patch }));+ const immediateRef = useRef(false);+ const shouldDebounce = useCallback(() => {+ const isImmediate = immediateRef.current;+ immediateRef.current = false;+ return !isImmediate;}, []);+ const urlState = useDebouncedValue(+ state,+ URL_UPDATE_DEBOUNCE_DELAY,+ shouldDebounce,+ );++ const patchUrlState = useCallback(+ (+ patch: Partial<State>,+ { immediate = false }: PatchUrlStateOptions = {},+ ) => {+ immediateRef.current = immediate;+ setState((state) => ({ ...state, ...patch }));+ },+ [],+ );const updateUrl = useCallback((state: State) => {diff --git a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.ts b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.tsindex a20689c1ecc..99171a00fa0 100644--- a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.ts+++ b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.ts@@ -114,6 +114,46 @@ describe("useUrlState", () => {});});+ it("syncs the URL right away when patched with immediate: true", () => {+ const location = createLocation("?name=abc&score=123");+ const { result, history } = setup({ location });+ const [_state, { patchUrlState }] = result.current;++ act(() => {+ patchUrlState({ score: 456 }, { immediate: true });+ });++ const [state] = result.current;+ expect(state).toEqual({ name: "abc", score: 456 });+ expect(history?.getCurrentLocation().search).toEqual("?name=abc&score=456");+ });++ it("consumes the immediate bypass once, then debounces the next patch", async () => {+ const location = createLocation("?name=abc&score=123");+ const { result, history } = setup({ location });++ act(() => {+ const [, { patchUrlState }] = result.current;+ patchUrlState({ score: 456 }, { immediate: true });+ });++ // The immediate patch is synced right away.+ expect(history?.getCurrentLocation().search).toEqual("?name=abc&score=456");++ act(() => {+ const [, { patchUrlState }] = result.current;+ patchUrlState({ name: "xyz" });+ });++ // The following default patch must still debounce.+ expect(history?.getCurrentLocation().search).toEqual("?name=abc&score=456");+ await waitFor(() => {+ expect(history?.getCurrentLocation().search).toEqual(+ "?name=xyz&score=456",+ );+ });+ });+it("removes query params", async () => {const location = createLocation("?name=abc&score=123");const { result, history } = setup({ location });diff --git a/frontend/src/metabase/common/monitor/selectors.ts b/frontend/src/metabase/common/monitor/selectors.tsindex 3f4a132b5bd..673bc3fc018 100644--- a/frontend/src/metabase/common/monitor/selectors.ts+++ b/frontend/src/metabase/common/monitor/selectors.ts@@ -30,6 +30,17 @@ export function canAccessAlertsManagement(state: State) {return getUserIsAdmin(state);}+export function canAccessAiAuditing(state: State) {+ if (getIsEmbeddingIframe(state)) {+ return false;+ }+ return getUserIsAdmin(state);+}+export function canAccessMonitor(state: State) {- return canAccessMonitorDiagnostics(state) || canAccessMonitoringTools(state);+ return (+ canAccessMonitorDiagnostics(state) ||+ canAccessMonitoringTools(state) ||+ canAccessAiAuditing(state)+ );}diff --git a/frontend/src/metabase/common/monitor/selectors.unit.spec.ts b/frontend/src/metabase/common/monitor/selectors.unit.spec.tsindex dd7ec629a6e..146d4aaee55 100644--- a/frontend/src/metabase/common/monitor/selectors.unit.spec.ts+++ b/frontend/src/metabase/common/monitor/selectors.unit.spec.ts@@ -2,6 +2,7 @@ import { createMockState } from "metabase/redux/store/mocks";import { createMockUser } from "metabase-types/api/mocks";import {+ canAccessAiAuditing,canAccessAlertsManagement,canAccessMonitor,canAccessMonitorDiagnostics,@@ -215,3 +216,49 @@ describe("canAccessAlertsManagement", () => {expect(canAccessAlertsManagement(state)).toBe(false);});});++describe("canAccessAiAuditing", () => {+ beforeEach(() => {+ jest.clearAllMocks();+ getIsEmbeddingIframe.mockReturnValue(false);+ });++ it("returns false when in embedding iframe", () => {+ getIsEmbeddingIframe.mockReturnValue(true);+ const state = createMockState({+ currentUser: createMockUser({ is_superuser: true }),+ });++ expect(canAccessAiAuditing(state)).toBe(false);+ });++ it("returns true when user is admin", () => {+ const state = createMockState({+ currentUser: createMockUser({ is_superuser: true }),+ });++ expect(canAccessAiAuditing(state)).toBe(true);+ });++ it("returns false for an analyst without admin", () => {+ const state = createMockState({+ currentUser: createMockUser({+ is_superuser: false,+ is_data_analyst: true,+ }),+ });++ expect(canAccessAiAuditing(state)).toBe(false);+ });++ it("returns false for a non-admin with the monitoring application permission", () => {+ const state = createMockState({+ currentUser: createMockUser({+ is_superuser: false,+ permissions: { can_access_monitoring: true },+ }),+ });++ expect(canAccessAiAuditing(state)).toBe(false);+ });+});diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsxindex a0a9ee2d6e6..3286b1217a1 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx@@ -1,4 +1,4 @@-import { useClipboard, useDisclosure } from "@mantine/hooks";+import { useClipboard } from "@mantine/hooks";import cx from "classnames";import { useMemo } from "react";import { t } from "ttag";@@ -11,23 +11,38 @@ import {Box,Flex,Icon,- Modal,Stack,Text,+ Tooltip,} from "metabase/ui";import Styles from "./MetabotChat.module.css";-const ToolCallDetailsModal = ({+export const ToolCallTitle = ({message,- onClose,}: {message: MetabotDebugToolCallMessage;- onClose: () => void;-}) => {- const clipboard = useClipboard();- const copy = (value: any) => clipboard.copy(JSON.stringify(value, null, 2));+}) => (+ <Flex align="center" gap="sm">+ {t`Tool Call: ${message.name}`}+ <Badge color="brand" size="sm" variant="light">+ {message.id}+ </Badge>+ </Flex>+);+export const ToolCallDetailsContent = ({+ message,+}: {+ message: MetabotDebugToolCallMessage;+}) => {+ const argsClipboard = useClipboard();+ const resultClipboard = useClipboard();+ const codeBoxProps = {+ p: "xs" as const,+ bd: "1px solid var(--mb-color-border-neutral)",+ bdrs: "sm" as const,+ };const parsedArgs = useMemo(() => {try {return message.args@@ -52,97 +67,97 @@ const ToolCallDetailsModal = ({}, [message.result]);return (- <Modal- opened- onClose={onClose}- size="lg"- title={- <Flex align="center" gap="sm">- {t`Tool Call: ${message.name}`}- <Badge color="brand" size="sm" variant="light">- {message.id}- </Badge>- </Flex>- }- data-testid="tool-call-details-modal"- >- <Stack gap="md">- {message.args && (- <Stack gap="xs">- <Flex gap="xs">- <Text fw="bold">{t`Request`}</Text>- <ActionIcon h="sm" onClick={() => copy(parsedArgs)}>+ <Stack gap="md">+ {message.args && (+ <Stack gap="xs">+ <Flex gap="xs">+ <Text fw="bold">{t`Request`}</Text>+ <Tooltip label={argsClipboard.copied ? t`Copied!` : t`Copy`}>+ <ActionIcon+ h="sm"+ aria-label={t`Copy request JSON`}+ onClick={() => argsClipboard.copy(parsedArgs)}+ ><Icon name="copy" size="1rem" /></ActionIcon>- </Flex>- <Box mx="-1.5rem">- <CodeEditor value={parsedArgs} language="json" readOnly />- </Box>- </Stack>- )}+ </Tooltip>+ </Flex>+ <Box {...codeBoxProps}>+ <CodeEditor value={parsedArgs} language="json" readOnly />+ </Box>+ </Stack>+ )}- {message.result && (- <Stack gap="xs">- <Flex gap="xs">- <Flex align="center" gap="sm">- <Text fw="bold">{t`Response`}</Text>- {message.is_error && (- <Badge color="negative" size="sm">- {t`Errored`}- </Badge>- )}- </Flex>- <ActionIcon h="sm" onClick={() => copy(parsedResult)}>+ {message.result && (+ <Stack gap="xs">+ <Flex gap="xs">+ <Flex align="center" gap="sm">+ <Text fw="bold">{t`Response`}</Text>+ {message.is_error && (+ <Badge color="negative" size="sm">+ {t`Errored`}+ </Badge>+ )}+ </Flex>+ <Tooltip label={resultClipboard.copied ? t`Copied!` : t`Copy`}>+ <ActionIcon+ h="sm"+ aria-label={t`Copy response JSON`}+ onClick={() => resultClipboard.copy(parsedResult)}+ ><Icon name="copy" size="1rem" /></ActionIcon>- </Flex>- <Box mx="-1.5rem">- <CodeEditor value={parsedResult} language="json" readOnly />- </Box>- </Stack>- )}- </Stack>- </Modal>+ </Tooltip>+ </Flex>+ <Box {...codeBoxProps}>+ <CodeEditor value={parsedResult} language="json" readOnly />+ </Box>+ </Stack>+ )}+ </Stack>);};export const AgentToolCallMessage = ({message,+ onSelect,}: {message: MetabotDebugToolCallMessage;+ onSelect?: (message: MetabotDebugToolCallMessage) => void;}) => {- const [modalOpen, { open, close }] = useDisclosure(false);const clipboard = useClipboard();const handleCopy = () => clipboard.copy(JSON.stringify(message, null, 2));+ const handleClick = () => onSelect?.(message);return (- <>- <Flex- p="sm"- pl="md"- bd="1px solid var(--mb-color-border-neutral)"- bdrs="sm"- direction="row"- align="center"- justify="space-between"- className={cx(Styles.agentPartCard, Styles.agentPartClickable)}- role="button"- tabIndex={0}- onClick={open}- onKeyDown={(e) => {- if (e.key === "Enter" || e.key === " ") {- e.preventDefault();- open();- }- }}- >- <Flex align="center">- <Icon name="gear" c="text-secondary" mr="sm" />- <Text fw="bold">{message.name}</Text>- </Flex>- <Flex align="center" gap="xs" className={Styles.agentPartActions}>+ <Flex+ p="sm"+ pl="md"+ bd="1px solid var(--mb-color-border-neutral)"+ bdrs="sm"+ direction="row"+ align="center"+ justify="space-between"+ className={cx(Styles.agentPartCard, Styles.agentPartClickable)}+ role="button"+ tabIndex={0}+ onClick={handleClick}+ onKeyDown={(e) => {+ if (e.key === "Enter" || e.key === " ") {+ e.preventDefault();+ handleClick();+ }+ }}+ >+ <Flex align="center">+ <Icon name="gear" c="text-secondary" mr="sm" />+ <Text fw="bold">{message.name}</Text>+ </Flex>+ <Flex align="center" gap="xs" className={Styles.agentPartActions}>+ <Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}><ActionIconh="sm"+ aria-label={t`Copy tool call JSON`}onClick={(e) => {e.stopPropagation();handleCopy();@@ -151,9 +166,8 @@ export const AgentToolCallMessage = ({><Icon name="copy" size="1rem" /></ActionIcon>- </Flex>+ </Tooltip></Flex>- {modalOpen && <ToolCallDetailsModal message={message} onClose={close} />}- </>+ </Flex>);};diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsxindex 09fab3694ce..fd4d88f865d 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx@@ -18,6 +18,7 @@ import {type MetabotAgentTurnErroredMessage,type MetabotChatMessage,type MetabotDataPart,+ type MetabotDebugToolCallMessage,type MetabotUserChatMessage,forkConversation,isChainOfThoughtMessage,@@ -200,6 +201,7 @@ interface AgentMessageProps extends Omit<BaseMessageProps, "message"> {supportsReasoning?: boolean;onFork?: (messageId: string) => void;isForking?: boolean;+ onToolCallSelect?: (message: MetabotDebugToolCallMessage) => void;}export const AgentMessage = ({@@ -220,6 +222,7 @@ export const AgentMessage = ({supportsReasoning = true,onFork,isForking,+ onToolCallSelect,...props}: AgentMessageProps) => {const messageId = "externalId" in message ? (message.externalId ?? "") : "";@@ -252,7 +255,7 @@ export const AgentMessage = ({/>)).with({ type: "tool_call" }, (m) => (- <AgentToolCallMessage message={m} />+ <AgentToolCallMessage message={m} onSelect={onToolCallSelect} />)).with({ type: "chain_of_thought" }, (m) =>supportsReasoning ? (@@ -514,6 +517,7 @@ export const Messages = ({onInternalLinkClick,getExtraActions,renderAfterMessage,+ onToolCallSelect,}: {messages: MetabotChatMessage[];onRetryMessage?: (messageId: string) => void;@@ -527,6 +531,7 @@ export const Messages = ({onInternalLinkClick?: (navigateToPath: string) => void;getExtraActions?: (messageId: string) => ReactNode;renderAfterMessage?: (message: MetabotChatMessage) => ReactNode;+ onToolCallSelect?: (message: MetabotDebugToolCallMessage) => void;}) => {const dispatch = useDispatch();const visibleMessages = useMemo(@@ -645,6 +650,7 @@ export const Messages = ({}onInternalLinkClick={onInternalLinkClick}supportsReasoning={supportsReasoning}+ onToolCallSelect={onToolCallSelect}isStreaming={isChainOfThoughtMessage(message)? isDoingScience && !nextContentdiff --git a/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/MonitorBreadcrumbs.tsx b/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/MonitorBreadcrumbs.tsxnew file mode 100644index 00000000000..443d2d5ca43--- /dev/null+++ b/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/MonitorBreadcrumbs.tsx@@ -0,0 +1,110 @@+import { Fragment, type MouseEventHandler, type ReactNode } from "react";+import { t } from "ttag";++import type { Crumb } from "metabase/common/components/Breadcrumbs";+import { ForwardRefLink } from "metabase/common/components/Link";+import { Anchor, Ellipsified, Group, Icon } from "metabase/ui";++type CrumbTuple =+ | [title: ReactNode]+ | [+ title: ReactNode,+ urlOrAction: string | MouseEventHandler<HTMLSpanElement>,+ ];++type MonitorBreadcrumbsProps = {+ crumbs: Crumb[];+};++export function MonitorBreadcrumbs({ crumbs }: MonitorBreadcrumbsProps) {+ const normalized = crumbs.map(+ (crumb): CrumbTuple => (Array.isArray(crumb) ? crumb : [crumb]),+ );++ return (+ <Group+ component="nav"+ aria-label={t`Breadcrumbs`}+ gap="sm"+ wrap="nowrap"+ miw={0}+ data-testid="breadcrumbs"+ >+ {normalized.map((crumb, index) => {+ const isCurrent = index === normalized.length - 1;+ return (+ <Fragment key={index}>+ <MonitorBreadcrumb crumb={crumb} isCurrent={isCurrent} />+ {!isCurrent && (+ <Icon+ name="chevronright"+ c="text-secondary"+ size={12}+ aria-hidden+ aria-label={undefined}+ focusable={false}+ />+ )}+ </Fragment>+ );+ })}+ </Group>+ );+}++function MonitorBreadcrumb({+ crumb,+ isCurrent,+}: {+ crumb: CrumbTuple;+ isCurrent: boolean;+}) {+ const [title, urlOrAction] = crumb;+ const url = typeof urlOrAction === "string" ? urlOrAction : undefined;+ const onClick = typeof urlOrAction === "function" ? urlOrAction : undefined;++ if (url) {+ return (+ <Anchor+ component={ForwardRefLink}+ to={url}+ fz="sm"+ fw="normal"+ c="text-secondary"+ underline="never"+ miw={0}+ >+ <Ellipsified tooltip={title}>{title}</Ellipsified>+ </Anchor>+ );+ }++ if (onClick) {+ return (+ <Anchor+ component="button"+ type="button"+ onClick={onClick}+ fz="sm"+ fw="normal"+ c="text-secondary"+ underline="never"+ miw={0}+ >+ <Ellipsified tooltip={title}>{title}</Ellipsified>+ </Anchor>+ );+ }++ return (+ <Ellipsified+ fz="sm"+ fw="normal"+ c={isCurrent ? "text-primary" : "text-secondary"}+ tooltip={title}+ aria-current={isCurrent ? "page" : undefined}+ >+ {title}+ </Ellipsified>+ );+}diff --git a/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/MonitorBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/MonitorBreadcrumbs.unit.spec.tsxnew file mode 100644index 00000000000..7e36d2bf3e8--- /dev/null+++ b/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/MonitorBreadcrumbs.unit.spec.tsx@@ -0,0 +1,103 @@+import userEvent from "@testing-library/user-event";++import {+ mockTextOverflow,+ renderWithProviders,+ screen,+ within,+} from "__support__/ui";+import type { Crumb } from "metabase/common/components/Breadcrumbs";+import { Route } from "metabase/router";++import { MonitorBreadcrumbs } from "./MonitorBreadcrumbs";++function setup(crumbs: Crumb[]) {+ return renderWithProviders(+ <Route path="/" element={<MonitorBreadcrumbs crumbs={crumbs} />} />,+ { withRouter: true },+ );+}++describe("MonitorBreadcrumbs", () => {+ it("renders a labelled breadcrumb nav with decorative separators between crumbs", () => {+ setup([+ ["Conversations", "/conversations"],+ ["Jane Doe", "/conversations?user=1"],+ "Jan 1, 2026",+ ]);++ const breadcrumbs = screen.getByRole("navigation", { name: "Breadcrumbs" });++ expect(within(breadcrumbs).getByText("Conversations")).toBeInTheDocument();+ expect(within(breadcrumbs).getByText("Jane Doe")).toBeInTheDocument();+ expect(within(breadcrumbs).getByText("Jan 1, 2026")).toBeInTheDocument();++ // Separators are decorative: not announced as icons (no accessible label)+ expect(+ within(breadcrumbs).queryByLabelText("chevronright icon"),+ ).not.toBeInTheDocument();+ // and hidden from the accessibility tree. 3 crumbs => 2 separators between them.+ expect(+ within(breadcrumbs).getAllByRole("img", { hidden: true }),+ ).toHaveLength(2);+ });++ it("marks the current crumb with aria-current", () => {+ setup([["Conversations", "/conversations"], "Jan 1, 2026"]);++ expect(screen.getByText("Jan 1, 2026")).toHaveAttribute(+ "aria-current",+ "page",+ );+ expect(screen.getByText("Conversations")).not.toHaveAttribute(+ "aria-current",+ );+ });++ it("renders non-last crumbs with a URL as links", () => {+ setup([+ ["Conversations", "/conversations"],+ ["Jane Doe", "/conversations?user=1"],+ "Jan 1, 2026",+ ]);++ const conversations = screen.getByRole("link", { name: "Conversations" });+ expect(conversations).toHaveAttribute("href", "/conversations");++ const user = screen.getByRole("link", { name: "Jane Doe" });+ expect(user).toHaveAttribute("href", "/conversations?user=1");+ });++ it("renders the last crumb as non-link current-page text", () => {+ setup([["Conversations", "/conversations"], "Jan 1, 2026"]);++ expect(+ screen.queryByRole("link", { name: "Jan 1, 2026" }),+ ).not.toBeInTheDocument();+ expect(screen.getByText("Jan 1, 2026")).toBeInTheDocument();+ });++ it("invokes the onClick handler for action crumbs", async () => {+ const onClick = jest.fn();+ setup([["Go back", onClick], "Current"]);++ await userEvent.click(screen.getByText("Go back"));++ expect(onClick).toHaveBeenCalledTimes(1);+ });++ it("ellipsifies long crumb text with a truncation tooltip", async () => {+ const longText = "A very long crumb title that should be truncated";+ mockTextOverflow();++ setup([["Conversations", "/conversations"], longText]);++ const text = screen.getByText(longText);+ expect(text).toHaveAttribute("data-truncate", "end");+ expect(screen.queryByRole("tooltip")).not.toBeInTheDocument();++ await userEvent.hover(text);++ expect(await screen.findByRole("tooltip")).toHaveTextContent(longText);+ });+});diff --git a/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/index.ts b/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/index.tsnew file mode 100644index 00000000000..f712db8a77a--- /dev/null+++ b/frontend/src/metabase/monitor/components/MonitorBreadcrumbs/index.ts@@ -0,0 +1 @@+export * from "./MonitorBreadcrumbs";diff --git a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsx b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsxindex ab5d5b3f5a8..e2efabb0597 100644--- a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsx+++ b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.tsx@@ -8,6 +8,7 @@ import {trackMonitorSectionClicked,} from "metabase/common/monitor/analytics";import {+ canAccessAiAuditing,canAccessAlertsManagement,canAccessMonitorDiagnostics,canAccessMonitoringTools,@@ -43,6 +44,22 @@ function getActiveSection(pathname: string): MonitorSection | null {P.string.startsWith(Urls.monitorModelPersistenceLog()),() => "model-caching",)+ .with(+ P.string.startsWith(Urls.monitorAiAuditingMcp()),+ () => "ai-auditing-mcp",+ )+ .with(+ P.string.startsWith(Urls.monitorAiAuditingCli()),+ () => "ai-auditing-cli",+ )+ .with(+ P.string.startsWith(Urls.monitorAiAuditingConversations()),+ () => "ai-auditing-conversations",+ )+ .with(+ P.string.startsWith(Urls.monitorAiAuditingUsage()),+ () => "ai-auditing-usage-stats",+ ).otherwise(() => null);}@@ -60,9 +77,11 @@ export function MonitorLayout() {const { pathname } = useLocation();const hasDependenciesFeature = useHasTokenFeature("dependencies");const hasAuditAppFeature = useHasTokenFeature("audit_app");+ const hasAiControlsFeature = useHasTokenFeature("ai_controls");const canAccessDiagnostics = useSelector(canAccessMonitorDiagnostics);const canAccessTools = useSelector(canAccessMonitoringTools);const canAccessAlerts = useSelector(canAccessAlertsManagement);+ const canAccessAiAuditingTab = useSelector(canAccessAiAuditing);const activeSection = getActiveSection(pathname);@@ -113,7 +132,11 @@ export function MonitorLayout() {</AreaTabGroup>)}{hasLogsAndActivity && (- <AreaTabGroup label={t`Logs and activity`} showLabel={isNavbarOpened}>+ <AreaTabGroup+ label={t`Logs and activity`}+ showLabel={isNavbarOpened}+ mb="md"+ ><AreaTablabel={t`Background tasks`}icon="clipboard"@@ -148,6 +171,49 @@ export function MonitorLayout() {/></AreaTabGroup>)}+ {canAccessAiAuditingTab && hasAuditAppFeature && (+ <AreaTabGroup label={t`AI Auditing`} showLabel={isNavbarOpened}>+ <AreaTab+ label={t`Usage stats`}+ icon="lineandbar"+ to={Urls.monitorAiAuditingUsage()}+ isSelected={activeSection === "ai-auditing-usage-stats"}+ showLabel={isNavbarOpened}+ isGated={!hasAiControlsFeature}+ onClick={() =>+ trackMonitorSectionClicked("ai-auditing-usage-stats")+ }+ />+ {hasAiControlsFeature && (+ <AreaTab+ label={t`Conversations`}+ icon="comment"+ to={Urls.monitorAiAuditingConversations()}+ isSelected={activeSection === "ai-auditing-conversations"}+ showLabel={isNavbarOpened}+ onClick={() =>+ trackMonitorSectionClicked("ai-auditing-conversations")+ }+ />+ )}+ <AreaTab+ label={t`MCP analytics`}+ icon="metabot"+ to={Urls.monitorAiAuditingMcp()}+ isSelected={activeSection === "ai-auditing-mcp"}+ showLabel={isNavbarOpened}+ onClick={() => trackMonitorSectionClicked("ai-auditing-mcp")}+ />+ <AreaTab+ label={t`CLI analytics`}+ icon="code_block"+ to={Urls.monitorAiAuditingCli()}+ isSelected={activeSection === "ai-auditing-cli"}+ showLabel={isNavbarOpened}+ onClick={() => trackMonitorSectionClicked("ai-auditing-cli")}+ />+ </AreaTabGroup>+ )}</>);diff --git a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsx b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsxindex 9eff6c647d5..72890b5b562 100644--- a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsx+++ b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsx@@ -32,6 +32,9 @@ const { trackMonitorSectionClicked } = jest.requireMock(interface SetupOpts {isNavbarOpened?: boolean;tokenFeatures?: Partial<TokenFeatures>;+ aiFeaturesEnabled?: boolean;+ isConfigured?: boolean;+ mcpEnabled?: boolean;initialRoute?: string;user?: ReturnType<typeof createMockUser>;children?: ReactNode;@@ -77,18 +80,27 @@ function TestSidebarToggle({ onRender }: { onRender: () => void }) {const setup = ({isNavbarOpened = true,tokenFeatures,+ aiFeaturesEnabled = true,+ isConfigured = true,+ mcpEnabled = true,initialRoute = "/monitor",user = createMockUser({ is_superuser: true }),children = <div data-testid="content">{"Content"}</div>,}: SetupOpts = {}) => {const settings = mockSettings({"token-features": createMockTokenFeatures(tokenFeatures),+ "ai-features-enabled?": aiFeaturesEnabled,+ "llm-metabot-configured?": isConfigured,+ "mcp-enabled?": mcpEnabled,});setupSettingsEndpoints([]);setupPropertiesEndpoints(createMockSettings({"token-features": createMockTokenFeatures(tokenFeatures),+ "ai-features-enabled?": aiFeaturesEnabled,+ "llm-metabot-configured?": isConfigured,+ "mcp-enabled?": mcpEnabled,}),);setupUserKeyValueEndpoints({@@ -214,6 +226,61 @@ describe("MonitorLayout", () => {},);+ const AI_AUDITING_SECTION_CASES = [+ {+ label: "Usage stats",+ route: Urls.monitorAiAuditingUsage(),+ section: "ai-auditing-usage-stats",+ },+ {+ label: "Conversations",+ route: Urls.monitorAiAuditingConversations(),+ section: "ai-auditing-conversations",+ },+ {+ label: "MCP analytics",+ route: Urls.monitorAiAuditingMcp(),+ section: "ai-auditing-mcp",+ },+ {+ label: "CLI analytics",+ route: Urls.monitorAiAuditingCli(),+ section: "ai-auditing-cli",+ },+ ] as const;++ it.each(AI_AUDITING_SECTION_CASES)(+ "marks $label as the current page for its route",+ async ({ label, route }) => {+ setup({+ initialRoute: route,+ tokenFeatures: { audit_app: true, ai_controls: true },+ });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ const activeLink = screen.getByRole("link", { name: label });+ expect(activeLink).toHaveAttribute("aria-current", "page");+ expect(screen.getAllByRole("link", { current: "page" })).toEqual([+ activeLink,+ ]);+ },+ );++ it.each(AI_AUDITING_SECTION_CASES)(+ "tracks opening the $label section",+ async ({ label, section }) => {+ trackMonitorSectionClicked.mockClear();+ setup({ tokenFeatures: { audit_app: true, ai_controls: true } });++ await userEvent.click(await screen.findByRole("link", { name: label }));++ expect(trackMonitorSectionClicked).toHaveBeenCalledWith(section);+ },+ );+it("hides the migrated Tools tabs for an analyst without the monitoring permission", async () => {setup({user: createMockUser({@@ -386,4 +453,155 @@ describe("MonitorLayout", () => {expect(getTabGem("Dependency diagnostics")).not.toBeInTheDocument();expect(getTabGem("Erroring questions")).not.toBeInTheDocument();});++ const AI_AUDITING_GROUP = "AI Auditing";++ it("shows ungated Usage stats, Conversations, and MCP analytics when audit_app and ai_controls are both enabled", async () => {+ setup({ tokenFeatures: { audit_app: true, ai_controls: true } });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ expect(+ screen.getByRole("heading", { name: AI_AUDITING_GROUP }),+ ).toBeInTheDocument();+ expect(screen.getByRole("link", { name: "Usage stats" })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingUsage(),+ );+ expect(getTabGem("Usage stats")).not.toBeInTheDocument();+ expect(screen.getByRole("link", { name: "Conversations" })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingConversations(),+ );+ expect(screen.getByRole("link", { name: "MCP analytics" })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingMcp(),+ );+ expect(screen.getByRole("link", { name: "CLI analytics" })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingCli(),+ );+ });++ it.each([+ { label: "Usage stats", icon: "lineandbar" },+ { label: "Conversations", icon: "comment" },+ { label: "MCP analytics", icon: "metabot" },+ { label: "CLI analytics", icon: "code_block" },+ ])("shows the $icon icon for $label", async ({ label, icon }) => {+ setup({ tokenFeatures: { audit_app: true, ai_controls: true } });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ expect(+ within(screen.getByRole("link", { name: label })).getByRole("img", {+ name: `${icon} icon`,+ }),+ ).toBeInTheDocument();+ });++ it("gates Usage stats and hides Conversations when ai_controls is unavailable", async () => {+ setup({ tokenFeatures: { audit_app: true, ai_controls: false } });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ expect(getTabGem("Usage stats")).toBeInTheDocument();+ expect(+ within(screen.getByRole("link", { name: "Usage stats" })).getByRole(+ "img",+ { name: "lineandbar icon" },+ ),+ ).toBeInTheDocument();+ expect(+ screen.queryByRole("link", { name: "Conversations" }),+ ).not.toBeInTheDocument();+ expect(screen.getByRole("link", { name: "CLI analytics" })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingCli(),+ );+ expect(getTabGem("CLI analytics")).not.toBeInTheDocument();+ });++ it("hides the whole AI Auditing group when audit_app is unavailable", async () => {+ setup({ tokenFeatures: { audit_app: false, ai_controls: true } });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ expect(+ screen.queryByRole("heading", { name: AI_AUDITING_GROUP }),+ ).not.toBeInTheDocument();+ ["Usage stats", "Conversations", "MCP analytics", "CLI analytics"].forEach(+ (name) => {+ expect(screen.queryByRole("link", { name })).not.toBeInTheDocument();+ },+ );+ });++ it("keeps MCP analytics available when the MCP server toggle is off", async () => {+ setup({+ tokenFeatures: { audit_app: true, ai_controls: true },+ mcpEnabled: false,+ });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ expect(screen.getByRole("link", { name: "MCP analytics" })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingMcp(),+ );+ });++ it.each([+ ["AI features are disabled", { aiFeaturesEnabled: false }],+ ["the AI provider is not configured", { isConfigured: false }],+ ])(+ "keeps Metabot analytics links visible when %s",+ async (_label, settings) => {+ setup({+ tokenFeatures: { audit_app: true, ai_controls: true },+ ...settings,+ });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ expect(screen.getByRole("link", { name: "Usage stats" })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingUsage(),+ );+ expect(+ screen.getByRole("link", { name: "Conversations" }),+ ).toHaveAttribute("href", Urls.monitorAiAuditingConversations());+ },+ );++ it("hides the AI Auditing group for a non-admin user", async () => {+ setup({+ tokenFeatures: { audit_app: true, ai_controls: true },+ user: createMockUser({+ is_superuser: false,+ is_data_analyst: true,+ permissions: { can_access_monitoring: true },+ }),+ });++ await waitFor(() => {+ expect(screen.getByTestId("monitor-nav")).toBeInTheDocument();+ });++ expect(+ screen.queryByRole("heading", { name: AI_AUDITING_GROUP }),+ ).not.toBeInTheDocument();+ });});diff --git a/frontend/src/metabase/monitor/route-guards.tsx b/frontend/src/metabase/monitor/route-guards.tsxindex 7dff1017c08..c257c03d9f2 100644--- a/frontend/src/metabase/monitor/route-guards.tsx+++ b/frontend/src/metabase/monitor/route-guards.tsx@@ -1,4 +1,5 @@import {+ canAccessAiAuditing,canAccessAlertsManagement,canAccessMonitor,canAccessMonitorDiagnostics,@@ -31,6 +32,11 @@ const UserCanAccessAlertsManagement = createRedirectGuard("/unauthorized",);+const UserCanAccessAiAuditing = createRedirectGuard(+ (state) => canAccessAiAuditing(state),+ "/unauthorized",+);+export const CanAccessMonitor = () => (<MetabaseIsSetup><UserIsAuthenticated>@@ -58,3 +64,9 @@ export const CanAccessAlertsManagement = () => (<Outlet /></UserCanAccessAlertsManagement>);++export const CanAccessAiAuditing = () => (+ <UserCanAccessAiAuditing>+ <Outlet />+ </UserCanAccessAiAuditing>+);diff --git a/frontend/src/metabase/monitor/route-guards.unit.spec.tsx b/frontend/src/metabase/monitor/route-guards.unit.spec.tsxindex aa07149cc41..5d45fb193f5 100644--- a/frontend/src/metabase/monitor/route-guards.unit.spec.tsx+++ b/frontend/src/metabase/monitor/route-guards.unit.spec.tsx@@ -4,9 +4,14 @@ import {createMockState,} from "metabase/redux/store/mocks";import { Route } from "metabase/router";+import { parseSearchQuery } from "metabase/utils/browser";import { createMockUser } from "metabase-types/api/mocks";-import { CanAccessAlertsManagement, CanAccessMonitor } from "./route-guards";+import {+ CanAccessAiAuditing,+ CanAccessAlertsManagement,+ CanAccessMonitor,+} from "./route-guards";describe("monitor route-guards", () => {describe("CanAccessMonitor", () => {@@ -141,4 +146,74 @@ describe("monitor route-guards", () => {expect(screen.queryByText("alerts page")).not.toBeInTheDocument();});});+ describe("CanAccessAiAuditing", () => {+ interface SetupOpts {+ currentUser?: ReturnType<typeof createMockUser>;+ }++ const setup = ({ currentUser }: SetupOpts = {}) => {+ return renderWithProviders(+ <>+ <Route element={<CanAccessAiAuditing />}>+ <Route+ path="/monitor/ai-auditing/usage"+ element={<div>ai auditing page</div>}+ />+ </Route>+ <Route path="/unauthorized" element={<div>unauthorized</div>} />+ </>,+ {+ storeInitialState: createMockState({+ currentUser,+ settings: createMockSettingsState({ "has-user-setup": true }),+ }),+ withRouter: true,+ initialRoute: "/monitor/ai-auditing/usage",+ },+ );+ };++ it("renders the page for superusers", async () => {+ setup({ currentUser: createMockUser({ is_superuser: true }) });++ expect(await screen.findByText("ai auditing page")).toBeInTheDocument();+ });++ it("redirects a non-admin with monitoring permission to unauthorized without redirect-back", async () => {+ const { history } = setup({+ currentUser: createMockUser({+ is_superuser: false,+ is_data_analyst: false,+ permissions: { can_access_monitoring: true },+ }),+ });++ await waitFor(() => {+ expect(history?.getCurrentLocation().pathname).toBe("/unauthorized");+ });++ expect(+ parseSearchQuery(history?.getCurrentLocation().search ?? ""),+ ).toEqual({});+ expect(screen.queryByText("ai auditing page")).not.toBeInTheDocument();+ });++ it("redirects an analyst to unauthorized without redirect-back", async () => {+ const { history } = setup({+ currentUser: createMockUser({+ is_superuser: false,+ is_data_analyst: true,+ }),+ });++ await waitFor(() => {+ expect(history?.getCurrentLocation().pathname).toBe("/unauthorized");+ });++ expect(+ parseSearchQuery(history?.getCurrentLocation().search ?? ""),+ ).toEqual({});+ expect(screen.queryByText("ai auditing page")).not.toBeInTheDocument();+ });+ });});diff --git a/frontend/src/metabase/monitor/routes.tsx b/frontend/src/metabase/monitor/routes.tsxindex 27641e6e4d6..0c046d8cfb2 100644--- a/frontend/src/metabase/monitor/routes.tsx+++ b/frontend/src/metabase/monitor/routes.tsx@@ -17,7 +17,11 @@ import {getNotificationsRoutes,getTasksRoutes,} from "metabase/monitor/tools/routes";-import { PLUGIN_MONITOR, PLUGIN_MONITOR_TOOLS } from "metabase/plugins";+import {+ PLUGIN_AUDIT,+ PLUGIN_MONITOR,+ PLUGIN_MONITOR_TOOLS,+} from "metabase/plugins";import { useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import { Navigate, Route, redirect } from "metabase/router";@@ -25,6 +29,7 @@ import * as Urls from "metabase/urls";import { MonitorLayout } from "./components/MonitorLayout";import {+ CanAccessAiAuditing,CanAccessAlertsManagement,CanAccessMonitor,CanAccessMonitorDiagnostics,@@ -84,6 +89,14 @@ export function getMonitorRoutes() {<Route path="notifications">{getNotificationsRoutes()}</Route></Route>+ <Route element={<CanAccessAiAuditing />}>+ {PLUGIN_AUDIT.isAiAuditingEnabled && (+ <Route path="ai-auditing">+ {PLUGIN_AUDIT.getAiAuditingRoutes()}+ </Route>+ )}+ </Route>+<Route path="*" element={<NotFound />} /></Route></Route>@@ -99,9 +112,10 @@ function getMonitorIndexPath(state: State) {}/**- * Legacy redirects for Admin Tools pages that moved into the Monitor area:+ * Legacy redirects for pages that moved into the Monitor area:* - /admin/tools → /monitor* - /admin/tools/help → /admin/help+ * - /admin/metabot/usage-auditing → /monitor/ai-auditing/usage** The Data Studio → Monitor redirect for Dependency Diagnostics lives in* data-studio/routes.tsx instead: it must be declared inside the Data Studio@@ -154,6 +168,26 @@ export function getMonitorRedirects() {path="/admin/tools/notifications/*"element={redirect(`${Urls.monitorNotifications()}/*`)}/>+ <Route+ path="/admin/metabot/usage-auditing"+ element={redirect(Urls.monitorAiAuditingUsage())}+ />+ <Route+ path="/admin/metabot/usage-auditing/conversations"+ element={redirect(Urls.monitorAiAuditingConversations())}+ />+ <Route+ path="/admin/metabot/usage-auditing/conversations/*"+ element={redirect(`${Urls.monitorAiAuditingConversations()}/*`)}+ />+ <Route+ path="/admin/metabot/usage-auditing/mcp"+ element={redirect(Urls.monitorAiAuditingMcp())}+ />+ <Route+ path="/admin/metabot/usage-auditing/cli"+ element={redirect(Urls.monitorAiAuditingCli())}+ /><Route path="/admin/tools" element={redirect(Urls.monitor())} /></>);diff --git a/frontend/src/metabase/monitor/routes.unit.spec.tsx b/frontend/src/metabase/monitor/routes.unit.spec.tsxindex ad8028bf093..1532d441fe4 100644--- a/frontend/src/metabase/monitor/routes.unit.spec.tsx+++ b/frontend/src/metabase/monitor/routes.unit.spec.tsx@@ -1,8 +1,9 @@import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { renderWithProviders, screen } from "__support__/ui";-import { reinitialize } from "metabase/plugins";+import { PLUGIN_AUDIT, reinitialize } from "metabase/plugins";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";+import * as Urls from "metabase/urls";import { createMockUser } from "metabase-types/api/mocks";import { getMonitorRedirects, getMonitorRoutes } from "./routes";@@ -11,7 +12,8 @@ type MonitorGuard =| "CanAccessMonitor"| "CanAccessMonitorDiagnostics"| "CanAccessMonitoringTools"- | "CanAccessAlertsManagement";+ | "CanAccessAlertsManagement"+ | "CanAccessAiAuditing";/*** These specs assert route-tree structure, not access policy, so the guards are@@ -37,6 +39,7 @@ jest.mock("./route-guards", () => {CanAccessMonitorDiagnostics: stubGuard("CanAccessMonitorDiagnostics"),CanAccessMonitoringTools: stubGuard("CanAccessMonitoringTools"),CanAccessAlertsManagement: stubGuard("CanAccessAlertsManagement"),+ CanAccessAiAuditing: stubGuard("CanAccessAiAuditing"),};});@@ -153,6 +156,16 @@ const setup = ({);};+const enableAiAuditingRoutes = () => {+ PLUGIN_AUDIT.isAiAuditingEnabled = true;+ PLUGIN_AUDIT.getAiAuditingRoutes = () => (+ <Route+ path="usage"+ element={<div data-testid="ai-auditing-page">AI Auditing</div>}+ />+ );+};+describe("monitor routes", () => {afterEach(() => {reinitialize();@@ -260,6 +273,22 @@ describe("monitor routes", () => {).not.toBeInTheDocument();});+ it("blocks the AI Auditing route when its own guard denies", async () => {+ enableAiAuditingRoutes();++ setup({+ initialRoute: Urls.monitorAiAuditingUsage(),+ deny: ["CanAccessAiAuditing"],+ });++ expect(+ await screen.findByTestId("unauthorized-marker"),+ ).toBeInTheDocument();+ expect(+ screen.queryByTestId("ai-auditing-page"),+ ).not.toBeInTheDocument();+ });+it("renders NotFound for unknown paths even when both section guards deny (catch-all sits outside the guards)", async () => {setup({initialRoute: "/monitor/does-not-exist",@@ -275,25 +304,37 @@ describe("monitor routes", () => {});describe("Tools sections (migrated from /admin/tools)", () => {- it("renders the Logs section at /monitor/logs", async () => {- setup({ initialRoute: "/monitor/logs" });+ it.each([["/monitor/logs"], ["/monitor/logs/levels"]])(+ "renders the Logs section at %s",+ async (initialRoute) => {+ setup({ initialRoute });- expect(await screen.findByTestId("logs-page")).toBeInTheDocument();- });+ expect(await screen.findByTestId("logs-page")).toBeInTheDocument();+ },+ );- it("renders the Jobs section at /monitor/jobs", async () => {- setup({ initialRoute: "/monitor/jobs" });+ it.each([["/monitor/jobs"], ["/monitor/jobs/sync"]])(+ "renders the Jobs section at %s",+ async (initialRoute) => {+ setup({ initialRoute });- expect(await screen.findByTestId("jobs-page")).toBeInTheDocument();- });+ expect(await screen.findByTestId("jobs-page")).toBeInTheDocument();+ },+ );- it("renders the Model persistence log section at /monitor/model-persistence-log", async () => {- setup({ initialRoute: "/monitor/model-persistence-log" });+ it.each([+ ["/monitor/model-persistence-log"],+ ["/monitor/model-persistence-log/9"],+ ])(+ "renders the Model persistence log section at %s",+ async (initialRoute) => {+ setup({ initialRoute });- expect(- await screen.findByTestId("model-persistence-log-page"),- ).toBeInTheDocument();- });+ expect(+ await screen.findByTestId("model-persistence-log-page"),+ ).toBeInTheDocument();+ },+ );it("renders the Erroring questions upsell at /monitor/errors without the audit_app feature", async () => {setup({ initialRoute: "/monitor/errors" });diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsxindex 508f8a2039d..e07f277812d 100644--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.tsx@@ -92,7 +92,7 @@ export const TaskListPage = () => {/>)}- {!isLoading && error == null && (+ {!isLoading && !error && (<Flex justify="end"><PaginationControlspage={page}@@ -100,8 +100,12 @@ export const TaskListPage = () => {itemsLength={tasks.length}total={total}showTotal- onPreviousPage={() => patchUrlState({ page: page - 1 })}- onNextPage={() => patchUrlState({ page: page + 1 })}+ onPreviousPage={() =>+ patchUrlState({ page: page - 1 }, { immediate: true })+ }+ onNextPage={() =>+ patchUrlState({ page: page + 1 }, { immediate: true })+ }/></Flex>)}diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsxindex c74ad0f7c9d..2a45c87d0a0 100644--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx@@ -149,11 +149,6 @@ describe("TaskListPage", () => {"http://localhost/api/task?limit=50&offset=50&sort_column=started_at&sort_direction=desc",]);await waitForLoaderToBeRemoved();- expect(history?.getCurrentLocation().search).toEqual("");- act(() => {- jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);- });-expect(previousPage).toBeEnabled();expect(nextPage).toBeDisabled();expect(history?.getCurrentLocation().search).toEqual("?page=1");@@ -168,11 +163,6 @@ describe("TaskListPage", () => {"http://localhost/api/task?limit=50&offset=0&sort_column=started_at&sort_direction=desc",]);expect(screen.queryByTestId("loading-indicator")).not.toBeInTheDocument();- expect(history?.getCurrentLocation().search).toEqual("?page=1");- act(() => {- jest.advanceTimersByTime(URL_UPDATE_DEBOUNCE_DELAY);- });-expect(previousPage).toBeDisabled();expect(nextPage).toBeEnabled();expect(history?.getCurrentLocation().search).toEqual("");diff --git a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsxindex fb7565ee78e..f1c11e36006 100644--- a/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx+++ b/frontend/src/metabase/monitor/tools/components/TaskRunsPage/TaskRunsPage.tsx@@ -146,8 +146,12 @@ export const TaskRunsPage = () => {itemsLength={taskRuns.length}total={total}showTotal- onPreviousPage={() => patchUrlState({ page: page - 1 })}- onNextPage={() => patchUrlState({ page: page + 1 })}+ onPreviousPage={() =>+ patchUrlState({ page: page - 1 }, { immediate: true })+ }+ onNextPage={() =>+ patchUrlState({ page: page + 1 }, { immediate: true })+ }/></Flex>)}diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsxindex 3f74945c9e2..755027425f3 100644--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx@@ -361,8 +361,12 @@ export const NotificationsAdminPage = () => {itemsLength={notifications.length}total={total}showTotal- onPreviousPage={() => patchUrlState({ page: urlState.page - 1 })}- onNextPage={() => patchUrlState({ page: urlState.page + 1 })}+ onPreviousPage={() =>+ patchUrlState({ page: urlState.page - 1 }, { immediate: true })+ }+ onNextPage={() =>+ patchUrlState({ page: urlState.page + 1 }, { immediate: true })+ }/></Flex></MonitorMain>diff --git a/frontend/src/metabase/plugins/oss/audit.ts b/frontend/src/metabase/plugins/oss/audit.tsindex ba0634950e1..369e5772fbe 100644--- a/frontend/src/metabase/plugins/oss/audit.ts+++ b/frontend/src/metabase/plugins/oss/audit.ts@@ -48,10 +48,8 @@ const getDefaultPluginAudit = () => ({InsightsLink: PluginPlaceholder as ComponentType<InsightsLinkProps>,// Unjustified type cast. FIXMEInsightsMenuItem: PluginPlaceholder as ComponentType<InsightsMenuItemProps>,- getMetabotAnalyticsNavItems: (): ReactNode => null,- getAiAnalyticsRoutes: (): ReactNode => null,- getMcpAnalyticsRoutes: (): ReactNode => null,- getCliAnalyticsRoutes: (): ReactNode => null,+ isAiAuditingEnabled: false,+ getAiAuditingRoutes: (): ReactNode => null,// Unjustified type cast. FIXMEhandleMetabotSlashCommand: ((_args) => false) as MetabotSlashCommandHandler,});diff --git a/frontend/src/metabase/routes.unit.spec.tsx b/frontend/src/metabase/routes.unit.spec.tsxindex a5490a0f270..332e9ce17d7 100644--- a/frontend/src/metabase/routes.unit.spec.tsx+++ b/frontend/src/metabase/routes.unit.spec.tsx@@ -1,11 +1,18 @@+import { render, waitFor } from "@testing-library/react";+import { setupCurrentUserEndpoint } from "__support__/server-mocks";-import { renderWithProviders, screen, waitFor } from "__support__/ui";+import {+ getTestStoreAndWrapper,+ renderWithProviders,+ screen,+} from "__support__/ui";+import { PLUGIN_AUDIT, reinitialize } from "metabase/plugins";import { Route } from "metabase/router";import { createMockUser } from "metabase-types/api/mocks";-import { LegacyBrowseRedirect } from "./routes";+import { LegacyBrowseRedirect, getRoutes } from "./routes";-function setup(initialRoute: string) {+function setupLegacyBrowseRedirect(initialRoute: string) {setupCurrentUserEndpoint(createMockUser());const { history } = renderWithProviders(@@ -21,7 +28,7 @@ function setup(initialRoute: string) {describe("LegacyBrowseRedirect", () => {it("redirects a v48-era /browse/<dbId>-<slug> url onto /browse/databases", async () => {- const history = setup("/browse/5-orders");+ const history = setupLegacyBrowseRedirect("/browse/5-orders");await waitFor(() =>expect(history?.getCurrentLocation().pathname).toBe(@@ -32,8 +39,124 @@ describe("LegacyBrowseRedirect", () => {});it("does not redirect a segment without the legacy hyphenated shape", async () => {- const history = setup("/browse/orders");+ const history = setupLegacyBrowseRedirect("/browse/orders");expect(history?.getCurrentLocation().pathname).toBe("/browse/orders");});});++jest.mock("metabase/AppComponent", () => {+ const { Outlet } = jest.requireActual("metabase/router");+ return {+ __esModule: true,+ App: () => <Outlet />,+ };+});++jest.mock("metabase/common/components/NotFoundFallbackPage", () => ({+ NotFoundFallbackPage: () => null,+}));++let mockRenderMonitorOutlet = false;++jest.mock("metabase/monitor/components/MonitorLayout", () => {+ const { Outlet } = jest.requireActual("metabase/router");+ return {+ MonitorLayout: () => (mockRenderMonitorOutlet ? <Outlet /> : null),+ };+});++function setupAppRoutes({+ initialRoute,+ user = createMockUser({ is_superuser: true }),+}: {+ initialRoute: string;+ user?: ReturnType<typeof createMockUser>;+}) {+ const { wrapper, store, history } = getTestStoreAndWrapper({+ withRouter: true,+ initialRoute,+ storeInitialState: { currentUser: user },+ });+ render(getRoutes(store), { wrapper });+ return { history };+}++describe("application routes", () => {+ afterEach(() => {+ mockRenderMonitorOutlet = false;+ reinitialize();+ });++ describe("legacy Admin Tools redirects", () => {+ it.each([+ ["/admin/tools/tasks", "/monitor/tasks"],+ ["/admin/tools/tasks/list", "/monitor/tasks/list"],+ ["/admin/tools/tasks/list/42", "/monitor/tasks/list/42"],+ ["/admin/tools/tasks/runs", "/monitor/tasks/runs"],+ ["/admin/tools/tasks/runs/7", "/monitor/tasks/runs/7"],+ ["/admin/tools/jobs", "/monitor/jobs"],+ ["/admin/tools/jobs/sync", "/monitor/jobs/sync"],+ ["/admin/tools/logs", "/monitor/logs"],+ ["/admin/tools/logs/levels", "/monitor/logs/levels"],+ ["/admin/tools/errors", "/monitor/errors"],+ ["/admin/tools/model-caching", "/monitor/model-persistence-log"],+ ["/admin/tools/model-caching/9", "/monitor/model-persistence-log/9"],+ ["/admin/tools/notifications", "/monitor/notifications"],+ ["/admin/tools/notifications/13", "/monitor/notifications/13"],+ ])("redirects %s to %s", async (initialRoute, expectedPathname) => {+ const { history } = setupAppRoutes({ initialRoute });++ await waitFor(() => {+ expect(history?.getCurrentLocation().pathname).toBe(expectedPathname);+ });+ });++ it("redirects the legacy Admin Tools index to the Monitor index", async () => {+ const { history } = setupAppRoutes({ initialRoute: "/admin/tools" });++ await waitFor(() => {+ expect(history?.getCurrentLocation().pathname).toBe("/monitor");+ });+ });+ });++ describe("legacy AI Auditing redirects", () => {+ it.each([+ ["/admin/metabot/usage-auditing", "/monitor/ai-auditing/usage"],+ [+ "/admin/metabot/usage-auditing/conversations",+ "/monitor/ai-auditing/conversations",+ ],+ [+ "/admin/metabot/usage-auditing/conversations/42",+ "/monitor/ai-auditing/conversations/42",+ ],+ ["/admin/metabot/usage-auditing/mcp", "/monitor/ai-auditing/mcp"],+ ["/admin/metabot/usage-auditing/cli", "/monitor/ai-auditing/cli"],+ ])("redirects %s to %s", async (initialRoute, expectedPathname) => {+ const { history } = setupAppRoutes({ initialRoute });++ await waitFor(() => {+ expect(history?.getCurrentLocation().pathname).toBe(expectedPathname);+ });+ });++ it("applies the AI Auditing guard after redirecting", async () => {+ mockRenderMonitorOutlet = true;+ PLUGIN_AUDIT.isAiAuditingEnabled = true;+ PLUGIN_AUDIT.getAiAuditingRoutes = () => (+ <Route path="usage" element={<div>AI Auditing</div>} />+ );++ const { history } = setupAppRoutes({+ initialRoute: "/admin/metabot/usage-auditing",+ user: createMockUser({ is_data_analyst: true }),+ });++ await waitFor(() => {+ expect(history?.getCurrentLocation().pathname).toBe("/unauthorized");+ });+ });+ });+});diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsxindex f3ec21ebf12..81889439b51 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsx@@ -187,6 +187,7 @@ export function TreeTable<TData extends TreeNodeData>({renderRowLink={renderRowLink}renderSubRow={renderSubRow}hierarchical={hierarchical}+ isClickable={Boolean(onRowClick) || Boolean(renderRowLink)}/>);diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.unit.spec.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.unit.spec.tsxnew file mode 100644index 00000000000..a2a96ed090a--- /dev/null+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.unit.spec.tsx@@ -0,0 +1,79 @@+import userEvent from "@testing-library/user-event";++import {+ mockGetBoundingClientRect,+ renderWithProviders,+ screen,+} from "__support__/ui";++import { TreeTable } from "./TreeTable";+import { useTreeTableInstance } from "./hooks";+import type { TreeNodeData, TreeTableColumnDef } from "./types";++interface TestNode extends TreeNodeData {+ id: string;+ name: string;+}++const DATA: TestNode[] = [+ { id: "1", name: "Orders" },+ { id: "2", name: "People" },+];++const SORTABLE_COLUMNS: TreeTableColumnDef<TestNode>[] = [+ {+ id: "name",+ header: "Name",+ enableSorting: true,+ accessorFn: (node) => node.name,+ cell: ({ row }) => <span>{row.original.name}</span>,+ },+];++function setup({+ columns = SORTABLE_COLUMNS,+ onRowActivate,+}: {+ columns?: TreeTableColumnDef<TestNode>[];+ onRowActivate?: (row: { original: TestNode }) => void;+} = {}) {+ mockGetBoundingClientRect({ width: 200, height: 40 });++ function Container() {+ const instance = useTreeTableInstance<TestNode>({+ data: DATA,+ columns,+ getNodeId: (node) => node.id,+ manualSorting: true,+ onRowActivate,+ });++ return (+ <TreeTable+ instance={instance}+ hierarchical={false}+ ariaLabel="Test table"+ />+ );+ }++ renderWithProviders(<Container />);+}++describe("TreeTable keyboard interaction", () => {+ it("does not activate a previously keyboard-focused row when Enter sorts a column header", async () => {+ const onRowActivate = jest.fn();+ setup({ onRowActivate });++ const grid = screen.getByRole("treegrid", { name: "Test table" });+ grid.focus();+ await userEvent.keyboard("{ArrowDown}");++ const header = screen.getByRole("columnheader", { name: "Name" });+ header.focus();+ await userEvent.keyboard("{Enter}");++ expect(header).toHaveAttribute("aria-sort", "ascending");+ expect(onRowActivate).not.toHaveBeenCalled();+ });+});diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.tsxindex 4c042bd389a..6185142ef80 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.tsx@@ -117,6 +117,7 @@ export function TreeTableHeader<TData extends TreeNodeData>({}const sortValue = sortDirection || undefined;+ const toggleSorting = column.getToggleSortingHandler();return (<Flex@@ -124,7 +125,8 @@ export function TreeTableHeader<TData extends TreeNodeData>({className={cx(S.cell, classNames?.headerCell)}align="center"style={columnStyle}- role={isSortable ? "columnheader" : undefined}+ role="columnheader"+ tabIndex={isSortable ? 0 : undefined}aria-sort={sortDirection? sortDirection === "asc"@@ -132,8 +134,17 @@ export function TreeTableHeader<TData extends TreeNodeData>({: "descending": undefined}- onClick={- isSortable ? column.getToggleSortingHandler() : undefined+ onClick={isSortable ? toggleSorting : undefined}+ onKeyDown={+ isSortable+ ? (event) => {+ if (event.key === "Enter" || event.key === " ") {+ event.preventDefault();+ event.stopPropagation();+ toggleSorting?.(event);+ }+ }+ : undefined}>{typeof headerContent === "string" ? (diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.module.css b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.module.cssindex d24ecd5c5e7..dea369589d5 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.module.css+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.module.css@@ -29,7 +29,6 @@.content {display: flex;- cursor: pointer;&:hover {background-color: var(--mb-color-background_surface-hover);@@ -45,6 +44,10 @@}}+.clickable {+ cursor: pointer;+}+.content.active {background-color: var(--mb-color-background_surface-selected);diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsxindex 5d59cd04871..7b958cea1a2 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx@@ -47,6 +47,7 @@ interface TreeTableRowContentProps<onRowDoubleClick?: (row: Row<TData>, event: MouseEvent) => void;rowProps?: Record<string, unknown>;hierarchical?: boolean;+ isClickable?: boolean;}// Memoized component that does not depend on virtualItem for performance reasons@@ -75,6 +76,7 @@ const TreeTableRowContent = memo(function TreeTableRowContent<styles,rowProps,hierarchical = false,+ isClickable,}: TreeTableRowContentProps<TData>) {const isKeyboardFocused = activeRowId === row.id;const isSelected = selectedRowId === row.id;@@ -113,6 +115,7 @@ const TreeTableRowContent = memo(function TreeTableRowContent<data-keyboard-active={isKeyboardFocused ? true : undefined}data-disabled={isDisabled ? true : undefined}className={cx(S.content, classNames?.row, {+ [S.clickable]: isClickable,[S.active]: isActive,[classNames?.rowActive ?? ""]: isActive && classNames?.rowActive,[S.disabled]: isDisabled,@@ -249,6 +252,7 @@ export function TreeTableRow<TData extends TreeNodeData>({renderRowLink,renderSubRow,hierarchical = true,+ isClickable,}: TreeTableRowProps<TData>) {const rowProps = useMemo(() => getRowProps?.(row), [getRowProps, row]);@@ -276,6 +280,7 @@ export function TreeTableRow<TData extends TreeNodeData>({styles={styles}rowProps={rowProps}hierarchical={hierarchical}+ isClickable={isClickable}/>);diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsxindex b5a92485435..d6ff5e2dcd1 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsx@@ -109,6 +109,9 @@ function getContentWidth<TData extends TreeNodeData>(const baseWidth = contentWidths[column.id] ?? MIN_COLUMN_WIDTH;const padding = column.widthPadding ?? 0;let width = baseWidth + padding;+ if (typeof column.minWidth === "number") {+ width = Math.max(width, column.minWidth);+ }if (column.maxAutoWidth != null) {width = Math.min(width, column.maxAutoWidth);}diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.unit.spec.ts b/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.unit.spec.tsindex ee5c1b407b5..88bed8e5cf6 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.unit.spec.ts+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.unit.spec.ts@@ -165,6 +165,18 @@ describe("calculateColumnWidths", () => {});});+ it("enforces a numeric minWidth floor on width=auto columns", () => {+ const columns = [+ createColumn({ id: "auto", width: "auto", minWidth: 150 }),+ createColumn({ id: "stretch" }),+ ];+ // Measured content (80) is narrower than minWidth (150); minWidth wins.+ expect(calculateColumnWidths(columns, 500, { auto: 80 }, 0, 20)).toEqual({+ auto: 150,+ stretch: 350,+ });+ });+it("maxAutoWidth caps minimum but column can stretch beyond it if there is extra space", () => {const columns = [createColumn({ id: "col", minWidth: "auto", maxAutoWidth: 100 }),diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/types.ts b/frontend/src/metabase/ui/components/data-display/TreeTable/types.tsindex 54119eccf24..c8e6fdee004 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/types.ts+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/types.ts@@ -328,6 +328,7 @@ export interface TreeTableRowProps<renderRowLink?: RenderRowLink<TData>;renderSubRow?: RenderSubRow<TData>;hierarchical?: boolean;+ isClickable?: boolean;}/**diff --git a/frontend/src/metabase/urls/admin.ts b/frontend/src/metabase/urls/admin.tsindex 81219cb834e..cac6842e06e 100644--- a/frontend/src/metabase/urls/admin.ts+++ b/frontend/src/metabase/urls/admin.ts@@ -171,3 +171,11 @@ export function adminHelp() {export function adminHelpGrantAccess() {return `${adminHelp()}/grant-access`;}++export function adminAiSettings() {+ return "/admin/metabot";+}++export function adminMcpSettings() {+ return `${adminAiSettings()}/mcp`;+}diff --git a/frontend/src/metabase/urls/monitor.ts b/frontend/src/metabase/urls/monitor.tsindex b63cd8b0b42..4e96677c94c 100644--- a/frontend/src/metabase/urls/monitor.ts+++ b/frontend/src/metabase/urls/monitor.ts@@ -88,3 +88,27 @@ export function monitorNotifications() {export function monitorNotificationDetail(id: number) {return `${monitorNotifications()}/${id}`;}++export function monitorAiAuditing() {+ return `${ROOT_URL}/ai-auditing`;+}++export function monitorAiAuditingUsage() {+ return `${monitorAiAuditing()}/usage`;+}++export function monitorAiAuditingConversations() {+ return `${monitorAiAuditing()}/conversations`;+}++export function monitorAiAuditingConversationDetail(convoId: string) {+ return `${monitorAiAuditingConversations()}/${convoId}`;+}++export function monitorAiAuditingMcp() {+ return `${monitorAiAuditing()}/mcp`;+}++export function monitorAiAuditingCli() {+ return `${monitorAiAuditing()}/cli`;+}diff --git a/frontend/test/__support__/server-mocks/metabot-analytics.ts b/frontend/test/__support__/server-mocks/metabot-analytics.tsindex 7aef51f5c83..f5d4a6ef3b6 100644--- a/frontend/test/__support__/server-mocks/metabot-analytics.ts+++ b/frontend/test/__support__/server-mocks/metabot-analytics.ts@@ -4,7 +4,7 @@ import type {ConversationDetail,ConversationSummary,ConversationsResponse,-} from "metabase-enterprise/audit_app/metabot-analytics/types";+} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/types";export function setupMetabotConversationEndpoint(conversation: ConversationDetail,diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsxindex b129833c3d8..79589b54c4c 100644--- a/frontend/test/__support__/ui.tsx+++ b/frontend/test/__support__/ui.tsx@@ -565,6 +565,21 @@ export const mockOffsetHeightAndWidth = (value = 50) => {.mockReturnValue(value);};+export const createMockDOMRect = (+ overrides: Partial<DOMRect> = {},+): DOMRect => ({+ height: 200,+ width: 200,+ top: 0,+ left: 0,+ bottom: 0,+ right: 0,+ x: 0,+ y: 0,+ toJSON: () => {},+ ...overrides,+});+/*** jsdom doesn't have getBoundingClientRect, so we need to mock it for any components* with virtualization to work in tests, like the entity picker@@ -572,20 +587,20 @@ export const mockOffsetHeightAndWidth = (value = 50) => {export const mockGetBoundingClientRect = (options: Partial<DOMRect> = {}) => {jest.spyOn(window.Element.prototype, "getBoundingClientRect")- .mockImplementation(() => {- return {- height: 200,- width: 200,- top: 0,- left: 0,- bottom: 0,- right: 0,- x: 0,- y: 0,- toJSON: () => {},- ...options,- };- });+ .mockImplementation(() => createMockDOMRect(options));+};++/**+ * Forces `useIsTruncated` (used by `Ellipsified`) to detect overflow, so a+ * hover-triggered truncation tooltip becomes testable.+ */+export const mockTextOverflow = () => {+ jest+ .spyOn(window.Element.prototype, "getBoundingClientRect")+ .mockReturnValue(createMockDOMRect({ width: 100, height: 20 }));+ jest+ .spyOn(window.Range.prototype, "getBoundingClientRect")+ .mockReturnValue(createMockDOMRect({ width: 500, height: 20 }));};/**