A platform for community discussion. Free, open, simple.
DEV: Cleanup MCP server activity page (#44043)
Natalie Tay62b892f6c32e
diff --git a/app/assets/stylesheets/common/base/_mcp.scss b/app/assets/stylesheets/common/base/_mcp.scssindex 439affeba19..f85e0d0de26 100644--- a/app/assets/stylesheets/common/base/_mcp.scss+++ b/app/assets/stylesheets/common/base/_mcp.scss@@ -183,7 +183,6 @@.admin-mcp__filter-search {flex: 1 1 24rem;min-width: 0;- max-width: 24rem;}.form-kit__field-select {diff --git a/app/controllers/admin/mcp_activity_controller.rb b/app/controllers/admin/mcp_activity_controller.rbindex 9b143b83014..6095bebc0d1 100644--- a/app/controllers/admin/mcp_activity_controller.rb+++ b/app/controllers/admin/mcp_activity_controller.rb@@ -8,8 +8,10 @@ class Admin::McpActivityController < Admin::AdminControllerMcpActivityReport.new(limit: limit,cursor: cursor,+ end_date: params[:end_date],filter: params[:filter],outcome: params[:outcome],+ start_date: params[:start_date],).callendenddiff --git a/app/services/mcp_activity_report.rb b/app/services/mcp_activity_report.rbindex 0a252f5cd99..7882eadeb84 100644--- a/app/services/mcp_activity_report.rb+++ b/app/services/mcp_activity_report.rb@@ -1,14 +1,17 @@# frozen_string_literal: trueclass McpActivityReport+ DEFAULT_RANGE_DAYS = 7MAX_FILTER_LENGTH = 200OUTCOMES = %w[success error rate_limited].freeze- def initialize(limit:, cursor: nil, filter: nil, outcome: nil)+ def initialize(limit:, cursor: nil, end_date: nil, filter: nil, outcome: nil, start_date: nil)@limit = limit@cursor = cursor+ @end_date = parse_date(end_date, :end_date) || Time.zone.today@filter = filter.to_s.strip@outcome = outcome.presence+ @start_date = parse_date(start_date, :start_date) || (DEFAULT_RANGE_DAYS - 1).days.ago.to_dateenddef call@@ -33,52 +36,88 @@ class McpActivityReportprivate- attr_reader :limit, :cursor, :filter, :outcome+ attr_reader :limit, :cursor, :end_date, :filter, :outcome, :start_datedef validate!raise Discourse::InvalidParameters.new(:filter) if filter.length > MAX_FILTER_LENGTHif outcome.present? && !OUTCOMES.include?(outcome)raise Discourse::InvalidParameters.new(:outcome)end+ raise Discourse::InvalidParameters.new(:start_date) if start_date > end_dateenddef activity_relation- relation = McpAuditLog.left_joins(:user, :client).preload(:user, :client).order(id: :desc)+ relation = filtered_relation.preload(:user, :client).order(id: :desc)relation = relation.where("mcp_audit_logs.id < ?", cursor) if cursor++ relation+ end++ def filtered_relation+ relation = McpAuditLog.where(occurred_at: start_date.beginning_of_day..end_date.end_of_day)relation = relation.where(outcome: outcome) if outcomeif filter.present?pattern = "%#{ActiveRecord::Base.sanitize_sql_like(filter)}%"- relation = relation.where(<<~SQL.squish, pattern: pattern, request_id: filter)- users.username ILIKE :pattern OR- mcp_oauth_clients.name ILIKE :pattern OR- mcp_oauth_clients.client_id ILIKE :pattern OR- mcp_audit_logs.tool ILIKE :pattern OR- mcp_audit_logs.request_id = :request_id- SQL+ relation =+ relation.left_joins(:user, :client).where(+ <<~SQL.squish,+ users.username ILIKE :pattern OR+ mcp_oauth_clients.name ILIKE :pattern OR+ mcp_oauth_clients.client_id ILIKE :pattern OR+ mcp_audit_logs.tool ILIKE :pattern OR+ mcp_audit_logs.request_id = :request_id+ SQL+ pattern: pattern,+ request_id: filter,+ )endrelationend+ def parse_date(value, parameter)+ return if value.blank?+ raise Discourse::InvalidParameters.new(parameter) if !value.is_a?(String)++ Date.iso8601(value)+ rescue Date::Error+ raise Discourse::InvalidParameters.new(parameter)+ end+def metrics- tool_calls, errors, rate_limits, p95_latency_ms =- McpAuditLog.where("occurred_at > ?", 24.hours.ago).pick(- Arel.sql("COALESCE(SUM(occurrences), 0)::bigint"),- Arel.sql("COALESCE(SUM(occurrences) FILTER (WHERE outcome <> 'success'), 0)::bigint"),+ tool_calls, failed_tool_calls, rate_limits, p95_latency_ms =+ filtered_relation.pick(+ Arel.sql(<<~SQL.squish),+ COALESCE(+ SUM(occurrences) FILTER (+ WHERE method = 'tools/call' AND outcome <> 'rate_limited'+ ),+ 0+ )::bigint+ SQL+ Arel.sql(<<~SQL.squish),+ COALESCE(+ SUM(occurrences) FILTER (+ WHERE method = 'tools/call' AND outcome = 'error'+ ),+ 0+ )::bigint+ SQLArel.sql("COALESCE(SUM(occurrences) FILTER (WHERE outcome = 'rate_limited'), 0)::bigint"),Arel.sql(<<~SQL.squish),- COALESCE(- PERCENTILE_DISC(0.95) WITHIN GROUP (ORDER BY duration_ms)- FILTER (WHERE duration_ms IS NOT NULL),- 0- )::integer+ PERCENTILE_DISC(0.95) WITHIN GROUP (ORDER BY duration_ms)+ FILTER (+ WHERE method = 'tools/call'+ AND outcome <> 'rate_limited'+ AND duration_ms IS NOT NULL+ )::integerSQL){tool_calls: tool_calls,- errors: errors,+ failed_tool_calls: failed_tool_calls,rate_limits: rate_limits,p95_latency_ms: p95_latency_ms,}diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 4a3029301e3..1fc2a71df53 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -7147,11 +7147,12 @@ en:empty: "No MCP authorizations match this filter."activity:title: "Activity and diagnostics"- description: "Review privacy-minimized protocol activity and aggregate diagnostics."+ description: "Review MCP activity."tool_calls: "Tool calls"- errors: "Errors"- rate_limits: "Rate limits"+ failed_tool_calls: "Failed tool calls"+ rate_limits: "Rate-limited requests"p95_latency: "95th percentile latency"+ no_latency: "—"search_placeholder: "Search by user, client, tool, or exact request ID"outcome: "Outcome"time: "Time"diff --git a/frontend/discourse/admin/components/admin-mcp.gjs b/frontend/discourse/admin/components/admin-mcp.gjsindex ecf4b461296..b1e364a5712 100644--- a/frontend/discourse/admin/components/admin-mcp.gjs+++ b/frontend/discourse/admin/components/admin-mcp.gjs@@ -9,6 +9,12 @@ import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-caimport AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import AdminSectionLandingItem from "discourse/admin/components/admin-section-landing-item";import AdminSectionLandingWrapper from "discourse/admin/components/admin-section-landing-wrapper";+import DashboardDateRange from "discourse/admin/components/dashboard/date-range";+import {+ calculatePresetStartDate,+ PERIOD_CUSTOM,+ PERIOD_LAST_7_DAYS,+} from "discourse/admin/lib/dashboard-date-range";import BackButton from "discourse/components/back-button";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";@@ -94,8 +100,11 @@ export default class AdminMcp extends Component {@tracked primitiveEnabledStates;@tracked authorizationFilter = "";@tracked clientFilter = "";+ @tracked activityCustomEndDate;+ @tracked activityCustomStartDate;@tracked activityFilter = "";@tracked activityOutcome = "all";+ @tracked activityPeriod = PERIOD_LAST_7_DAYS;@tracked primitiveFormApi;@tracked saving = false;@tracked clients;@@ -124,7 +133,10 @@ export default class AdminMcp extends Component {};clientFilterFormData = { clientFilter: "" };authorizationFilterFormData = { authorizationFilter: "" };- activityFilterFormData = { activityFilter: "", activityOutcome: "all" };+ activityFilterFormData = {+ activityFilter: "",+ activityOutcome: "all",+ };clientPresetIds = Object.keys(CLIENT_PRESETS);clientRequestId = 0;authorizationRequestId = 0;@@ -186,6 +198,25 @@ export default class AdminMcp extends Component {return this.activityMetrics || this.model.metrics || {};}+ get activityEndDate() {+ return this.activityCustomEndDate ?? moment().endOf("day").toDate();+ }++ get activityStartDate() {+ return (+ this.activityCustomStartDate ??+ calculatePresetStartDate(this.activityPeriod)+ );+ }++ get hasActivity() {+ return Boolean(this.activity?.length);+ }++ get hasP95Latency() {+ return Number.isFinite(this.metrics.p95_latency_ms);+ }+get setupChecklist() {return this.model.setup_checklist || [];}@@ -872,6 +903,22 @@ export default class AdminMcp extends Component {return this.loadActivity({ append: false });}+ @action+ setActivityCustomDateRange(startDate, endDate) {+ this.activityCustomStartDate = startDate;+ this.activityCustomEndDate = endDate;+ this.activityPeriod = PERIOD_CUSTOM;+ return this.reloadActivity();+ }++ @action+ setActivityPeriod(period) {+ this.activityCustomStartDate = null;+ this.activityCustomEndDate = null;+ this.activityPeriod = period;+ return this.reloadActivity();+ }+@actionloadMoreActivity() {if (!this.canLoadMoreActivity || this.activityLoading) {@@ -919,6 +966,8 @@ export default class AdminMcp extends Component {if (this.activityOutcome !== "all") {data.outcome = this.activityOutcome;}+ data.start_date = moment(this.activityStartDate).format("YYYY-MM-DD");+ data.end_date = moment(this.activityEndDate).format("YYYY-MM-DD");if (cursor) {data.cursor = cursor;}@@ -1879,19 +1928,6 @@ export default class AdminMcp extends Component {@descriptionLabel={{i18n "admin.config.mcp.activity.description"}}@titleLabel={{i18n "admin.config.mcp.activity.title"}}/>- <div class="admin-mcp__metric-grid admin-mcp__activity-metrics">- <div><dt>{{i18n "admin.config.mcp.activity.tool_calls"}}</dt><dd- >{{this.metrics.tool_calls}}</dd></div><div><dt>{{i18n- "admin.config.mcp.activity.errors"- }}</dt><dd>{{this.metrics.errors}}</dd></div><div><dt>{{i18n- "admin.config.mcp.activity.rate_limits"- }}</dt><dd>{{this.metrics.rate_limits}}</dd></div><div><dt>{{i18n- "admin.config.mcp.activity.p95_latency"- }}</dt><dd>{{i18n- "admin.config.mcp.activity.duration_value"- milliseconds=this.metrics.p95_latency_ms- }}</dd></div>- </div><Formclass="admin-mcp__activity-filters"@data={{this.activityFilterFormData}}@@ -1912,7 +1948,15 @@ export default class AdminMcp extends Component {placeholder={{i18n "admin.config.mcp.activity.search_placeholder"}}/></form.Field>+ <DashboardDateRange+ @endDate={{this.activityEndDate}}+ @period={{this.activityPeriod}}+ @setCustomDateRange={{this.setActivityCustomDateRange}}+ @setPeriod={{this.setActivityPeriod}}+ @startDate={{this.activityStartDate}}+ /><form.Field+ class="admin-mcp__activity-outcome"@name="activityOutcome"@showOptional={{false}}@showTitle={{false}}@@ -1933,6 +1977,28 @@ export default class AdminMcp extends Component {</field.Control></form.Field></Form>+ {{#if this.hasActivity}}+ <div class="admin-mcp__activity-metrics">+ <dl class="admin-mcp__metric-grid">+ <div><dt>{{i18n "admin.config.mcp.activity.tool_calls"}}</dt><dd+ >{{this.metrics.tool_calls}}</dd></div><div><dt>{{i18n+ "admin.config.mcp.activity.failed_tool_calls"+ }}</dt><dd+ class="admin-mcp__activity-failed-tool-calls"+ >{{this.metrics.failed_tool_calls}}</dd></div><div><dt>{{i18n+ "admin.config.mcp.activity.rate_limits"+ }}</dt><dd>{{this.metrics.rate_limits}}</dd></div><div><dt+ >{{i18n "admin.config.mcp.activity.p95_latency"}}</dt><dd+ class="admin-mcp__activity-p95-latency"+ >{{#if this.hasP95Latency}}{{i18n+ "admin.config.mcp.activity.duration_value"+ milliseconds=this.metrics.p95_latency_ms+ }}{{else}}{{i18n+ "admin.config.mcp.activity.no_latency"+ }}{{/if}}</dd></div>+ </dl>+ </div>+ {{/if}}<DLoadMoreclass="admin-mcp__load-more"@action={{this.loadMoreActivity}}diff --git a/frontend/discourse/tests/acceptance/admin-mcp-test.js b/frontend/discourse/tests/acceptance/admin-mcp-test.jsindex 4b0d2638882..70860fc9ac9 100644--- a/frontend/discourse/tests/acceptance/admin-mcp-test.js+++ b/frontend/discourse/tests/acceptance/admin-mcp-test.js@@ -23,6 +23,8 @@ acceptance("Admin - MCP", function (needs) {let emergencyBlockRequests;let refreshClientRequests;let setupComplete;+ let activityMetrics;+ let activityRecords;let activityRequests;let authorizationRequests;let clientRequests;@@ -34,6 +36,24 @@ acceptance("Admin - MCP", function (needs) {emergencyBlockRequests = [];refreshClientRequests = [];setupComplete = true;+ activityMetrics = {+ tool_calls: 2,+ failed_tool_calls: 1,+ rate_limits: 0,+ p95_latency_ms: 25,+ };+ activityRecords = [+ {+ id: 3,+ created_at: "2026-09-22T10:00:00Z",+ method: "tools/call",+ tool: "discourse_topic_list",+ username: "sam",+ outcome: "success",+ duration_ms: 25,+ request_id: "request-current",+ },+ ];activityRequests = [];authorizationRequests = [];clientRequests = [];@@ -292,14 +312,12 @@ acceptance("Admin - MCP", function (needs) {server.get("/admin/mcp/activity.json", (request) => {activityRequests.push(request.queryParams);- const metrics = {- tool_calls: 2,- errors: 1,- rate_limits: 0,- p95_latency_ms: 25,- };if (request.queryParams.filter !== "search") {- return helper.response({ activity: [], metrics, meta: {} });+ return helper.response({+ activity: activityRecords,+ metrics: activityMetrics,+ meta: {},+ });}if (request.queryParams.cursor) {@@ -333,7 +351,7 @@ acceptance("Admin - MCP", function (needs) {request_id: "request-newer",},],- metrics,+ metrics: activityMetrics,meta: { next_cursor: 2 },});});@@ -834,17 +852,64 @@ acceptance("Admin - MCP", function (needs) {await visit("/admin/config/mcp/activity");assert- .dom(".admin-mcp__activity-filters select option:first-child")+ .dom(".admin-mcp__activity-outcome select option:first-child").hasText(i18n("admin.config.mcp.values.activity_outcome.all"),"the unfiltered option names the outcome filter");+ assert+ .dom(".db-date-range__trigger")+ .hasText(+ i18n("date_range_picker.presets.last_7_days"),+ "the default range is the last seven days"+ );assert.dom(".admin-mcp__activity-metrics").includesText(i18n("admin.config.mcp.activity.tool_calls"),"the metric describes the audited method");+ assert+ .dom(".admin-mcp__activity-metrics")+ .includesText(+ i18n("admin.config.mcp.activity.failed_tool_calls"),+ "failed tool calls have a specific label"+ );+ assert+ .dom(".admin-mcp__activity-failed-tool-calls")+ .hasText(+ activityMetrics.failed_tool_calls.toString(),+ "the failed tool call metric is shown"+ );+ });++ test("shows an empty latency value when there are no samples", async function (assert) {+ activityMetrics.p95_latency_ms = null;++ await visit("/admin/config/mcp/activity");++ assert+ .dom(".admin-mcp__activity-p95-latency")+ .hasText(+ i18n("admin.config.mcp.activity.no_latency"),+ "the page does not describe missing latency as zero"+ );+ });++ test("hides metrics when there is no activity", async function (assert) {+ activityRecords = [];++ await visit("/admin/config/mcp/activity");++ assert+ .dom(".admin-mcp__activity-metrics")+ .doesNotExist("the metrics are hidden when the activity list is empty");+ assert+ .dom(".admin-mcp__activity-table")+ .includesText(+ i18n("admin.config.mcp.activity.empty"),+ "the empty state is shown"+ );});test("filters on the server and automatically loads the next filtered page", async function (assert) {@@ -857,13 +922,36 @@ acceptance("Admin - MCP", function (needs) {await waitUntil(() =>activityRequests.some((request) => request.filter === "search"));- await select(".admin-mcp__activity-filters select", "error");+ await select(".admin-mcp__activity-outcome select", "error");await waitUntil(() =>activityRequests.some((request) =>request.filter === "search" && request.outcome === "error"));+ await click(".db-date-range__trigger");+ await click(+ findAll(".d-date-range-picker__preset").find(+ (element) =>+ element.textContent.trim() ===+ i18n("date_range_picker.presets.last_30_days")+ )+ );++ const startDate = moment()+ .startOf("day")+ .subtract(29, "days")+ .format("YYYY-MM-DD");+ const endDate = moment().format("YYYY-MM-DD");+ await waitUntil(() =>+ activityRequests.some(+ (request) =>+ request.filter === "search" &&+ request.outcome === "error" &&+ request.start_date === startDate &&+ request.end_date === endDate+ )+ );assert.dom(".admin-mcp__activity-table tbody tr")@@ -885,7 +973,13 @@ acceptance("Admin - MCP", function (needs) {assert.deepEqual(activityRequests.at(-1),- { cursor: "2", filter: "search", outcome: "error" },+ {+ cursor: "2",+ filter: "search",+ outcome: "error",+ start_date: startDate,+ end_date: endDate,+ },"the cursor request preserves every active filter");assert@@ -902,6 +996,34 @@ acceptance("Admin - MCP", function (needs) {}});+ test("filters activity with a custom date range", async function (assert) {+ await visit("/admin/config/mcp/activity");+ await click(".db-date-range__trigger");+ await fillIn(+ `.d-date-range-picker__input[aria-label='${i18n("date_range_picker.start_date")}']`,+ "2026/09/01"+ );+ await fillIn(+ `.d-date-range-picker__input[aria-label='${i18n("date_range_picker.end_date")}']`,+ "2026/09/10"+ );+ await click(".d-date-range-picker__apply");+ await waitUntil(() =>+ activityRequests.some(+ (request) =>+ request.start_date === "2026-09-01" &&+ request.end_date === "2026-09-10"+ )+ );++ assert+ .dom(".db-date-range__trigger")+ .includesText(+ moment("2026-09-01").format("ll"),+ "the trigger shows the custom date range"+ );+ });+test("blocks and unblocks a primitive immediately", async function (assert) {const primitiveSelector ='.admin-mcp__primitive[data-primitive-id="tool:discourse_search"]';diff --git a/spec/requests/admin/mcp_activity_controller_spec.rb b/spec/requests/admin/mcp_activity_controller_spec.rbindex 199a7c57b63..dc014b28916 100644--- a/spec/requests/admin/mcp_activity_controller_spec.rb+++ b/spec/requests/admin/mcp_activity_controller_spec.rb@@ -6,7 +6,7 @@ describe Admin::McpActivityController dodescribe "#index" dobefore { sign_in(admin) }- it "returns activity and calculates the 24-hour metrics in one query" do+ it "returns activity and calculates the default seven-day metrics in one query" doMcpAuditLog.create!(occurred_at: Time.zone.now,method: "tools/call",@@ -30,24 +30,88 @@ describe Admin::McpActivityController dooccurrences: 4,duration_ms: 200,)+ McpAuditLog.create!(+ occurred_at: 8.days.ago,+ method: "tools/call",+ tool: "discourse_old_search",+ outcome: "success",+ occurrences: 10,+ duration_ms: 500,+ )queries = track_sql_queries { get "/admin/mcp/activity.json" }expect(response.status).to eq(200)expect(response.parsed_body["metrics"]).to eq(- "tool_calls" => 9,- "errors" => 7,+ "tool_calls" => 5,+ "failed_tool_calls" => 3,"rate_limits" => 4,- "p95_latency_ms" => 200,+ "p95_latency_ms" => 100,+ )+ expect(response.parsed_body["activity"].map { |entry| entry["tool"] }).to contain_exactly(+ "discourse_search",+ "discourse_create_topic",+ nil,)- expect(response.parsed_body.dig("activity", 2, "tool")).to eq("discourse_search")metric_queries =queries.select do |sql|- sql.include?('FROM "mcp_audit_logs"') && sql.match?(/occurred_at.*>/)+ sql.include?('FROM "mcp_audit_logs"') && sql.include?("PERCENTILE_DISC")endexpect(metric_queries.length).to eq(1)end+ it "applies the selected date range to activity and metrics" do+ recent_log =+ McpAuditLog.create!(+ occurred_at: 6.days.ago,+ method: "tools/call",+ tool: "discourse_recent",+ outcome: "success",+ occurrences: 2,+ )+ older_log =+ McpAuditLog.create!(+ occurred_at: 8.days.ago,+ method: "tools/call",+ tool: "discourse_older",+ outcome: "success",+ occurrences: 3,+ )++ get "/admin/mcp/activity.json",+ params: {+ start_date: 7.days.ago.to_date.iso8601,+ end_date: Time.zone.today.iso8601,+ }++ expect(response.parsed_body["activity"].map { |entry| entry["id"] }).to eq([recent_log.id])+ expect(response.parsed_body.dig("metrics", "tool_calls")).to eq(2)++ get "/admin/mcp/activity.json",+ params: {+ start_date: 9.days.ago.to_date.iso8601,+ end_date: Time.zone.today.iso8601,+ }++ expect(response.parsed_body["activity"].map { |entry| entry["id"] }).to eq(+ [older_log.id, recent_log.id].sort.reverse,+ )+ expect(response.parsed_body.dig("metrics", "tool_calls")).to eq(5)+ end++ it "returns no latency value when no executed tool call has a duration" do+ McpAuditLog.create!(+ occurred_at: Time.zone.now,+ outcome: "rate_limited",+ occurrences: 1,+ duration_ms: 200,+ )++ get "/admin/mcp/activity.json"++ expect(response.parsed_body.dig("metrics", "p95_latency_ms")).to be_nil+ end+it "filters users, clients, tools, outcomes, and exact request IDs on the server" douser = Fabricate(:user, username: "activity-needle-user")client =@@ -86,6 +150,10 @@ describe Admin::McpActivityController doget "/admin/mcp/activity.json", params: { outcome: "error" }expect(response.parsed_body["activity"].map { |entry| entry["id"] }).to eq([matching_log.id])+ expect(response.parsed_body["metrics"]).to include(+ "tool_calls" => 1,+ "failed_tool_calls" => 1,+ )get "/admin/mcp/activity.json", params: { filter: matching_log.request_id }expect(response.parsed_body["activity"].map { |entry| entry["id"] }).to eq([matching_log.id])@@ -129,7 +197,7 @@ describe Admin::McpActivityController doexpect(response.parsed_body).not_to have_key("metrics")end- it "rejects invalid filter values" do+ it "rejects invalid filter and date values" doget "/admin/mcp/activity.json", params: { outcome: "unknown" }expect(response.status).to eq(400)@@ -138,6 +206,19 @@ describe Admin::McpActivityController doget "/admin/mcp/activity.json", params: { filter: "a" * 201 }expect(response.status).to eq(400)++ get "/admin/mcp/activity.json", params: { start_date: "not-a-date" }+ expect(response.status).to eq(400)++ get "/admin/mcp/activity.json", params: { end_date: "not-a-date" }+ expect(response.status).to eq(400)++ get "/admin/mcp/activity.json",+ params: {+ start_date: 1.day.from_now.to_date.iso8601,+ end_date: Time.zone.today.iso8601,+ }+ expect(response.status).to eq(400)endit "does not allow moderators to view MCP activity" do