mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 03:15:06 +03:00
## I have read the [CONTRIBUTING.md](<https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md>) file. YES ## What kind of change does this PR introduce? Feature / refactor. ## What is the current behavior? The dashboard assistant runs `@supabase/mcp-server-supabase` in-process over an in-memory transport (`lib/ai/supabase-mcp.ts`). ## What is the new behavior? The assistant connects to the **remote MCP server** over HTTP (`@ai-sdk/mcp`), forwarding the dashboard session token as a bearer. URL comes from `NEXT_PUBLIC_MCP_URL` with a local-dev fallback; platform-only, and Nimbus works via the same env var. * **Tool model unchanged:** UI-controlled `execute_sql` (with `needsApproval`) and `deploy_edge_function` still come from Studio; the allowlist (`TOOL_CATEGORY_MAP`) remains the gate keeping the remote's write tools away from the assistant (`read_only` is defense-in-depth). * **Attribution:** sends `x-source-name: supabase-studio` (+ `x-source-version`) → logged as `source_name`/`client_name`. * **Connection lifecycle:** the HTTP client is closed via the request's `AbortSignal` (tools execute later during streaming); `signal` is required on `getTools`/`getMcpTools`. * **Resilience:** a remote-MCP failure degrades to the remaining tools instead of failing the assistant. * **Drift protection:** relied-upon tools are typed against `keyof typeof supabaseMcpToolSchemas`, so a package bump that renames/removes one fails `pnpm typecheck`; a runtime check also warns if the deployed server returns fewer tools. * Adds unit tests for the above. ## Additional context * Verified end-to-end against a local remote MCP server with a dashboard token: `initialize` 200, tools listed, a tool executed, client closed cleanly. * The remote MCP (mgmt-api) already accepts dashboard session tokens (GoTrue-JWT auth path) — no backend change needed. `NEXT_PUBLIC_MCP_URL` must point at each env's `/mcp`. * `@supabase/mcp-server-supabase` is kept — still used by the self-hosted `/api/mcp` routes. Closes [AI-137](https://linear.app/supabase/issue/AI-137/switch-dashboard-assistant-to-remote-mcp) ## Rollout * **Rollout:** merges with `USE_REMOTE_MCP` off (in-process); flip it to `true` per environment (staging → prod → Nimbus) once each one's prerequisites land. * **Rollback:** unset `USE_REMOTE_MCP` and redeploy to fall back to the in-process client — no revert needed. ## Summary by CodeRabbit * **Bug Fixes** * Improved AI request handling so tool loading and generation clean up properly when a request is cancelled or the browser connection closes. * Added safer fallback behavior when remote tool loading fails, so AI features can continue with available tools instead of stopping entirely. * Updated remote tool access to use the current project reference and preserve the correct access headers. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * AI tools now connect more reliably to remote services and stop cleanly when requests end or are canceled. * Tool loading is more resilient, continuing with available tools if remote access is unavailable. * **Bug Fixes** * Improved cleanup to prevent lingering connections during SQL generation and policy workflows. * Added safer handling for remote tool changes and invalid responses. * **Tests** * Expanded automated coverage for remote tool setup, cancellation, and fallback behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
136 lines
5.8 KiB
TypeScript
136 lines
5.8 KiB
TypeScript
// Type-only import (erased at build time — pulls no runtime code into this route).
|
|
import type * as SupabaseMcp from '@supabase/mcp-server-supabase'
|
|
import type { ToolSet } from 'ai'
|
|
|
|
import { createInProcessSupabaseMCPClient, createSupabaseMCPClient } from '../supabase-mcp'
|
|
import { filterToolsByOptInLevel, toolSetValidationSchema } from '../tool-filter'
|
|
import type { AiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'
|
|
|
|
/**
|
|
* Union of the tool names exposed by the pinned `@supabase/mcp-server-supabase`
|
|
* version. Studio's dependency is bumped in lockstep with the remote MCP server
|
|
* (via automated bump PRs), so typing our tool-name lists against this makes an
|
|
* upstream rename/removal a **compile-time** failure (`pnpm typecheck`) in that
|
|
* PR, instead of a silent capability loss at runtime.
|
|
*/
|
|
type SupabaseMcpToolName = keyof typeof SupabaseMcp.supabaseMcpToolSchemas
|
|
|
|
// UI-executed tools handled locally by Studio (see getStudioTools); the remote
|
|
// MCP server's versions are removed so the UI-controlled Studio versions win.
|
|
const UI_EXECUTED_TOOLS = [
|
|
'execute_sql',
|
|
'deploy_edge_function',
|
|
] as const satisfies readonly SupabaseMcpToolName[]
|
|
|
|
// Read-only tools the assistant relies on from the remote MCP server — the
|
|
// MCP-sourced subset of the allowlist in tool-filter.ts (TOOL_CATEGORY_MAP).
|
|
// `satisfies` gives the compile-time drift guard; the runtime check below also
|
|
// catches a deployed server that returns fewer tools (feature flags / version
|
|
// skew). The allowlist remains the source of truth for what is allowed.
|
|
const EXPECTED_MCP_TOOLS = [
|
|
'search_docs',
|
|
'list_tables',
|
|
'list_extensions',
|
|
'list_edge_functions',
|
|
'list_branches',
|
|
'get_advisors',
|
|
'get_logs',
|
|
] as const satisfies readonly SupabaseMcpToolName[]
|
|
|
|
export const getMcpTools = async ({
|
|
accessToken,
|
|
projectRef,
|
|
aiOptInLevel,
|
|
signal,
|
|
}: {
|
|
accessToken: string
|
|
projectRef: string
|
|
aiOptInLevel: AiOptInLevel
|
|
// Required: the remote client holds an HTTP connection that must be torn down
|
|
// when the request ends. The caller owns that lifecycle via this signal.
|
|
signal: AbortSignal
|
|
}) => {
|
|
// Connect to the MCP server and fetch its tools, which replace the old local
|
|
// tools. `USE_REMOTE_MCP` gates the transport: the remote HTTP server (target
|
|
// state) or the legacy in-process server (fallback during the migration),
|
|
// defaulting to in-process until an environment opts in. Flip it per
|
|
// environment (staging → prod → Nimbus) once each one's prerequisites are met
|
|
// (dashboard-token support on the MCP API, remote MCP enabled for Nimbus);
|
|
// unset to roll back on the next deploy. Both transports expose the same tool
|
|
// surface, so the filtering, drift detection, and lifecycle handling below are
|
|
// transport-agnostic.
|
|
//
|
|
// TODO(AI-897): remove in process mcp — once every environment has been
|
|
// flipped and is stable, delete `createInProcessSupabaseMCPClient` and this
|
|
// fallback branch.
|
|
const useRemoteMcp = process.env.USE_REMOTE_MCP === 'true'
|
|
const createClient = useRemoteMcp ? createSupabaseMCPClient : createInProcessSupabaseMCPClient
|
|
const mcpClient = await createClient({
|
|
accessToken,
|
|
projectRef,
|
|
})
|
|
|
|
// The remote client keeps an HTTP connection open. The tools' `execute`
|
|
// functions are invoked later, while the response is streaming, so the
|
|
// connection must stay open until the request ends. Close it exactly once when
|
|
// the request is done (normal completion or abort) to avoid leaking a
|
|
// connection per request.
|
|
let closed = false
|
|
const closeClient = () => {
|
|
if (closed) return
|
|
closed = true
|
|
void mcpClient.close().catch(() => {})
|
|
}
|
|
|
|
// The request already ended before we could fetch tools; don't bother.
|
|
if (signal.aborted) {
|
|
closeClient()
|
|
return {} as ToolSet
|
|
}
|
|
signal.addEventListener('abort', closeClient, { once: true })
|
|
|
|
try {
|
|
const availableMcpTools = (await mcpClient.tools()) as ToolSet
|
|
|
|
// Runtime drift detection: `EXPECTED_MCP_TOOLS` is compile-time-checked
|
|
// against the pinned package (see its declaration), but the *deployed* remote
|
|
// server can still return fewer tools than the pinned types — feature flags,
|
|
// killswitches, or version skew during a bump. `filterToolsByOptInLevel`
|
|
// drops missing tools silently, so warn to make that observable.
|
|
const missingExpectedTools = EXPECTED_MCP_TOOLS.filter((name) => !(name in availableMcpTools))
|
|
if (missingExpectedTools.length > 0) {
|
|
console.error(
|
|
`Remote MCP server is missing expected tools: ${missingExpectedTools.join(', ')}. ` +
|
|
'The tool contract may have drifted; the assistant will operate without them.'
|
|
)
|
|
}
|
|
|
|
// Safety gate: `filterToolsByOptInLevel` keeps only tools in the allowlist
|
|
// (tool-filter.ts TOOL_CATEGORY_MAP) and drops everything else. This — not
|
|
// the `read_only` query param — is what prevents the remote server's
|
|
// write/destructive tools (apply_migration, create_branch, ...) from reaching
|
|
// the assistant. `read_only` is defense-in-depth (those tools throw at
|
|
// runtime). Do not remove this filter on the assumption `read_only` suffices.
|
|
const allowedMcpTools = filterToolsByOptInLevel(availableMcpTools, aiOptInLevel)
|
|
|
|
// Remove UI-executed tools handled locally
|
|
const filteredMcpTools: ToolSet = { ...allowedMcpTools }
|
|
UI_EXECUTED_TOOLS.forEach((toolName) => {
|
|
delete filteredMcpTools[toolName]
|
|
})
|
|
|
|
// Validate that only known tools are provided
|
|
const validation = toolSetValidationSchema.safeParse(filteredMcpTools)
|
|
if (!validation.success) {
|
|
console.error('MCP tools validation error:', validation.error)
|
|
throw new Error('Internal error: MCP tools validation failed')
|
|
}
|
|
|
|
return validation.data
|
|
} catch (error) {
|
|
// Don't leak the connection if fetching or validating tools fails
|
|
closeClient()
|
|
throw error
|
|
}
|
|
}
|