ref(tools): Merge search/list tool pairs into unified tools

[dcramer]

Combines the 3 mutually exclusive search/list tool pairs into 3 unified tools:

• search_issues absorbs list_issues
• search_events absorbs list_events
• search_issue_events absorbs list_issue_events

Each tool now accepts both direct Sentry query syntax (query, sort, etc.) and optional natural language search (naturalLanguageQuery). When naturalLanguageQuery is provided and an embedded agent provider is configured, the agent refines the intent into correct Sentry params. When omitted, the direct params are used as-is with no agent overhead.

Previously, every query was forced through the embedded agent when API keys were configured — even simple iteration like "go through these 10 issues and do X." This added unnecessary latency and cost. Now callers choose: use direct syntax for deterministic queries, or use NL for ambiguous intent that benefits from agent refinement.

The AGENT_DEPENDENT_TOOLS / SIMPLE_REPLACEMENT_TOOLS mutual exclusivity system in server.ts is removed. If naturalLanguageQuery is used without an agent provider, the handler throws a clear ConfigurationError directing users to the query parameter.

Net tool count drops by 3.

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Missing env var teardown pollutes subsequent tests
  • Added proper save/restore for both OPENAI_API_KEY and ANTHROPIC_API_KEY in the finally blocks of all three test files, using delete for undefined values to properly unset environment variables.

Or push these changes by commenting:

@cursor push 19c67815a0

Preview (19c67815a0)

diff --git a/packages/mcp-core/src/tools/search-events.test.ts b/packages/mcp-core/src/tools/search-events.test.ts
--- a/packages/mcp-core/src/tools/search-events.test.ts
+++ b/packages/mcp-core/src/tools/search-events.test.ts
@@ -703,7 +703,8 @@
   });
 
   it("should throw ConfigurationError when naturalLanguageQuery provided without agent", async () => {
-    const savedKey = process.env.OPENAI_API_KEY;
+    const savedOpenAIKey = process.env.OPENAI_API_KEY;
+    const savedAnthropicKey = process.env.ANTHROPIC_API_KEY;
     process.env.OPENAI_API_KEY = "";
     process.env.ANTHROPIC_API_KEY = "";
 
@@ -735,7 +736,18 @@
         ),
       ).rejects.toThrow(ConfigurationError);
     } finally {
-      process.env.OPENAI_API_KEY = savedKey;
+      if (savedOpenAIKey === undefined) {
+        // biome-ignore lint/performance/noDelete: Required to properly unset environment variable
+        delete process.env.OPENAI_API_KEY;
+      } else {
+        process.env.OPENAI_API_KEY = savedOpenAIKey;
+      }
+      if (savedAnthropicKey === undefined) {
+        // biome-ignore lint/performance/noDelete: Required to properly unset environment variable
+        delete process.env.ANTHROPIC_API_KEY;
+      } else {
+        process.env.ANTHROPIC_API_KEY = savedAnthropicKey;
+      }
     }
   });
 });

diff --git a/packages/mcp-core/src/tools/search-issue-events.test.ts b/packages/mcp-core/src/tools/search-issue-events.test.ts
--- a/packages/mcp-core/src/tools/search-issue-events.test.ts
+++ b/packages/mcp-core/src/tools/search-issue-events.test.ts
@@ -581,7 +581,8 @@
   });
 
   it("should throw ConfigurationError when naturalLanguageQuery provided without agent", async () => {
-    const savedKey = process.env.OPENAI_API_KEY;
+    const savedOpenAIKey = process.env.OPENAI_API_KEY;
+    const savedAnthropicKey = process.env.ANTHROPIC_API_KEY;
     process.env.OPENAI_API_KEY = "";
     process.env.ANTHROPIC_API_KEY = "";
 
@@ -604,7 +605,18 @@
         ),
       ).rejects.toThrow(ConfigurationError);
     } finally {
-      process.env.OPENAI_API_KEY = savedKey;
+      if (savedOpenAIKey === undefined) {
+        // biome-ignore lint/performance/noDelete: Required to properly unset environment variable
+        delete process.env.OPENAI_API_KEY;
+      } else {
+        process.env.OPENAI_API_KEY = savedOpenAIKey;
+      }
+      if (savedAnthropicKey === undefined) {
+        // biome-ignore lint/performance/noDelete: Required to properly unset environment variable
+        delete process.env.ANTHROPIC_API_KEY;
+      } else {
+        process.env.ANTHROPIC_API_KEY = savedAnthropicKey;
+      }
     }
   });
 });

diff --git a/packages/mcp-core/src/tools/search-issues.test.ts b/packages/mcp-core/src/tools/search-issues.test.ts
--- a/packages/mcp-core/src/tools/search-issues.test.ts
+++ b/packages/mcp-core/src/tools/search-issues.test.ts
@@ -169,7 +169,8 @@
   });
 
   it("should throw ConfigurationError when naturalLanguageQuery provided without agent", async () => {
-    const savedKey = process.env.OPENAI_API_KEY;
+    const savedOpenAIKey = process.env.OPENAI_API_KEY;
+    const savedAnthropicKey = process.env.ANTHROPIC_API_KEY;
     process.env.OPENAI_API_KEY = "";
     process.env.ANTHROPIC_API_KEY = "";
 
@@ -190,7 +191,18 @@
         ),
       ).rejects.toThrow(ConfigurationError);
     } finally {
-      process.env.OPENAI_API_KEY = savedKey;
+      if (savedOpenAIKey === undefined) {
+        // biome-ignore lint/performance/noDelete: Required to properly unset environment variable
+        delete process.env.OPENAI_API_KEY;
+      } else {
+        process.env.OPENAI_API_KEY = savedOpenAIKey;
+      }
+      if (savedAnthropicKey === undefined) {
+        // biome-ignore lint/performance/noDelete: Required to properly unset environment variable
+        delete process.env.ANTHROPIC_API_KEY;
+      } else {
+        process.env.ANTHROPIC_API_KEY = savedAnthropicKey;
+      }
     }
   });

_{This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.}