diff --git a/.oxlintrc.json b/.oxlintrc.json
index 6a86d7b0d..a78ba0aed 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -37,6 +37,7 @@
         "allow": ["URL", "URLSearchParams"]
       }
     ],
+    "typescript/no-unnecessary-type-arguments": "error",
     "jsx-a11y/interactive-supports-focus": "off",
     "unicorn/prefer-spread": "error"
   },
diff --git a/packages/cli/test/lib/mcp/parse-flags.ts b/packages/cli/test/lib/mcp/parse-flags.ts
index 2d259d328..76338c15f 100644
--- a/packages/cli/test/lib/mcp/parse-flags.ts
+++ b/packages/cli/test/lib/mcp/parse-flags.ts
@@ -42,7 +42,7 @@ export async function parseMcpFlags(
 export async function parseMcpArgs(args: readonly string[]): Promise<McpArgs> {
   let parsed: McpArgs | undefined;
   let stderr = "";
-  const command = buildCommand<McpFlags, McpPositional, CommandContext>({
+  const command = buildCommand<McpFlags, McpPositional>({
     docs: { brief: "Parse sentry mcp flags" },
     parameters: (mcpCommand as unknown as { parameters: McpParameters })
       .parameters,
diff --git a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts
index 53b77a708..6e6553a5e 100644
--- a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts
+++ b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts
@@ -110,7 +110,7 @@ interface EmbeddedAgentResult<T> {
  */
 export async function callEmbeddedAgent<
   TOutput,
-  TSchema extends z.ZodType<TOutput, unknown>,
+  TSchema extends z.ZodType<TOutput>,
 >({
   system,
   prompt,
@@ -395,7 +395,7 @@ function extractJsonCandidates(text: string): string[] {
  */
 function rescueFromText<TOutput>(
   text: string,
-  schema: z.ZodType<TOutput, unknown>,
+  schema: z.ZodType<TOutput>,
 ): TOutput | null {
   for (const candidate of extractJsonCandidates(text)) {
     try {