mlgym-deploy 2.7.1 → 2.8.0

package/index.js

@@ -17,7 +17,7 @@ import crypto from 'crypto';
 const execAsync = promisify(exec);
 
 // Current version of this MCP server - INCREMENT FOR WORKFLOW FIXES
-const CURRENT_VERSION = '2.7.1';
+const CURRENT_VERSION = '2.8.0';  // Fixed to match CLI workflow: nested API payload, git push, deployment monitoring
 const PACKAGE_NAME = 'mlgym-deploy';
 
 // Version check state
@@ -945,11 +945,10 @@ async function initProject(args) {
 
   console.error(`Creating project: ${name}`);
 
-  // Create project via backend API
+  // Create project via backend API with CORRECT nested structure (matching CLI)
   const projectData = {
     name: name,
-    description: description,
-    enable_deployment: enable_deployment
+    description: description
   };
 
   if (enable_deployment) {
@@ -959,11 +958,13 @@ async function initProject(args) {
       byte => byte.toString(16).padStart(2, '0')
     ).join('');
 
-    projectData.webhook_secret = webhookSecret;
-
-    if (hostname) {
-      projectData.hostname = hostname;
-    }
+    // Use nested deployment_info structure like CLI does
+    projectData.deployment_info = {
+      type: 'dockerfile',
+      enabled: true,
+      webhook_secret: webhookSecret,
+      hostname: hostname
+    };
   }
 
   const result = await apiRequest('POST', '/api/v1/projects', projectData, true);
@@ -1002,12 +1003,92 @@ async function initProject(args) {
 
   await execAsync(`git remote add mlgym ${gitUrl}`, { cwd: absolutePath });
 
+  // Create initial commit and push (like CLI does)
+  const gitSteps = [];
+
+  try {
+    // Check if there are any files to commit
+    const { stdout: statusOutput } = await execAsync('git status --porcelain', { cwd: absolutePath });
+
+    if (statusOutput.trim()) {
+      // There are uncommitted changes
+      gitSteps.push('Adding files to git');
+      await execAsync('git add .', { cwd: absolutePath });
+
+      gitSteps.push('Creating initial commit');
+      await execAsync('git commit -m "Initial MLGym deployment"', { cwd: absolutePath });
+    } else {
+      // Check if there are any commits at all
+      try {
+        await execAsync('git rev-parse HEAD', { cwd: absolutePath });
+        gitSteps.push('Repository already has commits');
+      } catch {
+        // No commits yet, create an initial one
+        gitSteps.push('Creating README for initial commit');
+        const readmePath = path.join(absolutePath, 'README.md');
+        if (!await fs.access(readmePath).then(() => true).catch(() => false)) {
+          await fs.writeFile(readmePath, `# ${name}\n\n${description}\n\nDeployed with MLGym\n`);
+        }
+        await execAsync('git add .', { cwd: absolutePath });
+        await execAsync('git commit -m "Initial MLGym deployment"', { cwd: absolutePath });
+      }
+    }
+
+    // Push to trigger webhook and deployment
+    gitSteps.push('Pushing to GitLab to trigger deployment');
+    await execAsync('git push -u mlgym main', { cwd: absolutePath });
+
+  } catch (pushError) {
+    console.error('Git operations warning:', pushError.message);
+    gitSteps.push(`Warning: ${pushError.message}`);
+  }
+
+  // Monitor deployment if enabled (like CLI does)
+  let deploymentStatus = null;
+  if (enable_deployment) {
+    console.error('Monitoring deployment status...');
+
+    // Poll for deployment status (up to 60 seconds)
+    for (let i = 0; i < 12; i++) {
+      await new Promise(resolve => setTimeout(resolve, 5000)); // Wait 5 seconds
+
+      const statusResult = await apiRequest('GET', `/api/v1/projects/${project.id}/deployment`, null, true);
+      if (statusResult.success && statusResult.data) {
+        const status = statusResult.data.status;
+        console.error(`Deployment status: ${status}`);
+
+        if (status === 'deployed' || status === 'running') {
+          deploymentStatus = {
+            status: 'deployed',
+            url: statusResult.data.url || `https://${hostname}.ezb.net`,
+            message: 'Application successfully deployed'
+          };
+          break;
+        } else if (status === 'failed') {
+          deploymentStatus = {
+            status: 'failed',
+            message: 'Deployment failed. Check Coolify logs for details.'
+          };
+          break;
+        }
+      }
+    }
+
+    if (!deploymentStatus) {
+      deploymentStatus = {
+        status: 'pending',
+        message: 'Deployment is still in progress. Check status later.',
+        expected_url: `https://${hostname}.ezb.net`
+      };
+    }
+  }
+
   return {
     content: [{
       type: 'text',
       text: JSON.stringify({
         status: 'success',
-        message: 'Project created successfully',
+        message: 'Project created and pushed successfully',
         project: {
           id: project.id,
           name: project.name,
@@ -1016,12 +1097,14 @@ async function initProject(args) {
           deployment_enabled: enable_deployment,
           deployment_url: hostname ? `https://${hostname}.ezb.net` : null
         },
-        next_steps: [
-          'Add your code files',
-          'git add .',
-          `git commit -m "Initial commit"`,
-          'git push mlgym main',
-          enable_deployment ? 'Your app will be automatically deployed after push' : null
+        git_operations: gitSteps,
+        deployment: deploymentStatus,
+        next_steps: enable_deployment && deploymentStatus?.status === 'deployed' ? [
+          `✅ Your application is live at: ${deploymentStatus.url}`,
+          'Future updates: git push mlgym main'
+        ] : [
+          'To update: git push mlgym main',
+          enable_deployment ? 'Deployment will trigger automatically' : null
         ].filter(Boolean)
       }, null, 2)
     }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlgym-deploy",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "MCP server for GitLab Backend - User creation and project deployment",
   "main": "index.js",
   "type": "module",