multisite-cms-mcp 1.5.4 → 1.5.6

package/README.md

@@ -9,8 +9,7 @@ Fast Mode is a modern CMS platform that turns static HTML websites into fully ed
 ### Key Features
 
 - **Keep Your Design** — Use any HTML/CSS. No themes, no page builders, no compromises.
-- **Built-in Collections** — Blog posts, team members, authors, downloads — all ready to use.
-- **Custom Collections** — Create any content type you need with custom fields.
+- **Custom Collections** — Create any content type you need (blog posts, team members, products, etc.)
 - **Visual Editor** — Edit content directly on your live site.
 - **Instant Deploy** — Push from GitHub or upload directly. Sites go live in seconds.
 - **Forms & Submissions** — Collect form data without any backend code.
@@ -34,7 +33,6 @@ These tools work without authentication — perfect for converting and validatin
 
 | Tool | Description |
 |------|-------------|
-| `get_schema` | Get the complete CMS schema with all collections and fields |
 | `get_field_types` | Get available field types for creating custom fields |
 | `validate_manifest` | Validate your manifest.json file |
 | `validate_template` | Check HTML templates for correct token usage, form handling, and schema validation |
@@ -122,7 +120,7 @@ Add to your Claude config:
 
 Ask your AI assistant:
 
-> "Convert this website to Fast Mode format. Use the get_schema tool to understand the CMS structure."
+> "Convert this website to Fast Mode format"
 
 The AI will use validation tools to create a proper package structure.
 
@@ -159,7 +157,7 @@ Your site will be available at `https://your-site.fastmode.ai` and you can manag
 
 ## Schema Sync (Critical for Custom Fields)
 
-When your templates use custom fields (fields beyond the built-in ones), you **must** create them in the CMS before deploying. The MCP server handles this automatically.
+When your templates use custom fields, you **must** create them in the CMS before deploying. The MCP server handles this automatically.
 
 ### Recommended Workflow
 
@@ -200,15 +198,14 @@ When you validate a template with a project ID, the tool will:
 | `multiSelect` | Multiple dropdown choices (tags) |
 | `relation` | Link to another collection (author → authors) |
 
-### Example: Adding Custom Fields to Built-in Collection
+### Example: Adding Fields to Existing Collection
 
 ```json
 {
   "projectId": "my-project",
   "fieldsToAdd": [
     {
-      "collectionSlug": "blogs",
-      "isBuiltin": true,
+      "collectionSlug": "posts",
       "fields": [
         { "slug": "heroImage", "name": "Hero Image", "type": "image" },
         { "slug": "category", "name": "Category", "type": "select", "options": "Tech,Business,Lifestyle" }
@@ -239,10 +236,11 @@ When you validate a template with a project ID, the tool will:
 ```
 
 **Features:**
+- ✅ Two-phase creation: collections first, then fields (relation fields always work)
+- ✅ Automatic retry for transient failures
 - ✅ Validates all field types before creating
 - ✅ Skips duplicates automatically (safe to re-run)
-- ✅ Works with both builtin and custom collections
-- ✅ Reports detailed results (created/skipped)
+- ✅ Reports detailed summary table with status
 
 ---
 
@@ -388,6 +386,14 @@ Use the `get_conversion_guide` tool for detailed instructions.
 
 ## Changelog
 
+### v1.5.5
+- **Removed `get_schema`** — Use `get_tenant_schema` for project-specific schema
+- **Two-Phase Schema Sync** — Collections created first, then all fields (relation fields always work)
+- **Automatic Retry** — Transient failures are retried automatically
+- **Similar Project Check** — `create_site` warns about similar existing project names
+- **Explicit Project Selection** — `deploy_package` now requires explicit project selection
+- **Improved Output** — Clear summary tables for sync results
+
 ### v1.5.0
 - **Form Validation** — Validates `data-form` attribute, input names, submit buttons
 - **Static Page Validation** — Validates `{{#each}}` collection references against schema

package/dist/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("@modelcontextprotocol/sdk/server/index.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
-const get_schema_1 = require("./tools/get-schema");
 const validate_manifest_1 = require("./tools/validate-manifest");
 const validate_template_1 = require("./tools/validate-template");
 const validate_package_1 = require("./tools/validate-package");
@@ -26,15 +25,6 @@ const server = new index_js_1.Server({
 });
 // Define available tools
 const TOOLS = [
-    {
-        name: 'get_schema',
-        description: 'Get the complete CMS schema including all built-in and custom collections with their fields. Use this to understand what content types are available and what tokens to use in templates.',
-        inputSchema: {
-            type: 'object',
-            properties: {},
-            required: [],
-        },
-    },
     {
         name: 'validate_manifest',
         description: 'Validate a manifest.json file for the CMS package. Returns errors if the structure is incorrect or required fields are missing.',
@@ -161,7 +151,7 @@ const TOOLS = [
     },
     {
         name: 'get_tenant_schema',
-        description: 'Fetch the complete schema for a specific project including custom collections and custom fields on built-in collections. Use this when converting a website for an existing project to see their specific CMS configuration. Requires FASTMODE_AUTH_TOKEN environment variable.',
+        description: 'Fetch the complete schema for a specific project including all collections and their fields. Use this when converting a website for an existing project to see their specific CMS configuration. Requires authentication.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -175,7 +165,7 @@ const TOOLS = [
     },
     {
         name: 'create_site',
-        description: 'Create a new Fast Mode site/project. Opens browser for authentication if not already logged in. After creation, use deploy_package to upload your website.',
+        description: 'Create a new Fast Mode site/project. Checks for similar existing project names first. Opens browser for authentication if not already logged in. After creation, use deploy_package to upload your website.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -187,13 +177,17 @@ const TOOLS = [
                     type: 'string',
                     description: 'Optional custom subdomain (auto-generated from name if not provided)',
                 },
+                confirmCreate: {
+                    type: 'boolean',
+                    description: 'Set to true to skip similar-name check (use only after user confirms they want a new project)',
+                },
             },
             required: ['name'],
         },
     },
     {
         name: 'deploy_package',
-        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.',
+        description: 'Deploy a website package (.zip file) to Fast Mode. Requires a projectId - use list_projects to find existing projects or create_site to create a new one first. Will check for GitHub sync and block deployment if connected. Use force:true to override.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -203,11 +197,7 @@ const TOOLS = [
                 },
                 projectId: {
                     type: 'string',
-                    description: 'Optional: Deploy to an existing project with this ID. Use list_projects to get project IDs.',
-                },
-                projectName: {
-                    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.',
+                    description: 'Project ID to deploy to. Use list_projects to find existing projects, or create_site to create a new one.',
                 },
                 force: {
                     type: 'boolean',
@@ -219,7 +209,7 @@ const TOOLS = [
     },
     {
         name: 'get_field_types',
-        description: 'Get the list of available field types for creating new fields in collections. Use this to see what field types you can use with sync_schema. This is NOT the list of fields in your schema - use get_schema or get_tenant_schema for that. No authentication required.',
+        description: 'Get the list of available field types for creating new fields in collections. Use this to see what field types you can use with sync_schema. This is NOT the list of fields in your schema - use get_tenant_schema for that. No authentication required.',
         inputSchema: {
             type: 'object',
             properties: {},
@@ -228,7 +218,7 @@ const TOOLS = [
     },
     {
         name: 'sync_schema',
-        description: 'IMPORTANT: Create new collections and/or add custom fields to collections. Call this BEFORE deploying when validate_template reports missing fields or collections. Requires authentication. All fields must have a type specified - call get_field_types first to see available types. Skips duplicates automatically. Without calling this tool, templates with custom fields will not render correctly.',
+        description: 'IMPORTANT: Create collections and fields in Fast Mode. Uses two-phase creation: all collections are created first, then all fields - so relation fields between collections always work regardless of order. Includes automatic retry for transient failures. Skips duplicates automatically. Call this BEFORE deploying. Requires authentication.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -311,9 +301,6 @@ server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
     try {
         let result;
         switch (name) {
-            case 'get_schema':
-                result = await (0, get_schema_1.getSchema)();
-                break;
             case 'validate_manifest':
                 result = await (0, validate_manifest_1.validateManifest)(params.manifest);
                 break;
@@ -346,10 +333,10 @@ server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
                 result = await (0, get_tenant_schema_1.getTenantSchema)(params.projectId);
                 break;
             case 'create_site':
-                result = await (0, create_site_1.createSite)(params.name, params.subdomain);
+                result = await (0, create_site_1.createSite)(params.name, params.subdomain, params.confirmCreate);
                 break;
             case 'deploy_package':
-                result = await (0, deploy_package_1.deployPackage)(params.packagePath, params.projectId, params.projectName, params.force);
+                result = await (0, deploy_package_1.deployPackage)(params.packagePath, params.projectId, params.force);
                 break;
             case 'get_field_types':
                 result = await (0, get_field_types_1.getFieldTypes)();

package/dist/tools/create-site.d.ts

@@ -3,6 +3,7 @@
  *
  * @param name - The name of the project
  * @param subdomain - Optional: Custom subdomain (auto-generated from name if not provided)
+ * @param confirmCreate - Optional: Skip similar-name check (set to true after user confirms)
  */
-export declare function createSite(name: string, subdomain?: string): Promise<string>;
+export declare function createSite(name: string, subdomain?: string, confirmCreate?: boolean): Promise<string>;
 //# sourceMappingURL=create-site.d.ts.map

package/dist/tools/create-site.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-site.d.ts","sourceRoot":"","sources":["../../src/tools/create-site.ts"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyFlF"}
+{"version":3,"file":"create-site.d.ts","sourceRoot":"","sources":["../../src/tools/create-site.ts"],"names":[],"mappings":"AAiEA;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAwI3G"}

package/dist/tools/create-site.js

@@ -3,13 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSite = createSite;
 const api_client_1 = require("../lib/api-client");
 const device_flow_1 = require("../lib/device-flow");
+/**
+ * Check for similar project names
+ */
+function findSimilarProjects(name, projects) {
+    const normalizedName = name.toLowerCase().trim();
+    return projects.filter(project => {
+        const projectName = project.name.toLowerCase();
+        // Exact match
+        if (projectName === normalizedName)
+            return true;
+        // One contains the other
+        if (projectName.includes(normalizedName) || normalizedName.includes(projectName))
+            return true;
+        // Similar words (check if main words overlap)
+        const nameWords = normalizedName.split(/\s+/).filter(w => w.length > 2);
+        const projectWords = projectName.split(/\s+/).filter(w => w.length > 2);
+        const overlap = nameWords.filter(w => projectWords.some(pw => pw.includes(w) || w.includes(pw)));
+        if (overlap.length > 0 && overlap.length >= nameWords.length * 0.5)
+            return true;
+        return false;
+    });
+}
+/**
+ * List existing projects for the authenticated user
+ */
+async function listExistingProjects() {
+    const response = await (0, api_client_1.apiRequest)('/api/tenants');
+    if ((0, api_client_1.isApiError)(response)) {
+        return [];
+    }
+    return response.data;
+}
 /**
  * Create a new Fast Mode site/project
  *
  * @param name - The name of the project
  * @param subdomain - Optional: Custom subdomain (auto-generated from name if not provided)
+ * @param confirmCreate - Optional: Skip similar-name check (set to true after user confirms)
  */
-async function createSite(name, subdomain) {
+async function createSite(name, subdomain, confirmCreate) {
     // Check authentication
     if (await (0, api_client_1.needsAuthentication)()) {
         const authResult = await (0, device_flow_1.ensureAuthenticated)();
@@ -29,6 +62,48 @@ create_site(name: "My Awesome Website")
 \`\`\`
 `;
     }
+    // Check for similar projects (unless confirmCreate is true)
+    if (!confirmCreate) {
+        const existingProjects = await listExistingProjects();
+        const similarProjects = findSimilarProjects(name, existingProjects);
+        if (similarProjects.length > 0) {
+            let output = `# Similar Project Found
+
+Before creating "${name}", please note that you have similar existing project(s):
+
+`;
+            similarProjects.forEach((project, index) => {
+                const url = project.customDomain || `${project.subdomain}.fastmode.ai`;
+                output += `${index + 1}. **${project.name}**
+   - ID: \`${project.id}\`
+   - URL: ${url}
+
+`;
+            });
+            output += `---
+
+## ACTION REQUIRED
+
+**Ask the user:** "I found a similar project called '${similarProjects[0].name}'. Would you like to:
+1. Deploy to the existing project '${similarProjects[0].name}'?
+2. Create a new project called '${name}'?"
+
+### If deploying to existing project:
+\`\`\`
+deploy_package(
+  packagePath: "./your-site.zip",
+  projectId: "${similarProjects[0].id}"
+)
+\`\`\`
+
+### If creating new project anyway:
+\`\`\`
+create_site(name: "${name}", confirmCreate: true)
+\`\`\`
+`;
+            return output;
+        }
+    }
     // Generate subdomain from name if not provided
     const finalSubdomain = subdomain || name
         .toLowerCase()

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

@@ -2,9 +2,8 @@
  * Deploy a website package to Fast Mode
  *
  * @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 projectId - Project ID to deploy to (use list_projects to find, or create_site to create new)
  * @param force - Optional: Skip GitHub connection check and deploy anyway
  */
-export declare function deployPackage(packagePath: string, projectId?: string, projectName?: string, force?: boolean): Promise<string>;
+export declare function deployPackage(packagePath: string, projectId?: 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":"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"}
+{"version":3,"file":"deploy-package.d.ts","sourceRoot":"","sources":["../../src/tools/deploy-package.ts"],"names":[],"mappings":"AA0QA;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAmGjB"}

package/dist/tools/deploy-package.js

@@ -103,28 +103,6 @@ deploy_package(
 **Site:** https://${subdomain}.fastmode.ai
 `;
 }
-/**
- * Create a new site/project
- */
-async function createNewSite(name, subdomain) {
-    // Generate subdomain from name if not provided
-    const finalSubdomain = subdomain || name
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '-')
-        .replace(/^-|-$/g, '')
-        .slice(0, 30);
-    const response = await (0, api_client_1.apiRequest)('/api/tenants', {
-        method: 'POST',
-        body: {
-            name,
-            subdomain: finalSubdomain,
-        },
-    });
-    if ((0, api_client_1.isApiError)(response)) {
-        return { error: response.error };
-    }
-    return response.data;
-}
 /**
  * Upload a package to a specific tenant
  */
@@ -187,52 +165,78 @@ async function readPackage(packagePath) {
 /**
  * Format project list for user selection
  */
-function formatProjectChoice(projects) {
-    let output = `# Select a Project
+function formatProjectChoice(projects, packagePath) {
+    let output = `# Project Required
 
-Found ${projects.length} existing project${projects.length > 1 ? 's' : ''}:
+You need to specify which project to deploy to.
+
+## Your Projects
 
 `;
-    projects.forEach((project, index) => {
-        const url = project.customDomain || `${project.subdomain}.fastmode.ai`;
-        output += `${index + 1}. **${project.name}**
+    if (projects.length > 0) {
+        projects.forEach((project, index) => {
+            const url = project.customDomain || `${project.subdomain}.fastmode.ai`;
+            output += `${index + 1}. **${project.name}**
    - ID: \`${project.id}\`
    - URL: ${url}
    - Status: ${project.site?.status || 'pending'}
 
 `;
-    });
-    output += `---
+        });
+        output += `---
+
+## ACTION REQUIRED
 
-## How to Deploy
+**Ask the user:** "Which project should I deploy to? You can choose from the list above, or I can create a new project for you."
 
-**To an existing project:**
+### To deploy to an existing project:
 \`\`\`
 deploy_package(
-  packagePath: "./your-site.zip",
+  packagePath: "${packagePath}",
   projectId: "${projects[0]?.id || 'project-id-here'}"
 )
 \`\`\`
 
-**To a new project:**
+### To create a NEW project first:
+\`\`\`
+create_site(name: "Project Name")
+\`\`\`
+Then deploy with the returned project ID.
+`;
+    }
+    else {
+        output += `You don't have any projects yet.
+
+---
+
+## ACTION REQUIRED
+
+**Ask the user:** "What would you like to name your new project?"
+
+Then create the project:
+\`\`\`
+create_site(name: "User's Project Name")
+\`\`\`
+
+And deploy with the returned project ID:
 \`\`\`
 deploy_package(
-  packagePath: "./your-site.zip",
-  projectName: "My New Site"
+  packagePath: "${packagePath}",
+  projectId: "returned-project-id"
 )
 \`\`\`
 `;
+    }
     return output;
 }
 /**
  * Deploy a website package to Fast Mode
  *
  * @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 projectId - Project ID to deploy to (use list_projects to find, or create_site to create new)
  * @param force - Optional: Skip GitHub connection check and deploy anyway
  */
-async function deployPackage(packagePath, projectId, projectName, force) {
+async function deployPackage(packagePath, projectId, force) {
     // Check authentication
     if (await (0, api_client_1.needsAuthentication)()) {
         const authResult = await (0, device_flow_1.ensureAuthenticated)();
@@ -240,26 +244,10 @@ async function deployPackage(packagePath, projectId, projectName, force) {
             return authResult.message;
         }
     }
-    // If no projectId specified, help user choose
-    if (!projectId && !projectName) {
+    // If no projectId specified, list projects and prompt for selection
+    if (!projectId) {
         const projects = await listExistingProjects();
-        if (projects.length > 0) {
-            return formatProjectChoice(projects);
-        }
-        // No projects exist - need a projectName
-        return `# No Projects Found
-
-You don't have any FastMode projects yet.
-
-To create a new project and deploy, provide a project name:
-
-\`\`\`
-deploy_package(
-  packagePath: "${packagePath}",
-  projectName: "My Website"
-)
-\`\`\`
-`;
+        return formatProjectChoice(projects, packagePath);
     }
     // Read the package first
     const packageResult = await readPackage(packagePath);
@@ -272,55 +260,21 @@ Please provide a valid .zip file path.
 `;
     }
     const zipBuffer = packageResult;
-    let targetProjectId = projectId;
-    let subdomain = '';
-    // Create new project if needed
-    if (!targetProjectId && projectName) {
-        const createResult = await createNewSite(projectName);
-        if ('error' in createResult) {
-            // Check if it's an auth error
-            if (createResult.error.includes('401') || createResult.error.includes('auth')) {
-                const authResult = await (0, device_flow_1.ensureAuthenticated)();
-                if (!authResult.authenticated) {
-                    return authResult.message;
-                }
-                // Retry
-                const retryResult = await createNewSite(projectName);
-                if ('error' in retryResult) {
-                    return `# Failed to Create Project
-
-${retryResult.error}
-
-Please try again or create the project manually at app.fastmode.ai
-`;
-                }
-                targetProjectId = retryResult.id;
-                subdomain = retryResult.subdomain;
-            }
-            else {
-                return `# Failed to Create Project
+    // Get subdomain for the project
+    const projects = await listExistingProjects();
+    const project = projects.find(p => p.id === projectId);
+    const subdomain = project?.subdomain || '';
+    if (!project) {
+        return `# Project Not Found
 
-${createResult.error}
+Could not find project with ID: \`${projectId}\`
 
-Please try again or create the project manually at app.fastmode.ai
+Use \`list_projects\` to see available projects, or \`create_site\` to create a new one.
 `;
-            }
-        }
-        else {
-            targetProjectId = createResult.id;
-            subdomain = createResult.subdomain;
-            console.error(`Created new project: ${projectName} (${subdomain}.fastmode.ai)`);
-        }
-    }
-    // Get subdomain for existing project
-    if (!subdomain && targetProjectId) {
-        const projects = await listExistingProjects();
-        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);
+    // Check for GitHub connection (unless force is true)
+    if (!force) {
+        const githubStatus = await checkGitHubConnection(projectId);
         if (githubStatus?.connected && githubStatus.repo) {
             // GitHub is connected - block deployment
             return formatGitHubBlockMessage(githubStatus.repo, githubStatus.branch || 'main', subdomain);
@@ -328,7 +282,7 @@ Please try again or create the project manually at app.fastmode.ai
     }
     // Upload the package
     console.error(`Deploying to ${subdomain}.fastmode.ai...`);
-    const uploadResult = await uploadPackage(targetProjectId, zipBuffer);
+    const uploadResult = await uploadPackage(projectId, zipBuffer);
     if ('error' in uploadResult) {
         // Check if it's an auth error
         if ((0, api_client_1.needsAuthError)({ success: false, error: uploadResult.error, statusCode: 401 })) {
@@ -337,7 +291,7 @@ Please try again or create the project manually at app.fastmode.ai
                 return authResult.message;
             }
             // Retry upload
-            const retryResult = await uploadPackage(targetProjectId, zipBuffer);
+            const retryResult = await uploadPackage(projectId, zipBuffer);
             if ('error' in retryResult) {
                 return `# Upload Failed
 
@@ -349,7 +303,7 @@ Please check:
 3. Try again or upload manually at app.fastmode.ai
 `;
             }
-            return formatSuccess(subdomain, retryResult, !!projectName);
+            return formatSuccess(subdomain, retryResult);
         }
         return `# Upload Failed
 
@@ -361,15 +315,15 @@ Please check:
 3. Try again or upload manually at app.fastmode.ai
 `;
     }
-    return formatSuccess(subdomain, uploadResult, !!projectName);
+    return formatSuccess(subdomain, uploadResult);
 }
 /**
  * Format success message
  */
-function formatSuccess(subdomain, result, isNewProject) {
-    return `# Deployment Successful! 🚀
+function formatSuccess(subdomain, result) {
+    return `# Deployment Successful!
 
-${isNewProject ? '**New project created and deployed!**' : '**Package deployed!**'}
+**Package deployed!**
 
 ## Live Site
 

package/dist/tools/get-conversion-guide.js

@@ -781,7 +781,7 @@ ${SECTIONS.checklist}
 
 Use these MCP tools during conversion:
 
-- \`get_schema\` - Get collection field reference and token syntax
+- \`get_field_types\` - Get available field types for sync_schema
 - \`get_tenant_schema\` - Get exact collections and fields for a specific project
 - \`get_example\` - Get code examples for specific patterns
 - \`validate_manifest\` - Check your manifest.json

package/dist/tools/get-field-types.d.ts

@@ -3,7 +3,7 @@
  *
  * Returns the list of field types that can be used when CREATING new fields
  * in collections. This is NOT the list of fields in your schema - use
- * get_schema or get_tenant_schema for that.
+ * get_tenant_schema for that.
  *
  * No authentication required.
  */

package/dist/tools/get-field-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-field-types.d.ts","sourceRoot":"","sources":["../../src/tools/get-field-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,EAqE5C,CAAC;AAEF;;;GAGG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CA0CrD"}
+{"version":3,"file":"get-field-types.d.ts","sourceRoot":"","sources":["../../src/tools/get-field-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,EAqE5C,CAAC;AAEF;;;GAGG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAyCrD"}

package/dist/tools/get-field-types.js

@@ -4,7 +4,7 @@
  *
  * Returns the list of field types that can be used when CREATING new fields
  * in collections. This is NOT the list of fields in your schema - use
- * get_schema or get_tenant_schema for that.
+ * get_tenant_schema for that.
  *
  * No authentication required.
  */
@@ -104,7 +104,7 @@ async function getFieldTypes() {
 
 These are the field types you can use when CREATING new fields with the \`sync_schema\` tool.
 
-**Note:** This is NOT the list of fields in your schema. Use \`get_schema\` for the generic schema or \`get_tenant_schema\` for a specific project's schema.
+**Note:** This is NOT the list of fields in your schema. Use \`get_tenant_schema\` to see a specific project's schema.
 
 ## Field Types
 
@@ -118,8 +118,7 @@ When calling \`sync_schema\` to add fields, specify the \`type\` parameter:
 {
   "fieldsToAdd": [
     {
-      "collectionSlug": "blogs",
-      "isBuiltin": true,
+      "collectionSlug": "posts",
       "fields": [
         { "slug": "heroImage", "name": "Hero Image", "type": "image" },
         { "slug": "featured", "name": "Featured", "type": "boolean" },

package/dist/tools/sync-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-schema.d.ts","sourceRoot":"","sources":["../../src/tools/sync-schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED,UAAU,WAAW;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAgJD;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAmSxE"}
+{"version":3,"file":"sync-schema.d.ts","sourceRoot":"","sources":["../../src/tools/sync-schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED,UAAU,WAAW;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAgJD;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CA2VxE"}

package/dist/tools/sync-schema.js

@@ -211,56 +211,34 @@ ${resolved.error}
             return `# Error\n\n${existingResult.error}`;
         }
     }
-    const existingCollections = Array.isArray(existingResult) ? existingResult : [];
+    let existingCollections = Array.isArray(existingResult) ? existingResult : [];
     // Track results
-    const results = [];
+    const collectionResults = [];
+    const fieldResults = [];
     const created = { collections: 0, fields: 0 };
     const skipped = { collections: 0, fields: 0 };
-    // Create new collections
+    const failed = { collections: 0, fields: 0 };
+    // Build a map of collection slug -> ID (for both existing and newly created)
+    const collectionIdMap = new Map();
+    const collectionFieldsMap = new Map();
+    // Initialize with existing collections
+    for (const col of existingCollections) {
+        collectionIdMap.set(col.slug.toLowerCase(), col.id);
+        collectionFieldsMap.set(col.slug.toLowerCase(), col.fields);
+    }
+    // ============ PHASE 1: Create/Resolve ALL Collections ============
     if (collections && collections.length > 0) {
+        collectionResults.push('### Phase 1: Collections\n');
         for (const col of collections) {
+            const slugLower = col.slug.toLowerCase();
             // Check if collection already exists
-            const existing = existingCollections.find(c => c.slug.toLowerCase() === col.slug.toLowerCase());
-            if (existing) {
-                results.push(`Skipped collection "${col.slug}" (already exists)`);
+            if (collectionIdMap.has(slugLower)) {
+                collectionResults.push(`| ${col.slug} | Skipped | Already exists |`);
                 skipped.collections++;
-                // But still try to add any new fields
-                if (col.fields && col.fields.length > 0) {
-                    for (const field of col.fields) {
-                        const fieldExists = existing.fields.some(f => f.slug.toLowerCase() === field.slug.toLowerCase());
-                        if (fieldExists) {
-                            results.push(`  Skipped field "${field.slug}" (already exists)`);
-                            skipped.fields++;
-                        }
-                        else {
-                            // Add field to existing collection
-                            const fieldRes = await (0, api_client_1.apiRequest)(`/api/collections/${existing.id}/fields`, {
-                                tenantId,
-                                method: 'POST',
-                                body: {
-                                    slug: field.slug,
-                                    name: field.name,
-                                    type: field.type,
-                                    description: field.description,
-                                    isRequired: field.isRequired,
-                                    options: field.options,
-                                    referenceCollection: field.referenceCollection,
-                                },
-                            });
-                            if ((0, api_client_1.isApiError)(fieldRes)) {
-                                results.push(`  Failed to add field "${field.slug}": ${fieldRes.error}`);
-                            }
-                            else {
-                                results.push(`  Added field "${field.slug}" (${field.type})`);
-                                created.fields++;
-                            }
-                        }
-                    }
-                }
                 continue;
             }
-            // Create new collection
-            const createRes = await (0, api_client_1.apiRequest)('/api/collections', {
+            // Create new collection (WITHOUT fields - those come in Phase 2)
+            let createRes = await (0, api_client_1.apiRequest)('/api/collections', {
                 tenantId,
                 method: 'POST',
                 body: {
@@ -271,93 +249,157 @@ ${resolved.error}
                     hasSlug: col.hasSlug ?? true,
                 },
             });
+            // Retry once if failed
             if ((0, api_client_1.isApiError)(createRes)) {
-                results.push(`Failed to create collection "${col.slug}": ${createRes.error}`);
+                await new Promise(resolve => setTimeout(resolve, 500));
+                createRes = await (0, api_client_1.apiRequest)('/api/collections', {
+                    tenantId,
+                    method: 'POST',
+                    body: {
+                        slug: col.slug,
+                        name: col.name,
+                        nameSingular: col.nameSingular,
+                        description: col.description,
+                        hasSlug: col.hasSlug ?? true,
+                    },
+                });
+            }
+            if ((0, api_client_1.isApiError)(createRes)) {
+                collectionResults.push(`| ${col.slug} | FAILED | ${createRes.error} |`);
+                failed.collections++;
                 continue;
             }
-            results.push(`Created collection "${col.name}" (${col.slug})`);
+            // Add to our maps
+            collectionIdMap.set(slugLower, createRes.data.id);
+            collectionFieldsMap.set(slugLower, []); // New collection has no fields yet
+            collectionResults.push(`| ${col.slug} | Created | ${col.name} |`);
             created.collections++;
-            // Add fields to the new collection
+        }
+    }
+    const fieldJobs = [];
+    // Fields from new collections
+    if (collections) {
+        for (const col of collections) {
             if (col.fields && col.fields.length > 0) {
-                const collectionId = createRes.data.id;
                 for (const field of col.fields) {
-                    const fieldRes = await (0, api_client_1.apiRequest)(`/api/collections/${collectionId}/fields`, {
-                        tenantId,
-                        method: 'POST',
-                        body: {
-                            slug: field.slug,
-                            name: field.name,
-                            type: field.type,
-                            description: field.description,
-                            isRequired: field.isRequired,
-                            options: field.options,
-                            referenceCollection: field.referenceCollection,
-                        },
-                    });
-                    if ((0, api_client_1.isApiError)(fieldRes)) {
-                        results.push(`  Failed to add field "${field.slug}": ${fieldRes.error}`);
-                    }
-                    else {
-                        results.push(`  Added field "${field.slug}" (${field.type})`);
-                        created.fields++;
-                    }
+                    fieldJobs.push({ collectionSlug: col.slug, field });
                 }
             }
         }
     }
-    // Add fields to existing collections
-    if (fieldsToAdd && fieldsToAdd.length > 0) {
+    // Fields from fieldsToAdd
+    if (fieldsToAdd) {
         for (const group of fieldsToAdd) {
-            results.push(`\nCollection ${group.collectionSlug}:`);
-            // All collections are custom collections now
-            const customCollection = existingCollections.find(c => c.slug.toLowerCase() === group.collectionSlug.toLowerCase());
-            if (!customCollection) {
-                results.push(`  Collection "${group.collectionSlug}" not found. Create it first with the collections parameter.`);
+            for (const field of group.fields) {
+                fieldJobs.push({ collectionSlug: group.collectionSlug, field });
+            }
+        }
+    }
+    if (fieldJobs.length > 0) {
+        fieldResults.push('### Phase 2: Fields\n');
+        fieldResults.push('| Collection | Field | Type | Status |');
+        fieldResults.push('|------------|-------|------|--------|');
+        for (const job of fieldJobs) {
+            const slugLower = job.collectionSlug.toLowerCase();
+            const collectionId = collectionIdMap.get(slugLower);
+            if (!collectionId) {
+                fieldResults.push(`| ${job.collectionSlug} | ${job.field.slug} | ${job.field.type} | FAILED: Collection not found |`);
+                failed.fields++;
                 continue;
             }
-            for (const field of group.fields) {
-                const fieldExists = customCollection.fields.some(f => f.slug.toLowerCase() === field.slug.toLowerCase());
-                if (fieldExists) {
-                    results.push(`  Skipped field "${field.slug}" (already exists)`);
-                    skipped.fields++;
-                    continue;
-                }
-                const fieldRes = await (0, api_client_1.apiRequest)(`/api/collections/${customCollection.id}/fields`, {
+            // Check if field already exists
+            const existingFields = collectionFieldsMap.get(slugLower) || [];
+            const fieldExists = existingFields.some(f => f.slug.toLowerCase() === job.field.slug.toLowerCase());
+            if (fieldExists) {
+                fieldResults.push(`| ${job.collectionSlug} | ${job.field.slug} | ${job.field.type} | Skipped (exists) |`);
+                skipped.fields++;
+                continue;
+            }
+            // Create the field with retry logic
+            let fieldRes = await (0, api_client_1.apiRequest)(`/api/collections/${collectionId}/fields`, {
+                tenantId,
+                method: 'POST',
+                body: {
+                    slug: job.field.slug,
+                    name: job.field.name,
+                    type: job.field.type,
+                    description: job.field.description,
+                    isRequired: job.field.isRequired,
+                    options: job.field.options,
+                    referenceCollection: job.field.referenceCollection,
+                },
+            });
+            // Retry once if failed (network issues, temporary errors)
+            if ((0, api_client_1.isApiError)(fieldRes)) {
+                // Wait a moment and retry
+                await new Promise(resolve => setTimeout(resolve, 500));
+                fieldRes = await (0, api_client_1.apiRequest)(`/api/collections/${collectionId}/fields`, {
                     tenantId,
                     method: 'POST',
                     body: {
-                        slug: field.slug,
-                        name: field.name,
-                        type: field.type,
-                        description: field.description,
-                        isRequired: field.isRequired,
-                        options: field.options,
-                        referenceCollection: field.referenceCollection,
+                        slug: job.field.slug,
+                        name: job.field.name,
+                        type: job.field.type,
+                        description: job.field.description,
+                        isRequired: job.field.isRequired,
+                        options: job.field.options,
+                        referenceCollection: job.field.referenceCollection,
                     },
                 });
-                if ((0, api_client_1.isApiError)(fieldRes)) {
-                    results.push(`  Failed to add field "${field.slug}": ${fieldRes.error}`);
-                }
-                else {
-                    results.push(`  Added field "${field.slug}" (${field.type})`);
-                    created.fields++;
-                }
+            }
+            if ((0, api_client_1.isApiError)(fieldRes)) {
+                fieldResults.push(`| ${job.collectionSlug} | ${job.field.slug} | ${job.field.type} | FAILED: ${fieldRes.error} |`);
+                failed.fields++;
+            }
+            else {
+                fieldResults.push(`| ${job.collectionSlug} | ${job.field.slug} | ${job.field.type} | Created |`);
+                created.fields++;
+                // Update the fields map so subsequent checks know this field exists
+                const fields = collectionFieldsMap.get(slugLower) || [];
+                fields.push({ slug: job.field.slug });
+                collectionFieldsMap.set(slugLower, fields);
             }
         }
     }
-    // Summary
-    return `# Schema Sync Complete
+    // ============ Build Summary ============
+    const hasFailures = failed.collections > 0 || failed.fields > 0;
+    let output = `# Schema Sync ${hasFailures ? 'Completed with Errors' : 'Complete'}
 
 **Project ID:** \`${tenantId}\`
 
 ## Summary
-- Collections created: ${created.collections}
-- Fields created: ${created.fields}
-- Collections skipped (already exist): ${skipped.collections}
-- Fields skipped (already exist): ${skipped.fields}
 
-## Details
+| Metric | Created | Skipped | Failed |
+|--------|---------|---------|--------|
+| Collections | ${created.collections} | ${skipped.collections} | ${failed.collections} |
+| Fields | ${created.fields} | ${skipped.fields} | ${failed.fields} |
 
-${results.join('\n')}
 `;
+    if (collectionResults.length > 1) {
+        output += `## Collections
+
+| Slug | Status | Details |
+|------|--------|---------|
+${collectionResults.slice(1).join('\n')}
+
+`;
+    }
+    if (fieldResults.length > 0) {
+        output += `## Fields
+
+${fieldResults.join('\n')}
+
+`;
+    }
+    if (hasFailures) {
+        output += `---
+
+## ACTION REQUIRED
+
+Some items failed to create. Please review the errors above and:
+1. Fix any issues with field types or parameters
+2. Run sync_schema again - it will skip already-created items and retry failed ones
+`;
+    }
+    return output;
 }

package/dist/tools/validate-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-template.d.ts","sourceRoot":"","sources":["../../src/tools/validate-template.ts"],"names":[],"mappings":"AAMA,KAAK,YAAY,GAAG,cAAc,GAAG,eAAe,GAAG,aAAa,CAAC;AAgRrE;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAqbjB"}
+{"version":3,"file":"validate-template.d.ts","sourceRoot":"","sources":["../../src/tools/validate-template.ts"],"names":[],"mappings":"AAMA,KAAK,YAAY,GAAG,cAAc,GAAG,eAAe,GAAG,aAAa,CAAC;AAgRrE;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAobjB"}

package/dist/tools/validate-template.js

@@ -511,7 +511,6 @@ Use the \`sync_schema\` tool to create the missing fields before deploying. This
   "fieldsToAdd": [
     {
       "collectionSlug": "${targetCollection}",
-      "isBuiltin": false,
       "fields": [
 ${missingFields.map(f => `        { "slug": "${f}", "name": "${f.charAt(0).toUpperCase() + f.slice(1).replace(/([A-Z])/g, ' $1').trim()}", "type": "YOUR_TYPE" }`).join(',\n')}
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multisite-cms-mcp",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "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": {