Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions packages/mcp-core/src/tools/catalog/search-events.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,57 @@ describe("search_events", () => {
);
});

it("reports the query's timestamp bounds as the time range on the structured (non-agent) path", async () => {
const hour = 3_600_000;
const toSeconds = (ms: number) =>
new Date(Math.floor(ms / 1000) * 1000).toISOString().replace(".000", "");
const start = toSeconds(Date.now() - 2 * hour);
const end = toSeconds(Date.now() - hour);
const query = `severity:warn timestamp:>=${start} timestamp:<${end}`;
const requests: URLSearchParams[] = [];
mswServer.use(
http.get(
"https://sentry.io/api/0/organizations/test-org/events/",
({ request }) => {
requests.push(new URL(request.url).searchParams);
return HttpResponse.json({ data: [{ "count(message)": 3 }] });
},
),
);

const result = await searchEvents.handler(
{
organizationSlug: "test-org",
regionUrl: null,
projectSlug: null,
query,
dataset: "logs",
fields: ["count(message)"],
sort: "-count(message)",
period: "7d",
limit: 10,
includeExplanation: false,
},
{
constraints: {
organizationSlug: null,
regionUrl: null,
projectSlug: null,
},
accessToken: "test-token",
userId: "1",
},
);

expect(mockGenerateText).not.toHaveBeenCalled();
expect(requests).toHaveLength(1);
expect(requests[0]!.get("query")).toBe(query);
expect(requests[0]!.get("statsPeriod")).toBeNull();
expect(requests[0]!.get("start")).toBe(start);
expect(requests[0]!.get("end")).toBe(end);
expect(result).toContain(`- Time range: ${start} to ${end}`);
});

it("flags an unknown environment even on the structured (non-agent) path", async () => {
const query = 'transaction:"checkout" environment:nonexistent-xyz';
mswServer.use(
Expand Down
86 changes: 67 additions & 19 deletions packages/mcp-core/src/tools/support/search-events/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,25 +154,24 @@ const PERIOD_UNIT_MS = {
} as const;

/**
* Narrow an explicit relative `period` to the agent's absolute range.
* Narrow an explicit relative `period` to an absolute range.
*
* The agent returns `start`/`end` when the query names a fixed window, often
* with `period` sent as an outer guard. Keeping only `period` would silently
* search the whole period. The overlap of the two can only narrow `period`, so
* it is always safe; without an overlap, `period` is kept.
* The range comes from the agent's `timeRange` or from the query's own
* `timestamp:` bounds, usually with `period` sent as an outer guard. Keeping
* only `period` would silently search, or report, the whole period. The
* overlap of the two can only narrow `period`, so it is always safe; without
* an overlap, `period` is kept.
*/
function narrowPeriodToAgentRange(
function narrowPeriodToRange(
period: string,
agentRange:
| { statsPeriod?: string; start?: string; end?: string }
| undefined,
range: { statsPeriod?: string; start?: string; end?: string } | undefined,
): { statsPeriod?: string; start?: string; end?: string } {
const periodMatch = /^(\d+)([mhdw])$/.exec(period);
if (!agentRange?.start || !agentRange.end || !periodMatch) {
if (!range?.start || !range.end || !periodMatch) {
return { statsPeriod: period };
}
const start = Date.parse(agentRange.start);
const end = Date.parse(agentRange.end);
const start = Date.parse(range.start);
const end = Date.parse(range.end);
const now = Date.now();
const periodStart =
now -
Expand All @@ -189,15 +188,59 @@ function narrowPeriodToAgentRange(
return {
start:
narrowedStart === start
? agentRange.start
? range.start
: new Date(narrowedStart).toISOString(),
end:
narrowedEnd === end
? agentRange.end
: new Date(narrowedEnd).toISOString(),
end: narrowedEnd === end ? range.end : new Date(narrowedEnd).toISOString(),
};
}

const ABSOLUTE_TIMESTAMP_PATTERN =
/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?(?:Z|[+-]\d{2}:?\d{2})$/;
const TIMESTAMP_BOUND_PATTERN = /^timestamp:([<>]=?)(.+)$/;
const QUOTED_VALUE_PATTERN = /(["'])(?:\\.|(?!\1).)*\1/g;

/**
* Read the absolute window a query's top-level `timestamp:` bounds name.
*
* A lower bound with no upper bound runs until now. Boolean or grouped
* queries return nothing, because a bound inside a group does not bound the
* whole search.
*/
function queryTimestampRange(
query: string,
): { start: string; end: string } | undefined {
const tokens = tokenizeSearchQuery(query);
if (
tokens.some(
(token) =>
token === "OR" ||
token === "AND" ||
/[()]/.test(token.replace(QUOTED_VALUE_PATTERN, "")),
)
) {
return undefined;
}

let start: string | undefined;
let end: string | undefined;
for (const token of tokens) {
const match = TIMESTAMP_BOUND_PATTERN.exec(token);
const value = match?.[2]?.replace(/^["']|["']$/g, "");
if (!match || !value || !ABSOLUTE_TIMESTAMP_PATTERN.test(value)) {
continue;
}
if (match[1]?.startsWith(">")) {
if (!start || Date.parse(value) > Date.parse(start)) {
start = value;
}
} else if (!end || Date.parse(value) < Date.parse(end)) {
end = value;
}
}

return start ? { start, end: end ?? new Date().toISOString() } : undefined;
}

function buildRequestFields(
dataset: PublicEventsDataset | "replays",
fields: string[],
Expand Down Expand Up @@ -994,7 +1037,7 @@ async function executeSearchEvents(
const agentTimeRange = parseAgentTimeRange(parsed.timeRange);
timeParams =
shouldTrustExplicitSearchParams && params.period !== undefined
? narrowPeriodToAgentRange(params.period, agentTimeRange)
? narrowPeriodToRange(params.period, agentTimeRange)
: (agentTimeRange ?? { statsPeriod: "14d" });

if (dataset === "replays") {
Expand All @@ -1013,7 +1056,12 @@ async function executeSearchEvents(
? explicitStructuredTraceQuery
: (params.query ?? "");
sortParam = explicitSort || defaultSortForDataset(dataset);
timeParams = { statsPeriod: params.period ?? "14d" };
// The query's own bounds already limit the results; sending them as
// start/end makes the executed search report the window that ran.
timeParams = narrowPeriodToRange(
params.period ?? "14d",
queryTimestampRange(sentryQuery),
);
fields =
dataset === "replays"
? []
Expand Down
Loading