mlgym-deploy 3.3.31 → 3.3.34

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.30';  // Add warnings for slow-starting services (Cassandra, MongoDB, etc)
+const CURRENT_VERSION = '3.3.34';  // Fix duplicate project creation + SSH key config always updates for current user
 const PACKAGE_NAME = 'mlgym-deploy';
 
 // Debug logging configuration - ENABLED BY DEFAULT
@@ -205,33 +205,40 @@ async function generateSSHKeyPair(email) {
   const sanitizedEmail = email.replace('@', '_at_').replace(/[^a-zA-Z0-9_-]/g, '_');
   const keyPath = path.join(sshDir, `mlgym_${sanitizedEmail}`);
 
+  let keyExists = false;
+  let publicKey = '';
+
   try {
     await fs.access(keyPath);
     console.error(`SSH key already exists at ${keyPath}, using existing key`);
-    const publicKey = await fs.readFile(`${keyPath}.pub`, 'utf8');
-    return { publicKey: publicKey.trim(), privateKeyPath: keyPath };
+    publicKey = await fs.readFile(`${keyPath}.pub`, 'utf8');
+    keyExists = true;
   } catch {
     // Key doesn't exist, generate new one
+    console.error(`Generating new SSH key for ${email}...`);
   }
 
-  const { stdout, stderr } = await execAsync(
-    `ssh-keygen -t ed25519 -f "${keyPath}" -N "" -C "${email}"`,
-    { timeout: 10000 }
-  );
+  if (!keyExists) {
+    const { stdout, stderr } = await execAsync(
+      `ssh-keygen -t ed25519 -f "${keyPath}" -N "" -C "${email}"`,
+      { timeout: 10000 }
+    );
 
-  if (stderr && !stderr.includes('Generating public/private')) {
-    throw new Error(`SSH key generation failed: ${stderr}`);
-  }
+    if (stderr && !stderr.includes('Generating public/private')) {
+      throw new Error(`SSH key generation failed: ${stderr}`);
+    }
 
-  await execAsync(`chmod 600 "${keyPath}"`);
-  await execAsync(`chmod 644 "${keyPath}.pub"`);
+    await execAsync(`chmod 600 "${keyPath}"`);
+    await execAsync(`chmod 644 "${keyPath}.pub"`);
 
-  const publicKey = await fs.readFile(`${keyPath}.pub`, 'utf8');
+    publicKey = await fs.readFile(`${keyPath}.pub`, 'utf8');
+  }
 
-  // Add to SSH config
+  // FIX: ALWAYS update SSH config to point to THIS user's key
+  // This prevents the bug where User A's key remains in config after User B authenticates
   const configPath = path.join(sshDir, 'config');
   const configEntry = `
-# MLGym GitLab (added by mlgym-deploy)
+# MLGym GitLab (added by mlgym-deploy for ${email})
 Host git.mlgym.io
     User git
     Port 22
@@ -241,18 +248,16 @@ Host git.mlgym.io
 
   try {
     const existingConfig = await fs.readFile(configPath, 'utf8');
-    if (existingConfig.includes('Host git.mlgym.io')) {
-      // Replace existing MLGym SSH config block with new key
-      const updatedConfig = existingConfig.replace(
-        /# MLGym GitLab.*?Host git\.mlgym\.io.*?(?=\n#|\n\nHost|\n?$)/gs,
-        ''
-      ).trim();
-      await fs.writeFile(configPath, updatedConfig + configEntry, { mode: 0o600 });
-    } else {
-      await fs.appendFile(configPath, configEntry);
-    }
+    // Always remove old MLGym config and add new one for current user
+    const updatedConfig = existingConfig.replace(
+      /\n?# MLGym GitLab[^\n]*\nHost git\.mlgym\.io\n(?:[ \t]+[^\n]+\n)*/g,
+      ''
+    ).trim();
+    await fs.writeFile(configPath, updatedConfig + '\n' + configEntry, { mode: 0o600 });
+    console.error(`SSH config updated to use key for ${email}`);
   } catch {
     await fs.writeFile(configPath, configEntry, { mode: 0o600 });
+    console.error(`SSH config created for ${email}`);
   }
 
   return { publicKey: publicKey.trim(), privateKeyPath: keyPath };
@@ -1660,7 +1665,7 @@ async function initProject(args) {
           status: 'error',
           message: 'Hostname is required when deployment is enabled',
           required_fields: {
-            hostname: '✗ missing - will be used as subdomain (e.g., "myapp" for myapp.ezb.net)'
+            hostname: '✗ missing - project identifier (actual URL will be https://{app_id}.eu{1,2,3}.ezb.net)'
           }
         }, null, 2)
       }]
@@ -1683,6 +1688,43 @@ async function initProject(args) {
 
   console.error(`Creating project: ${name}`);
 
+  // FIX: Check if project already exists on backend before creating (prevents duplicates)
+  // This is critical to prevent race conditions where multiple concurrent requests
+  // could create duplicate projects
+  log.info(`MCP >>> [initProject] Checking if project '${name}' already exists on backend...`);
+  const existingProjectsResult = await apiRequest('GET', '/api/v1/projects', null, true);
+  if (existingProjectsResult.success && Array.isArray(existingProjectsResult.data)) {
+    // Check if any existing project name ends with our project name (user prefix is added by backend)
+    const existingProject = existingProjectsResult.data.find(p =>
+      p.name && (p.name === name || p.name.endsWith(`-${name}`))
+    );
+    if (existingProject) {
+      log.warning(`MCP >>> [initProject] Project '${name}' already exists (found: ${existingProject.name})`);
+      return {
+        content: [{
+          type: 'text',
+          text: JSON.stringify({
+            status: 'already_exists',
+            message: `Project '${name}' already exists on the server`,
+            existing_project: {
+              id: existingProject.id,
+              name: existingProject.name,
+              ssh_url: existingProject.ssh_url_to_repo,
+              web_url: existingProject.web_url,
+              deployment_url: existingProject.deployment_url
+            },
+            next_steps: [
+              'Use the existing project instead of creating a new one',
+              'To update: git push mlgym main',
+              'To check status: use mlgym_status tool'
+            ]
+          }, null, 2)
+        }]
+      };
+    }
+  }
+  log.success(`MCP >>> [initProject] No existing project found, proceeding with creation`);
+
   // Create project via backend API with FLAT structure (matching CLI)
   const projectData = {
     name: name,
@@ -3699,7 +3741,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             },
             hostname: {
               type: 'string',
-              description: 'Deployment hostname/subdomain (optional, defaults to project_name). Will be accessible at https://<hostname>.ezb.net',
+              description: 'Custom hostname (optional). The actual deployment URL will be https://{app_id}.eu{1,2,3}.ezb.net based on the assigned server.',
               pattern: '^[a-z][a-z0-9-]*[a-z0-9]$',
               minLength: 3,
               maxLength: 63

package/package.json

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