fix(api): Preserve SDK query behavior after rebase

Handle SDK response shapes and replay query validation after rebasing the API SDK branch onto main. Keep API detail messages in tests and preserve multi-environment replay queries.

Co-Authored-By: GPT-5 Codex <codex@openai.com>

Author: dcramer

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

@@ -1470,41 +1470,47 @@ describe("API query builders", () => {
       });
       const urls: string[] = [];
 
-      globalThis.fetch = vi.fn().mockImplementation((url: string) => {
-        urls.push(url);
-        const requestUrl = new URL(url);
-        const attributeType = requestUrl.searchParams.get("attributeType");
-        const body =
-          attributeType === "boolean"
-            ? [
-                {
-                  key: "tags[enabled,boolean]",
-                  name: "enabled",
-                  attributeType: "boolean",
-                  attributeSource: { source_type: "user" },
-                },
-              ]
-            : [
-                {
-                  key: "tags[type]",
-                  name: "type",
-                  attributeType: "string",
-                  attributeSource: {
-                    source_type: "sentry",
-                    is_transformed_alias: true,
+      globalThis.fetch = vi
+        .fn()
+        .mockImplementation((input: string | Request) => {
+          const url =
+            typeof input === "string"
+              ? input
+              : input instanceof Request
+                ? input.url
+                : String(input);
+          urls.push(url);
+          const requestUrl = new URL(url);
+          const attributeType = requestUrl.searchParams.get("attributeType");
+          const body =
+            attributeType === "boolean"
+              ? [
+                  {
+                    key: "tags[enabled,boolean]",
+                    name: "enabled",
+                    attributeType: "boolean",
+                    attributeSource: { source_type: "user" },
                   },
-                },
-              ];
-
-        return Promise.resolve({
-          ok: true,
-          headers: {
-            get: (key: string) =>
-              key === "content-type" ? "application/json" : null,
-          },
-          json: () => Promise.resolve(body),
+                ]
+              : [
+                  {
+                    key: "tags[type]",
+                    name: "type",
+                    attributeType: "string",
+                    attributeSource: {
+                      source_type: "sentry",
+                      is_transformed_alias: true,
+                    },
+                  },
+                ];
+
+          return Promise.resolve(
+            new Response(JSON.stringify(body), {
+              status: 200,
+              headers: { "Content-Type": "application/json" },
+            }),
+          );
         });
-      });
 
       const result = await apiService.listTraceItemAttributes({
         organizationSlug: "test-org",

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

@@ -312,12 +312,13 @@ function parseTraceItemAttributes(
   body: unknown,
   fallbackType: TraceItemAttributeType,
 ): TraceItemAttribute[] {
-  if (!Array.isArray(body)) {
+  const values = isRecord(body) && Array.isArray(body.data) ? body.data : body;
+  if (!Array.isArray(values)) {
     return [];
   }
 
   const attributes: TraceItemAttribute[] = [];
-  for (const value of body) {
+  for (const value of values) {
     if (!isRecord(value) || typeof value.key !== "string") {
       continue;
     }
@@ -2633,6 +2634,17 @@ export class SentryApiService {
     },
     opts?: RequestOptions,
   ): Promise<ReplayList> {
+    if (statsPeriod && (start || end)) {
+      throw new ApiValidationError(
+        "Cannot use both statsPeriod and start/end parameters",
+      );
+    }
+    if ((start && !end) || (!start && end)) {
+      throw new ApiValidationError(
+        "Both start and end parameters must be provided together",
+      );
+    }
+
     const result = await sdkListAnOrganizationSReplays({
       ...this.getSdkConfig(opts),
       path: { organization_id_or_slug: organizationSlug },
@@ -2643,8 +2655,7 @@ export class SentryApiService {
         statsPeriod,
         start,
         end,
-        // SDK types environment as a single string
-        environment: Array.isArray(environment) ? environment[0] : environment,
+        environment,
         ...(projectId ? { project: [Number(projectId)] } : {}),
         // SDK types field as a strict enum — the API accepts arbitrary strings at runtime
         ...(fields?.length
@@ -2655,7 +2666,7 @@ export class SentryApiService {
             }
           : {}),
       },
-    });
+    } as Parameters<typeof sdkListAnOrganizationSReplays>[0]);
     const data = this.unwrapSdkResult(result, "searchReplays");
 
     return ReplayListResponseSchema.parse(data).data;

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

@@ -258,11 +258,12 @@ describe("fetchCustomAttributes", () => {
         ),
       );
 
-      // Should throw ApiPermissionError with the improved error message
-      // The SDK wraps errors with context, but the detail message is preserved
+      // Should throw ApiPermissionError with the improved error message.
       await expect(
         fetchCustomAttributes(apiService, "test-org", "spans"),
-      ).rejects.toThrow("listTraceItemAttributes(string): 403 Forbidden");
+      ).rejects.toThrow(
+        "You do not have access to query across multiple projects. Please select a project for your query.",
+      );
 
       // Should NOT log - the caller handles logging
     });
@@ -280,11 +281,10 @@ describe("fetchCustomAttributes", () => {
         ),
       );
 
-      // Should throw ApiPermissionError with the raw error message
-      // The SDK wraps errors with context prefix
+      // Should throw ApiPermissionError with the API detail message.
       await expect(
         fetchCustomAttributes(apiService, "test-org", "logs", "project-123"),
-      ).rejects.toThrow("listTraceItemAttributes(string): 403 Forbidden");
+      ).rejects.toThrow("Permission denied");
     });
 
     it("should throw 404 errors for errors dataset", async () => {
@@ -326,9 +326,7 @@ describe("fetchCustomAttributes", () => {
       ).catch((e) => e);
 
       expect(error).toBeInstanceOf(Error);
-      expect(error.message).toBe(
-        "listTraceItemAttributes(string): 500 Internal Server Error",
-      );
+      expect(error.message).toBe("Internal server error");
     });
 
     it("should re-throw 502 errors", async () => {