fix mcp server error code

Author: icecrasher321

apps/sim/app/api/mcp/servers/route.test.ts

@@ -0,0 +1,89 @@
+/**
+ * @vitest-environment node
+ */
+import type { NextRequest } from 'next/server'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockPerformDeleteMcpServer } = vi.hoisted(() => ({
+  mockPerformDeleteMcpServer: vi.fn(),
+}))
+
+vi.mock('@sim/db', () => ({
+  db: {
+    select: vi.fn(),
+  },
+}))
+
+vi.mock('@/lib/mcp/middleware', () => ({
+  getParsedBody: () => undefined,
+  withMcpAuth:
+    () =>
+    (
+      handler: (
+        request: NextRequest,
+        context: {
+          userId: string
+          userName: string
+          userEmail: string
+          workspaceId: string
+          requestId: string
+        }
+      ) => Promise<Response>
+    ) =>
+    (request: NextRequest) =>
+      handler(request, {
+        userId: 'user-1',
+        userName: 'Test User',
+        userEmail: 'test@example.com',
+        workspaceId: 'workspace-1',
+        requestId: 'request-1',
+      }),
+}))
+
+vi.mock('@/lib/mcp/orchestration', () => ({
+  performCreateMcpServer: vi.fn(),
+  performDeleteMcpServer: mockPerformDeleteMcpServer,
+}))
+
+import { DELETE } from '@/app/api/mcp/servers/route'
+
+function createDeleteRequest(serverId = 'server-1') {
+  return new Request(
+    `http://localhost:3000/api/mcp/servers?workspaceId=workspace-1&serverId=${serverId}`,
+    { method: 'DELETE' }
+  ) as NextRequest
+}
+
+describe('MCP servers DELETE route', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('returns 404 when orchestration reports a missing server', async () => {
+    mockPerformDeleteMcpServer.mockResolvedValueOnce({
+      success: false,
+      error: 'Server not found',
+      errorCode: 'not_found',
+    })
+
+    const response = await DELETE(createDeleteRequest())
+    const body = await response.json()
+
+    expect(response.status).toBe(404)
+    expect(body).toEqual({ success: false, error: 'Server not found' })
+  })
+
+  it('returns 500 when orchestration reports an internal delete failure', async () => {
+    mockPerformDeleteMcpServer.mockResolvedValueOnce({
+      success: false,
+      error: 'Failed to delete MCP server',
+      errorCode: 'internal',
+    })
+
+    const response = await DELETE(createDeleteRequest())
+    const body = await response.json()
+
+    expect(response.status).toBe(500)
+    expect(body).toEqual({ success: false, error: 'Failed to delete MCP server' })
+  })
+})

apps/sim/app/api/mcp/servers/route.ts

@@ -165,9 +165,9 @@ export const DELETE = withRouteHandler(
         })
         if (!result.success || !result.server) {
           return createMcpErrorResponse(
-            new Error('Server not found or access denied'),
-            'Server not found',
-            404
+            new Error(result.error || 'Failed to delete MCP server'),
+            result.error || 'Failed to delete MCP server',
+            mcpOrchestrationStatus(result.errorCode)
           )
         }