mlgym-deploy 3.3.1 → 3.3.5

package/index.js

@@ -8,6 +8,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js';
 import axios from 'axios';
 import fs from 'fs/promises';
+import fsSync from 'fs';
 import path from 'path';
 import os from 'os';
 import { exec } from 'child_process';
@@ -17,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.1';  // Updated help with plain English examples showing what users say vs tool calls
+const CURRENT_VERSION = '3.3.5';  // Fixed mlgym_deploy_logs project lookup (data.projects → data) by importing fsSync for synchronous file operations
 const PACKAGE_NAME = 'mlgym-deploy';
 
 // Debug logging configuration - ENABLED BY DEFAULT
@@ -1302,9 +1303,9 @@ async function initProject(args) {
 
       for (const filename of composeFiles) {
         const composePath = path.join(local_path, filename);
-        if (fs.existsSync(composePath)) {
+        if (fsSync.existsSync(composePath)) {
           try {
-            composeContent = fs.readFileSync(composePath, 'utf8');
+            composeContent = fsSync.readFileSync(composePath, 'utf8');
             log.info(`MCP >>> [initProject] Read ${filename}: ${composeContent.length} bytes`);
             break;
           } catch (err) {
@@ -1363,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 {
@@ -1401,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...');
@@ -1472,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!');
@@ -1496,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}`);
@@ -2014,10 +2023,10 @@ async function deployProject(args) {
     if (strategy.type === 'docker-compose') {
       const composePath = path.join(local_path, 'docker-compose.yml');
       const composePathYAML = path.join(local_path, 'docker-compose.yaml');
-      const actualPath = fs.existsSync(composePath) ? composePath : composePathYAML;
+      const actualPath = fsSync.existsSync(composePath) ? composePath : composePathYAML;
 
-      if (fs.existsSync(actualPath)) {
-        const content = fs.readFileSync(actualPath, 'utf8');
+      if (fsSync.existsSync(actualPath)) {
+        const content = fsSync.readFileSync(actualPath, 'utf8');
         const validation = validateAndFixDockerCompose(content);
 
         if (!validation.isValid) {
@@ -2028,11 +2037,11 @@ async function deployProject(args) {
 
           // Auto-fix the issues
           log.info('MCP >>> Auto-fixing docker-compose.yml port mappings...');
-          fs.writeFileSync(actualPath, validation.fixedContent);
+          fsSync.writeFileSync(actualPath, validation.fixedContent);
 
           // Create backup
           const backupPath = actualPath + '.backup';
-          fs.writeFileSync(backupPath, content);
+          fsSync.writeFileSync(backupPath, content);
           log.info(`MCP >>> Created backup at ${backupPath}`);
 
           log.success('MCP >>> Fixed docker-compose.yml:');
@@ -2044,8 +2053,8 @@ async function deployProject(args) {
     } else if (strategy.type === 'dockerfile') {
       const dockerfilePath = path.join(local_path, 'Dockerfile');
 
-      if (fs.existsSync(dockerfilePath)) {
-        const content = fs.readFileSync(dockerfilePath, 'utf8');
+      if (fsSync.existsSync(dockerfilePath)) {
+        const content = fsSync.readFileSync(dockerfilePath, 'utf8');
         const validation = validateDockerfile(content);
 
         if (!validation.isValid) {
@@ -2073,8 +2082,8 @@ async function deployProject(args) {
             const fixedContent = lines.join('\n');
 
             // Create backup
-            fs.writeFileSync(dockerfilePath + '.backup', content);
-            fs.writeFileSync(dockerfilePath, fixedContent);
+            fsSync.writeFileSync(dockerfilePath + '.backup', content);
+            fsSync.writeFileSync(dockerfilePath, fixedContent);
 
             log.success('MCP >>> Fixed Dockerfile: added EXPOSE 80');
           }
@@ -2230,7 +2239,7 @@ async function getDeploymentLogs(args) {
       throw new Error(`Failed to get projects: ${projectsResult.error}`);
     }
 
-    const project = projectsResult.data.projects?.find(p => p.name === projectName);
+    const project = projectsResult.data?.find(p => p.name === projectName);
     if (!project) {
       throw new Error(`Project "${projectName}" not found in your account`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlgym-deploy",
-  "version": "3.3.1",
+  "version": "3.3.5",
   "description": "MCP server for MLGym - Complete deployment management: deploy, configure, monitor, and rollback applications",
   "main": "index.js",
   "type": "module",
@@ -83,6 +83,3 @@
     ]
   }
 }
- 
- 
-