diff --git a/.superset/lib/setup/steps.sh b/.superset/lib/setup/steps.sh index fca533b469e..f6afcdf2238 100644 --- a/.superset/lib/setup/steps.sh +++ b/.superset/lib/setup/steps.sh @@ -624,7 +624,7 @@ step_setup_local_mcp() { fi local api_port="${API_PORT:-$((${SUPERSET_PORT_BASE:-3000} + 1))}" - local local_url="http://localhost:${api_port}/api/agent/mcp" + local local_url="http://localhost:${api_port}/api/v2/agent/mcp" # Add or update superset-local entry local tmp_file="${mcp_file}.tmp.$$" diff --git a/packages/chat/src/server/trpc/service.ts b/packages/chat/src/server/trpc/service.ts index 646e4ca841f..af98af59123 100644 --- a/packages/chat/src/server/trpc/service.ts +++ b/packages/chat/src/server/trpc/service.ts @@ -20,7 +20,6 @@ import { subscribeToSessionEvents, syncRuntimeHookSessionId, } from "./utils/runtime"; -import { getSupersetMcpTools } from "./utils/runtime/superset-mcp"; import { approvalRespondInput, displayStateInput, @@ -139,14 +138,8 @@ export class ChatRuntimeService { const creationPromise = (async () => { try { - const extraTools = await getSupersetMcpTools( - () => Promise.resolve(this.opts.headers()), - this.opts.apiUrl, - ); - const runtime = await createMastraCode({ cwd: runtimeCwd, - extraTools, disableMcp: !ENABLE_MASTRA_MCP_SERVERS, memory: new Memory({ options: { observationalMemory: false } }), }); diff --git a/packages/chat/src/server/trpc/utils/runtime/superset-mcp.ts b/packages/chat/src/server/trpc/utils/runtime/superset-mcp.ts deleted file mode 100644 index 2e02f93329f..00000000000 --- a/packages/chat/src/server/trpc/utils/runtime/superset-mcp.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { MCPClient } from "@mastra/mcp"; - -type MastraExtraTool = { - execute?: (input: unknown, context?: unknown) => Promise | unknown; - [key: string]: unknown; -}; - -export async function getSupersetMcpTools( - headers: () => Promise>, - apiUrl: string, -): Promise> { - try { - const h = await headers(); - if (!h.Authorization && !h.authorization) return {}; - - const client = new MCPClient({ - id: `superset-mcp-${Date.now()}`, - servers: { - superset: { - url: new URL(`${apiUrl}/api/agent/mcp`), - fetch: async (url, init) => { - const merged = new Headers(init?.headers); - for (const [k, v] of Object.entries(await headers())) { - merged.set(k, v); - } - return fetch(url, { ...init, headers: merged }); - }, - }, - }, - }); - - return (await client.listTools()) as unknown as Record< - string, - MastraExtraTool - >; - } catch (error) { - console.warn( - "[superset-mcp] failed to load tools", - error instanceof Error ? error.message : error, - ); - return {}; - } -}