chore(search-events): tidy env-grounding changes

- Drop the unused `OrganizationEnvironment` type (only the list type is used).
- Type `searchEventsAgent`'s `toolCalls` as `ToolCall[]` instead of `any[]`.
- Trim the `buildSystemPromptWithEnvironments` doc comment.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: betegon

packages/mcp-core/src/api-client/types.ts

@@ -91,7 +91,6 @@ import type {
   MonitorStatSchema,
   MonitorStatsSchema,
   OrganizationEnvironmentListSchema,
-  OrganizationEnvironmentSchema,
   OrganizationListSchema,
   OrganizationSchema,
   ProfileChunkResponseSchema,
@@ -204,9 +203,6 @@ export type MonitorStats = z.infer<typeof MonitorStatsSchema>;
 export type UptimeMonitorList = z.infer<typeof UptimeMonitorListSchema>;
 export type UptimeCheckList = z.infer<typeof UptimeCheckListSchema>;
 export type EventAttachmentList = z.infer<typeof EventAttachmentListSchema>;
-export type OrganizationEnvironment = z.infer<
-  typeof OrganizationEnvironmentSchema
->;
 export type OrganizationEnvironmentList = z.infer<
   typeof OrganizationEnvironmentListSchema
 >;

packages/mcp-core/src/tools/support/search-events/agent.ts

@@ -1,6 +1,9 @@
 import { z } from "zod";
 import type { SentryApiService } from "../../../api-client";
-import { callEmbeddedAgent } from "../../../internal/agents/callEmbeddedAgent";
+import {
+  callEmbeddedAgent,
+  type ToolCall,
+} from "../../../internal/agents/callEmbeddedAgent";
 import { createDatasetFieldsTool } from "../../../internal/agents/tools/dataset-fields";
 import { createOtelLookupTool } from "../../../internal/agents/tools/otel-semantics";
 import { createWhoamiTool } from "../../../internal/agents/tools/whoami";
@@ -100,11 +103,10 @@ const MAX_INLINE_ENVIRONMENTS = 100;
 /**
  * Append the organization's real environment names to the system prompt.
  *
- * Without this the model invents `environment` values (`":null"`, `".*"`,
- * `["production","staging","development"]`, `" "` …) that Sentry's validation
- * rejects, burning the step budget and producing no output — the single biggest
- * source of search_events failures. Grounding it in the real names lets it pick
- * a valid one or omit the field.
+ * Without this the model invents `environment` values (e.g. `":null"`, `".*"`)
+ * that Sentry rejects, burning the step budget and producing no output — the top
+ * source of search_events failures. Grounding it lets the model pick a real one
+ * or omit the field.
  */
 export function buildSystemPromptWithEnvironments(
   base: string,
@@ -152,7 +154,7 @@ export async function searchEventsAgent(
   options: SearchEventsAgentOptions,
 ): Promise<{
   result: z.output<typeof searchEventsAgentOutputSchema>;
-  toolCalls: any[];
+  toolCalls: ToolCall[];
 }> {
   // Provider check happens in callEmbeddedAgent via getAgentProvider()
   // Create tools pre-bound with the provided API service and organization