Merge pull request #10 from supabase-community/feat/branching

feat: support branching workflow via mcp

Author: gregnr

README.md

@@ -138,6 +138,16 @@ The following Supabase tools are available to the LLM:
 - `get_project_url`: Gets the API URL for a project.
 - `get_anon_key`: Gets the anonymous API key for a project.
 
+#### Branching (Experimental)
+
+- `enable_branching`: Enables branching on a project (requires a paid plan).
+- `create_branch`: Creates a development branch with migrations from production branch.
+- `list_branches`: Lists all development branches.
+- `delete_branch`: Deletes a development branch.
+- `merge_branch`: Merges migrations and edge functions from a development branch to production.
+- `reset_branch`: Resets migrations of a development branch to a prior version.
+- `rebase_branch`: Rebases development branch on production to handle migration drift.
+
 #### Development Tools
 
 - `generate_typescript_types`: Generates TypeScript types based on the database schema. LLMs can save this to a file and use it in their code.

package-lock.json

@@ -41,6 +41,7 @@
     "@types/node": "^22.8.6",
     "date-fns": "^4.1.0",
     "msw": "^2.7.3",
+    "nanoid": "^5.1.5",
     "openapi-typescript": "^7.5.0",
     "openapi-typescript-helpers": "^0.0.15",
     "prettier": "^3.3.3",

packages/mcp-server-supabase/package.json

@@ -1346,6 +1346,9 @@ export interface components {
             /** @enum {string} */
             message: "ok";
         };
+        BranchActionBody: {
+            migration_version?: string;
+        };
         BranchUpdateResponse: {
             workflow_run_id: string;
             /** @enum {string} */
@@ -2364,6 +2367,10 @@ export interface components {
             version: string;
             name?: string;
         }[];
+        V1CreateMigrationBody: {
+            query: string;
+            name?: string;
+        };
         V1RunQueryBody: {
             query: string;
         };
@@ -2705,7 +2712,11 @@ export interface operations {
             };
             cookie?: never;
         };
-        requestBody?: never;
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["BranchActionBody"];
+            };
+        };
         responses: {
             201: {
                 headers: {
@@ -2733,7 +2744,11 @@ export interface operations {
             };
             cookie?: never;
         };
-        requestBody?: never;
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["BranchActionBody"];
+            };
+        };
         responses: {
             201: {
                 headers: {
@@ -2761,7 +2776,11 @@ export interface operations {
             };
             cookie?: never;
         };
-        requestBody?: never;
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["BranchActionBody"];
+            };
+        };
         responses: {
             201: {
                 headers: {
@@ -5310,7 +5329,11 @@ export interface operations {
             };
             cookie?: never;
         };
-        requestBody?: never;
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["V1CreateMigrationBody"];
+            };
+        };
         responses: {
             200: {
                 headers: {