mlgym-deploy 3.3.2 → 3.3.6

package/index.js

@@ -18,7 +18,7 @@ import crypto from 'crypto';
 const execAsync = promisify(exec);
 
 // Current version of this MCP server - INCREMENT FOR WORKFLOW FIXES
-const CURRENT_VERSION = '3.3.2';  // Fixed fs.existsSync bug by importing fsSync for synchronous file operations
+const CURRENT_VERSION = '3.3.6';  // Added mlgym_deploy_logs to package.json tools list for proper MCP registration
 const PACKAGE_NAME = 'mlgym-deploy';
 
 // Debug logging configuration - ENABLED BY DEFAULT
@@ -986,8 +986,8 @@ async function detectDeploymentStrategy(projectPath) {
 
   // Case 2: Only docker-compose
   if (!hasDockerfile && hasCompose) {
-    log.info('MCP >>> [detectDeploymentStrategy] Strategy: docker-compose (compose only)');
-    return { type: 'docker-compose', reason: 'docker-compose.yml only' };
+    log.info('MCP >>> [detectDeploymentStrategy] Strategy: dockercompose (compose only)');
+    return { type: 'dockercompose', reason: 'docker-compose.yml only' };
   }
 
   // Case 3: Both exist - analyze docker-compose to decide
@@ -1008,11 +1008,11 @@ async function detectDeploymentStrategy(projectPath) {
 
       // COMPLEX: Multiple services (web + database, etc.)
       // → MUST use docker-compose for orchestration
-      log.info('MCP >>> [detectDeploymentStrategy] Strategy: docker-compose (multi-service)');
-      return { type: 'docker-compose', reason: 'Application requires multiple services (web + database/cache/etc)' };
+      log.info('MCP >>> [detectDeploymentStrategy] Strategy: dockercompose (multi-service)');
+      return { type: 'dockercompose', reason: 'Application requires multiple services (web + database/cache/etc)' };
     } catch (err) {
-      log.error('MCP >>> [detectDeploymentStrategy] Analysis failed, defaulting to docker-compose:', err.message);
-      return { type: 'docker-compose', reason: 'Multiple deployment files found' };
+      log.error('MCP >>> [detectDeploymentStrategy] Analysis failed, defaulting to dockercompose:', err.message);
+      return { type: 'dockercompose', reason: 'Multiple deployment files found' };
     }
   }
 
@@ -1296,8 +1296,8 @@ async function initProject(args) {
     projectData.hostname = hostname;
     projectData.local_path = local_path;
 
-    // Read docker-compose content if using docker-compose strategy (v3.2.1+)
-    if (strategy.type === 'docker-compose') {
+    // Read docker-compose content if using dockercompose strategy (v3.2.1+)
+    if (strategy.type === 'dockercompose') {
       const composeFiles = ['docker-compose.yml', 'docker-compose.yaml'];
       let composeContent = null;
 
@@ -1364,6 +1364,10 @@ async function initProject(args) {
     console.error('⚠️  Warning: Failed to add administrator as member:', memberErr.message);
   }
 
+  // Wait for GitLab project to be fully created and accessible
+  console.error('Waiting for GitLab project creation to complete (20 seconds)...');
+  await new Promise(resolve => setTimeout(resolve, 20000));
+
   // Initialize local git repository if needed
   const absolutePath = path.resolve(local_path);
   try {
@@ -1402,9 +1406,9 @@ async function initProject(args) {
         console.error('Note: ssh-agent not available, relying on SSH config');
       }
 
-      // Wait for GitLab SSH key propagation (10 seconds)
-      console.error('Waiting for GitLab SSH key propagation (10 seconds)...');
-      await new Promise(resolve => setTimeout(resolve, 10000));
+      // Wait for GitLab SSH key propagation (20 seconds)
+      console.error('Waiting for GitLab SSH key propagation (30 seconds)...');
+      await new Promise(resolve => setTimeout(resolve, 30000));
 
       // Test SSH connectivity
       console.error('Testing SSH connection to GitLab...');
@@ -1473,7 +1477,11 @@ async function initProject(args) {
     log.debug('MCP >>> [initProject] Git remote URL:', gitUrl);
     gitSteps.push('Pushing to GitLab to trigger deployment');
     console.error('Executing: git push -u mlgym main');
-    await execAsync('git push -u mlgym main', { cwd: absolutePath });
+    const authInfo = await loadAuth();
+    const sanitizedEmail = authInfo.email.replace('@', '_at_').replace(/[^a-zA-Z0-9_-]/g, '_');
+    const sshKeyPath = path.join(os.homedir(), '.ssh', `mlgym_${sanitizedEmail}`);
+    const gitSshCmd = `ssh -i "${sshKeyPath}"`;
+    await execAsync('git push -u mlgym main', { cwd: absolutePath, env: { ...process.env, GIT_SSH_COMMAND: gitSshCmd } });
     gitSteps.push('✅ Successfully pushed to GitLab');
     pushSucceeded = true;
     log.success('MCP >>> [initProject] ✅ Git push completed successfully!');
@@ -1497,7 +1505,7 @@ async function initProject(args) {
     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);
+      const statusResult = await apiRequest('GET', `/api/v1/projects/${project.id}/deployments`, null, true);
       if (statusResult.success && statusResult.data) {
         const status = statusResult.data.status;
         console.error(`Deployment status: ${status}`);
@@ -2012,7 +2020,7 @@ async function deployProject(args) {
     log.info('MCP >>> STEP 4.5: Validating deployment configuration...');
     const strategy = detectDeploymentStrategy(local_path);
 
-    if (strategy.type === 'docker-compose') {
+    if (strategy.type === 'dockercompose') {
       const composePath = path.join(local_path, 'docker-compose.yml');
       const composePathYAML = path.join(local_path, 'docker-compose.yaml');
       const actualPath = fsSync.existsSync(composePath) ? composePath : composePathYAML;
@@ -2224,27 +2232,30 @@ async function getDeploymentLogs(args) {
     }
 
     log.info(`MCP >>> [getDeploymentLogs] Detected project name: ${projectName}`);
+    // Get Coolify app UUID directly from User Agent by name
+    const userAgentURL = 'http://coolify.eu.ezb.net:9000';
+    const appLookupEndpoint = `${userAgentURL}/applications/by-name/${projectName}`;
+    
+    log.info(`MCP >>> [getDeploymentLogs] Looking up application by name`);
 
-    // Get project details from backend to get Coolify app UUID
-    const projectsResult = await apiRequest('GET', '/api/v1/projects', null, true);
-    if (!projectsResult.success) {
-      throw new Error(`Failed to get projects: ${projectsResult.error}`);
-    }
-
-    const project = projectsResult.data.projects?.find(p => p.name === projectName);
-    if (!project) {
-      throw new Error(`Project "${projectName}" not found in your account`);
-    }
-
-    if (!project.coolify_app_uuid) {
-      throw new Error(`Project "${projectName}" does not have deployment enabled`);
+    let appUUID;
+    try {
+      const appResponse = await axios.get(appLookupEndpoint, {
+        headers: {
+          'Authorization': 'Bearer 1|Jkztb5qPptwRKgtocfbT2TLjp8WGJG1SkPE4DzLt4c5d600f',
+          'Content-Type': 'application/json'
+        }
+      });
+      appUUID = appResponse.data.uuid;
+      log.info(`MCP >>> [getDeploymentLogs] Found Coolify app UUID: ${appUUID}`);
+    } catch (appError) {
+      if (appError.response?.status === 404) {
+        throw new Error(`Project "${projectName}" not found in Coolify. Make sure deployment is enabled.`);
+      }
+      throw new Error(`Failed to lookup application: ${appError.message}`);
     }
 
-    const appUUID = project.coolify_app_uuid;
-    log.info(`MCP >>> [getDeploymentLogs] Found Coolify app UUID: ${appUUID}`);
-
     // Call User Agent API to get deployment logs
-    const userAgentURL = 'http://coolify.eu.ezb.net:9000';
     const endpoint = `${userAgentURL}/applications/${appUUID}/deployment-logs?depth=${depth}`;
 
     log.info(`MCP >>> [getDeploymentLogs] Calling User Agent: ${endpoint}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlgym-deploy",
-  "version": "3.3.2",
+  "version": "3.3.6",
   "description": "MCP server for MLGym - Complete deployment management: deploy, configure, monitor, and rollback applications",
   "main": "index.js",
   "type": "module",
@@ -52,6 +52,10 @@
         "name": "mlgym_set_env_vars",
         "description": "Set environment variables for an application (DATABASE_URL, API keys, etc.)"
       },
+      {
+        "name": "mlgym_deploy_logs",
+        "description": "View deployment history and logs for a project"
+      },
       {
         "name": "mlgym_set_health_check",
         "description": "Configure health checks to monitor application availability"
@@ -83,6 +87,3 @@
     ]
   }
 }
- 
- 
-