chore: merge main and resolve test import conflict

Preserve package-selection test imports alongside upstream tool failure
telemetry tests and the latest issue-details replay limits.

Co-Authored-By: GPT-6 (Codex) <noreply@openai.com>

Author: mr-danya

docs/specs/ai-conversations.md

@@ -220,7 +220,7 @@ Each result should include:
 - AI call count.
 - Tool call count and tool error count.
 - Tool names.
-- Total tokens and total cost.
+- Total tokens and a display-formatted USD total cost. Use `—` for zero, `<$0.01` for positive sub-cent costs, and compact currency formatting otherwise.
 - Trace count and a small sample of trace IDs.
 
 Search and detail structured outputs use Unix millisecond timestamps for

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

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { DEFAULT_SEARCH_ISSUES_PERIOD } from "../constants";
 import { ConfigurationError } from "../errors";
+import { retryWithBackoff } from "../internal/fetch-utils";
 import { logIssue, logWarn } from "../telem/logging";
 import type { SentryProtocol } from "../types";
 import {
@@ -30,7 +31,6 @@ import {
   isSentryHost,
   type TraceMetricIdentifier,
 } from "../utils/url-utils";
-import { retryWithBackoff } from "../internal/fetch-utils";
 import { USER_AGENT } from "../version";
 import { apiPath } from "./api-path";
 import {
@@ -70,6 +70,7 @@ import {
   MonitorListSchema,
   MonitorSchema,
   MonitorStatsSchema,
+  OrganizationEnvironmentListSchema,
   OrganizationListSchema,
   OrganizationSchema,
   ProfileChunkResponseSchema,
@@ -130,6 +131,7 @@ import type {
   MonitorCheckInList,
   MonitorList,
   MonitorStats,
+  OrganizationEnvironmentList,
   OrganizationList,
   ProfileChunk,
   Project,
@@ -3416,6 +3418,37 @@ export class SentryApiService {
     return EventsValidationResponseSchema.parse(body);
   }
 
+  /**
+   * List the organization's visible environments, optionally scoped to a
+   * project. The endpoint (`GET /organizations/{org}/environments/`) already
+   * filters to visible environments and excludes the empty-name "No Environment"
+   * pseudo-env; passing `project` narrows the list (verified against
+   * getsentry/sentry `OrganizationEnvironmentsEndpoint`).
+   */
+  async listEnvironments(
+    {
+      organizationSlug,
+      projectId,
+    }: {
+      organizationSlug: string;
+      projectId?: string;
+    },
+    opts?: RequestOptions,
+  ): Promise<OrganizationEnvironmentList> {
+    const queryParams = new URLSearchParams();
+    if (projectId) {
+      queryParams.set("project", projectId);
+    }
+    const suffix = queryParams.toString();
+    const body = await this.requestJSON(
+      apiPath`/organizations/${organizationSlug}/environments/` +
+        (suffix ? `?${suffix}` : ""),
+      undefined,
+      opts,
+    );
+    return OrganizationEnvironmentListSchema.parse(body);
+  }
+
   private async fetchTraceItemAttributes(
     organizationSlug: string,
     itemType: TraceItemType,
@@ -4109,7 +4142,7 @@ export class SentryApiService {
       organizationSlug: string;
       issueId: string;
       status?: string;
-      assignedTo?: string;
+      assignedTo?: string | null;
       substatus?: string;
       ignoreDuration?: number;
       ignoreCount?: number;
@@ -4130,7 +4163,7 @@ export class SentryApiService {
       ignoreUserWindow?: number;
     } = {};
     if (status !== undefined) updateData.status = status;
-    if (assignedTo !== undefined) updateData.assignedTo = assignedTo;
+    if (assignedTo !== undefined) updateData.assignedTo = assignedTo ?? "";
     if (substatus !== undefined) updateData.substatus = substatus;
     if (ignoreDuration !== undefined)
       updateData.ignoreDuration = ignoreDuration;

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

@@ -1350,6 +1350,17 @@ export const EventAttachmentSchema = z.object({
 
 export const EventAttachmentListSchema = z.array(EventAttachmentSchema);
 
+// GET /organizations/{org}/environments/ — visible environments (the endpoint
+// excludes the empty-name "No Environment" and hidden environments by default).
+export const OrganizationEnvironmentSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+});
+
+export const OrganizationEnvironmentListSchema = z.array(
+  OrganizationEnvironmentSchema,
+);
+
 /**
  * Schema for individual tag values within an issue's tag distribution.
  *

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

@@ -42,13 +42,13 @@ import type { z } from "zod";
 import type {
   AgenticOnboardingRunSchema,
   AgenticOnboardingStatusUpdateSchema,
-  AssignedToSchema,
-  AIConversationSummaryListSchema,
-  AIConversationSummarySchema,
   AIConversationDetailsResponseSchema,
   AIConversationSpanListSchema,
   AIConversationSpanSchema,
+  AIConversationSummaryListSchema,
+  AIConversationSummarySchema,
   AIConversationUserSchema,
+  AssignedToSchema,
   AutofixRunSchema,
   AutofixRunStateSchema,
   ClientKeyListSchema,
@@ -82,18 +82,15 @@ import type {
   IssueListSchema,
   IssueSchema,
   IssueTagValuesSchema,
+  MetricAlertRuleListSchema,
+  MetricAlertRuleSchema,
   MonitorCheckInListSchema,
   MonitorCheckInSchema,
   MonitorListSchema,
   MonitorSchema,
-  MonitorStatsSchema,
   MonitorStatSchema,
-  UptimeCheckListSchema,
-  UptimeCheckSchema,
-  UptimeMonitorListSchema,
-  UptimeMonitorSchema,
-  MetricAlertRuleListSchema,
-  MetricAlertRuleSchema,
+  MonitorStatsSchema,
+  OrganizationEnvironmentListSchema,
   OrganizationListSchema,
   OrganizationSchema,
   ProfileChunkResponseSchema,
@@ -123,8 +120,12 @@ import type {
   TransactionProfileSampleSchema,
   TransactionProfileSchema,
   UnknownEventSchema,
-  UserSchema,
+  UptimeCheckListSchema,
+  UptimeCheckSchema,
+  UptimeMonitorListSchema,
+  UptimeMonitorSchema,
   UserReportListSchema,
+  UserSchema,
 } from "./schema";
 
 export type AgenticOnboardingRun = z.infer<typeof AgenticOnboardingRunSchema>;
@@ -202,6 +203,9 @@ 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 OrganizationEnvironmentList = z.infer<
+  typeof OrganizationEnvironmentListSchema
+>;
 export type TagList = z.infer<typeof TagListSchema>;
 export type ClientKeyList = z.infer<typeof ClientKeyListSchema>;
 

packages/mcp-core/src/internal/agents/callEmbeddedAgent.test.ts

@@ -15,7 +15,7 @@ import {
   LLMProviderError,
   UserInputError,
 } from "../../errors";
-import { logIssue } from "../../telem/logging";
+import { logIssue, logWarn } from "../../telem/logging";
 import { getAgentProvider } from "./provider-factory";
 
 vi.mock("../../telem/logging", () => ({
@@ -243,7 +243,8 @@ describe("callEmbeddedAgent", () => {
 
   it("throws LLMProviderError for provider budget/quota failures", async () => {
     const budgetError = new APICallError({
-      message: "Workspace monthly budget of $15000.00 exceeded. Contact your org admin.",
+      message:
+        "Workspace monthly budget of $15000.00 exceeded. Contact your org admin.",
       url: "https://openrouter.ai/api/v1/chat/completions",
       requestBodyValues: {},
       statusCode: 402,
@@ -370,49 +371,32 @@ describe("callEmbeddedAgent", () => {
     );
   });
 
-  it("converts NoOutputGeneratedError into AgentExecutionError after filing a Sentry issue", async () => {
+  it("treats NoOutputGeneratedError as a recoverable UserInputError without filing a Sentry issue", async () => {
     const noOutputError = new NoOutputGeneratedError({
       message: "No output generated.",
     });
 
     mockGenerateText.mockRejectedValue(noOutputError);
 
+    // Recoverable model limitation (usually repeated tool/validation failures),
+    // not a system fault — surface as user input and log a warning, not an issue.
     await expect(
       callEmbeddedAgent({
         system: "You are a test agent",
         prompt: "Test prompt",
         tools: {},
         schema: testSchema,
       }),
-    ).rejects.toBeInstanceOf(AgentExecutionError);
-
-    await expect(
-      callEmbeddedAgent({
-        system: "You are a test agent",
-        prompt: "Test prompt",
-        tools: {},
-        schema: testSchema,
-      }),
-    ).rejects.toMatchObject({
-      message: expect.stringContaining("No output generated."),
-      eventId: "mock-event-id",
-      cause: noOutputError,
-    });
+    ).rejects.toBeInstanceOf(UserInputError);
 
-    expect(logIssue).toHaveBeenCalledWith(
-      noOutputError,
-      expect.objectContaining({
-        loggerScope: ["agents", "embedded"],
-        contexts: {
-          embeddedAgent: expect.objectContaining({
-            isNoOutputGenerated: true,
-          }),
-        },
-      }),
+    expect(logIssue).not.toHaveBeenCalled();
+    expect(logWarn).toHaveBeenCalledWith(
+      "Embedded agent produced no output",
+      expect.objectContaining({ loggerScope: ["agents", "embedded"] }),
     );
   });
 
-  it("treats missing experimental_output as NoOutputGeneratedError", async () => {
+  it("treats missing experimental_output as a recoverable UserInputError", async () => {
     mockGenerateText.mockResolvedValue({
       experimental_output: undefined,
     } as never);
@@ -424,17 +408,9 @@ describe("callEmbeddedAgent", () => {
         tools: {},
         schema: testSchema,
       }),
-    ).rejects.toBeInstanceOf(AgentExecutionError);
+    ).rejects.toBeInstanceOf(UserInputError);
 
-    expect(logIssue).toHaveBeenCalledWith(
-      expect.objectContaining({
-        name: "AI_NoOutputGeneratedError",
-        message: "No output generated.",
-      }),
-      expect.objectContaining({
-        loggerScope: ["agents", "embedded"],
-      }),
-    );
+    expect(logIssue).not.toHaveBeenCalled();
   });
 
   it("rethrows ConfigurationError from getProviderOptions without filing an issue", async () => {

packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts

@@ -1,22 +1,22 @@
 import {
-  generateText,
-  Output,
-  type Tool,
   APICallError,
+  generateText,
   NoObjectGeneratedError,
   NoOutputGeneratedError,
+  Output,
   RetryError,
   stepCountIs,
+  type Tool,
 } from "ai";
-import { getAgentProvider } from "./provider-factory";
+import type { z } from "zod";
 import {
   AgentExecutionError,
   ConfigurationError,
-  UserInputError,
   LLMProviderError,
+  UserInputError,
 } from "../../errors";
 import { logIssue, logWarn } from "../../telem/logging";
-import type { z } from "zod";
+import { getAgentProvider } from "./provider-factory";
 
 /**
  * Resolve the underlying provider failure from an AI SDK error.
@@ -210,6 +210,21 @@ export async function callEmbeddedAgent<
       );
     }
 
+    // NoOutputGeneratedError: the model exhausted its steps without emitting the
+    // structured output (typically after repeated tool/validation failures). This
+    // is a recoverable model limitation, not a system fault — surface it as user
+    // input like its NoObjectGeneratedError sibling and log a warning, instead of
+    // filing a Sentry issue for every occurrence.
+    if (NoOutputGeneratedError.isInstance(error)) {
+      logWarn("Embedded agent produced no output", {
+        loggerScope: ["agents", "embedded"],
+        extra: { errorMessage: error.message },
+      });
+      throw new UserInputError(
+        "The AI could not construct a valid query for this request. Please rephrase or narrow it — for example, specify the fields, a real environment name, or a time range.",
+      );
+    }
+
     // Handle LLM provider errors with user-friendly messages.
     // These are operational availability failures that should NOT create Sentry
     // issues per request (budget exhaustion, rate limits, provider outages).
@@ -242,9 +257,9 @@ export async function callEmbeddedAgent<
       throw error;
     }
 
-    // Unexpected agent failures (including NoOutputGeneratedError): file one
-    // Sentry issue, then throw a typed error so AI-powered tools can fall back
-    // or return a graceful response instead of hard-failing the MCP tool.
+    // Genuinely unexpected agent failures: file one Sentry issue, then throw a
+    // typed error so AI-powered tools can fall back or return a graceful response
+    // instead of hard-failing the MCP tool.
     throw toAgentExecutionError(error);
   }
 }

packages/mcp-core/src/internal/error-handling.ts

@@ -12,7 +12,8 @@ import {
 } from "../api-client";
 import { logIssue, logWarn } from "../telem/logging";
 import { APICallError, NoObjectGeneratedError, RetryError } from "ai";
-import type { TransportType } from "../types";
+import type { ToolConfig } from "../tools/types";
+import type { ServerContext, TransportType } from "../types";
 
 /**
  * Type guard to identify user input validation errors.
@@ -337,3 +338,19 @@ export async function formatErrorForUser(
   }
   return parts.join("\n\n");
 }
+
+/**
+ * Invoke a tool's onError hook for failure telemetry, isolated so a misbehaving
+ * hook can't disrupt the surrounding error handling. Call this at every point
+ * where a tool handler is run and may throw.
+ */
+export function recordToolFailure(
+  tool: Pick<ToolConfig, "onError">,
+  error: unknown,
+  params: Record<string, unknown>,
+  context: ServerContext,
+): void {
+  try {
+    tool.onError?.(error, params, context);
+  } catch {}
+}

packages/mcp-core/src/schema.ts

@@ -185,8 +185,10 @@ export const ParamIssueIgnoreMode = z
 export const ParamAssignedTo = z
   .string()
   .trim()
+  .min(1)
+  .nullable()
   .describe(
-    "The assignee in format 'user:ID' or 'team:ID_OR_SLUG' where ID is numeric. Example: 'user:123456', 'team:789', or 'team:my-team-slug'. Use `execute_sentry_tool(name='whoami', arguments={})` to find your user ID.",
+    "The assignee in format 'user:ID' or 'team:ID_OR_SLUG' where ID is numeric. Pass null to unassign the issue. Example: 'user:123456', 'team:789', or 'team:my-team-slug'. Use `execute_sentry_tool(name='whoami', arguments={})` to find your user ID.",
   );
 
 export const ParamIgnoreDurationMinutes = z