clean up

Author: shayna-ch

packages/mcp-core/src/internal/formatting.ts

@@ -229,8 +229,6 @@ export function formatEventOutput(
       availableToolNames?: ReadonlySet<string>;
       directToolNames?: ReadonlySet<string>;
     };
-    // strip replay ids without rendering the replay note, for callers that report replays separately
-    stripReplayIds?: boolean;
   },
 ) {
   let output = "";
@@ -239,10 +237,9 @@ export function formatEventOutput(
       user?: z.infer<typeof EventSchema>["user"];
     }
   ).user;
-  const eventToRender =
-    options?.replaySummary || options?.stripReplayIds
-      ? stripReplayMetadata(event)
-      : event;
+  const eventToRender = options?.replaySummary
+    ? stripReplayMetadata(event)
+    : event;
 
   if (options?.replaySummary) {
     output += formatIssueReplayOutput({
@@ -2146,13 +2143,15 @@ export function formatIssueOutput({
 
     if (aiConversations && aiConversations.length > 0) {
       output += "\n## Response Notes\n\n";
-      output += formatAIConversationResponseNote({
+      for (const note of buildAIConversationResponseNotes({
         aiConversations,
         organizationSlug,
         experimentalMode: experimentalMode ?? false,
         availableToolNames,
         directToolNames,
-      });
+      })) {
+        output += `- ${note}\n`;
+      }
     }
 
     // For unsupported event types, return early without trying to render event details
@@ -2413,18 +2412,6 @@ function buildAIConversationResponseNotes({
   ];
 }
 
-function formatAIConversationResponseNote(args: {
-  aiConversations: AIConversationReference[];
-  organizationSlug: string;
-  experimentalMode: boolean;
-  availableToolNames?: ReadonlySet<string>;
-  directToolNames?: ReadonlySet<string>;
-}): string {
-  return `${buildAIConversationResponseNotes(args)
-    .map((note) => `- ${note}`)
-    .join("\n")}\n`;
-}
-
 const MAX_DISPLAY_REPLAYS = 5;
 
 function formatIssueReplayOutput({
@@ -2560,7 +2547,7 @@ function normalizeReplayId(replayId: string | null | undefined): string | null {
   return trimmedReplayId.replace(/-/g, "");
 }
 
-function stripReplayMetadata(event: Event): Event {
+export function stripReplayMetadata(event: Event): Event {
   const tags = event.tags?.filter(
     (tag) => tag.key !== "replay.id" && tag.key !== "replayId",
   );

packages/mcp-core/src/tools/catalog/get-issue-details.ts

@@ -23,6 +23,7 @@ import {
   getSuspectCommit,
   isPerformanceIssueType,
   isSupportedEventType,
+  stripReplayMetadata,
 } from "../../internal/formatting";
 import type { AIConversationReference } from "../../internal/tool-helpers/ai-conversation-actions";
 import { apiServiceFromContext } from "../../internal/tool-helpers/api";
@@ -172,6 +173,15 @@ function buildReplays(
   };
 }
 
+type IssueDetailsArgs = Parameters<typeof formatIssueOutput>[0];
+
+function issueDetailsResult(args: IssueDetailsArgs) {
+  if (args.experimentalMode && isSupportedEventType(args.event)) {
+    return structuredResult(buildIssueDetailsPayload(args));
+  }
+  return formatIssueOutput(args);
+}
+
 function buildIssueDetailsPayload({
   organizationSlug,
   issue,
@@ -187,22 +197,7 @@ function buildIssueDetailsPayload({
   experimentalMode,
   availableToolNames,
   directToolNames,
-}: {
-  organizationSlug: string;
-  issue: Issue;
-  event: Event;
-  apiService: SentryApiService;
-  autofixState?: AutofixRunState;
-  performanceTrace?: Trace;
-  externalIssues?: ExternalIssueList;
-  relatedReplayIds?: string[];
-  aiConversations?: AIConversationReference[];
-  codeLocation?: CodeLocation;
-  committers?: CommitterList;
-  experimentalMode?: boolean;
-  availableToolNames?: ReadonlySet<string>;
-  directToolNames?: ReadonlySet<string>;
-}): GetIssueDetailsPayload {
+}: IssueDetailsArgs): GetIssueDetailsPayload {
   const autofix = autofixState?.autofix;
   const summaries = autofix ? getAutofixArtifactSummaries(autofix) : undefined;
   const isPerf = isPerformanceIssueType(issue) && !!issue.metadata;
@@ -243,10 +238,7 @@ function buildIssueDetailsPayload({
           ? event.message
           : null,
       // replays are their own field below
-      body: formatEventOutput(event, {
-        performanceTrace,
-        stripReplayIds: true,
-      }),
+      body: formatEventOutput(stripReplayMetadata(event), { performanceTrace }),
     },
     seer: autofix
       ? {
@@ -426,28 +418,7 @@ export default defineTool({
         }),
       ]);
 
-      if (context.experimentalMode && isSupportedEventType(event)) {
-        return structuredResult(
-          buildIssueDetailsPayload({
-            organizationSlug: orgSlug,
-            issue,
-            event,
-            apiService,
-            autofixState,
-            performanceTrace,
-            externalIssues,
-            relatedReplayIds,
-            aiConversations,
-            codeLocation,
-            committers,
-            experimentalMode: context.experimentalMode,
-            availableToolNames: context.availableToolNames,
-            directToolNames: context.directToolNames,
-          }),
-        );
-      }
-
-      return formatIssueOutput({
+      return issueDetailsResult({
         organizationSlug: orgSlug,
         issue,
         event,
@@ -534,28 +505,7 @@ export default defineTool({
       }),
     ]);
 
-    if (context.experimentalMode && isSupportedEventType(event)) {
-      return structuredResult(
-        buildIssueDetailsPayload({
-          organizationSlug: orgSlug,
-          issue,
-          event,
-          apiService,
-          autofixState,
-          performanceTrace,
-          externalIssues,
-          relatedReplayIds,
-          aiConversations,
-          codeLocation,
-          committers,
-          experimentalMode: context.experimentalMode,
-          availableToolNames: context.availableToolNames,
-          directToolNames: context.directToolNames,
-        }),
-      );
-    }
-
-    return formatIssueOutput({
+    return issueDetailsResult({
       organizationSlug: orgSlug,
       issue,
       event,