multisite-cms-mcp 1.2.2 → 1.2.3

package/dist/index.js

@@ -192,7 +192,7 @@ const TOOLS = [
     },
     {
         name: 'deploy_package',
-        description: 'Deploy a website package (.zip file) to Fast Mode. Can deploy to an existing project or create a new one. Opens browser for authentication if not already logged in. Use list_projects first to see existing projects.',
+        description: 'Deploy a website package (.zip file) to Fast Mode. Will check for GitHub sync and block deployment if connected (to prevent conflicts). Use force:true to override. Opens browser for authentication if not already logged in.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -208,6 +208,10 @@ const TOOLS = [
                     type: 'string',
                     description: 'Optional: Create a new project with this name and deploy to it. Required if projectId is not provided and no projects exist.',
                 },
+                force: {
+                    type: 'boolean',
+                    description: 'Optional: Skip GitHub connection check and deploy anyway. Use with caution - may cause conflicts if GitHub auto-deploy is enabled.',
+                },
             },
             required: ['packagePath'],
         },
@@ -345,7 +349,7 @@ server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
                 result = await (0, create_site_1.createSite)(params.name, params.subdomain);
                 break;
             case 'deploy_package':
-                result = await (0, deploy_package_1.deployPackage)(params.packagePath, params.projectId, params.projectName);
+                result = await (0, deploy_package_1.deployPackage)(params.packagePath, params.projectId, params.projectName, params.force);
                 break;
             case 'get_field_types':
                 result = await (0, get_field_types_1.getFieldTypes)();

package/dist/tools/deploy-package.d.ts

@@ -4,6 +4,7 @@
  * @param packagePath - Path to the zip file
  * @param projectId - Optional: Deploy to existing project with this ID
  * @param projectName - Optional: Create new project with this name
+ * @param force - Optional: Skip GitHub connection check and deploy anyway
  */
-export declare function deployPackage(packagePath: string, projectId?: string, projectName?: string): Promise<string>;
+export declare function deployPackage(packagePath: string, projectId?: string, projectName?: string, force?: boolean): Promise<string>;
 //# sourceMappingURL=deploy-package.d.ts.map

package/dist/tools/deploy-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-package.d.ts","sourceRoot":"","sources":["../../src/tools/deploy-package.ts"],"names":[],"mappings":"AA+MA;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CA0IjB"}
+{"version":3,"file":"deploy-package.d.ts","sourceRoot":"","sources":["../../src/tools/deploy-package.ts"],"names":[],"mappings":"AAmRA;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAwJjB"}

package/dist/tools/deploy-package.js

@@ -49,6 +49,60 @@ async function listExistingProjects() {
     }
     return response.data;
 }
+/**
+ * Check if a project has GitHub connected
+ */
+async function checkGitHubConnection(tenantId) {
+    const response = await (0, api_client_1.apiRequest)('/api/github/site-connection', { tenantId });
+    if ((0, api_client_1.isApiError)(response)) {
+        // If we can't check, assume not connected (fail open for better UX)
+        return null;
+    }
+    return response.data;
+}
+/**
+ * Format the GitHub blocking message
+ */
+function formatGitHubBlockMessage(repo, branch, subdomain) {
+    return `# ⚠️ GitHub Sync Detected
+
+This project has GitHub connected and will auto-deploy from:
+- **Repository:** ${repo}
+- **Branch:** ${branch}
+
+## Why This Matters
+
+Deploying via MCP while GitHub is connected can cause conflicts:
+- Your MCP changes could be overwritten on the next GitHub push
+- Or this deploy could overwrite changes from GitHub
+
+## Options
+
+### Option 1: Push to GitHub Instead (Recommended)
+Push your changes to the connected repository and let GitHub handle the deploy:
+\`\`\`bash
+git push origin ${branch}
+\`\`\`
+
+### Option 2: Disconnect GitHub First
+Go to **app.fastmode.ai** → Settings → GitHub and disconnect the repository.
+
+### Option 3: Force Deploy Anyway
+If you understand the risks and want to proceed:
+\`\`\`
+deploy_package(
+  packagePath: "./your-site.zip",
+  projectId: "...",
+  force: true
+)
+\`\`\`
+
+---
+
+**Dashboard:** https://app.fastmode.ai
+**Site:** https://${subdomain}.fastmode.ai
+`;
+}
 /**
  * Create a new site/project
  */
@@ -176,8 +230,9 @@ deploy_package(
  * @param packagePath - Path to the zip file
  * @param projectId - Optional: Deploy to existing project with this ID
  * @param projectName - Optional: Create new project with this name
+ * @param force - Optional: Skip GitHub connection check and deploy anyway
  */
-async function deployPackage(packagePath, projectId, projectName) {
+async function deployPackage(packagePath, projectId, projectName, force) {
     // Check authentication
     if (await (0, api_client_1.needsAuthentication)()) {
         const authResult = await (0, device_flow_1.ensureAuthenticated)();
@@ -263,6 +318,14 @@ Please try again or create the project manually at app.fastmode.ai
         const project = projects.find(p => p.id === targetProjectId);
         subdomain = project?.subdomain || '';
     }
+    // Check for GitHub connection (unless force is true or it's a new project)
+    if (!force && !projectName && targetProjectId) {
+        const githubStatus = await checkGitHubConnection(targetProjectId);
+        if (githubStatus?.connected && githubStatus.repo) {
+            // GitHub is connected - block deployment
+            return formatGitHubBlockMessage(githubStatus.repo, githubStatus.branch || 'main', subdomain);
+        }
+    }
     // Upload the package
     console.error(`Deploying to ${subdomain}.fastmode.ai...`);
     const uploadResult = await uploadPackage(targetProjectId, zipBuffer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multisite-cms-mcp",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "MCP server for Fast Mode CMS. Convert websites, validate packages, and deploy directly to Fast Mode. Includes authentication, project creation, schema sync, and one-click deployment.",
   "main": "dist/index.js",
   "bin": {