mlgym-deploy 3.0.0 → 3.0.2

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 = '3.0.0';  // Monolithic workflow: reduced AI complexity, server-side orchestration
+const CURRENT_VERSION = '3.0.2';  // Fixed SSH key propagation delay before git push
 const PACKAGE_NAME = 'mlgym-deploy';
 
 // Version check state
@@ -999,6 +999,46 @@ async function initProject(args) {
 
   await execAsync(`git remote add mlgym ${gitUrl}`, { cwd: absolutePath });
 
+  // Ensure SSH key is ready for git push
+  const authInfo = await loadAuth();
+  if (authInfo.email) {
+    const sanitizedEmail = authInfo.email.replace('@', '_at_').replace(/[^a-zA-Z0-9_-]/g, '_');
+    const sshKeyPath = path.join(os.homedir(), '.ssh', `mlgym_${sanitizedEmail}`);
+
+    try {
+      // Check if SSH key exists
+      await fs.access(sshKeyPath);
+
+      // Add SSH key to agent
+      console.error('Adding SSH key to ssh-agent...');
+      try {
+        await execAsync(`ssh-add "${sshKeyPath}" 2>/dev/null`);
+      } catch (agentErr) {
+        // ssh-agent might not be running, which is OK if SSH config is properly set
+        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));
+
+      // Test SSH connectivity
+      console.error('Testing SSH connection to GitLab...');
+      try {
+        await execAsync('ssh -T git@git.mlgym.io 2>&1', { timeout: 10000 });
+      } catch (sshTestErr) {
+        // SSH test may fail with "Welcome to GitLab" message which returns exit code 1
+        // This is actually success - we just need to verify the key works
+        const output = sshTestErr.stdout || sshTestErr.stderr || '';
+        if (!output.includes('Welcome') && !output.includes('successfully authenticated')) {
+          console.error('SSH connection test warning:', output);
+        }
+      }
+    } catch (keyErr) {
+      console.error('Warning: SSH key setup issue:', keyErr.message);
+    }
+  }
+
   // Create initial commit and push (like CLI does)
   const gitSteps = [];
 
@@ -1107,6 +1147,193 @@ async function initProject(args) {
   };
 }
 
+// ============================================================================
+// LEGACY USER MANAGEMENT TOOLS (DISABLED - kept for reference)
+// ============================================================================
+
+// Create User (from v2.3.0 - ENABLED)
+async function createUser(args) {
+  let { email, name, password, accept_terms } = args;
+
+  // Validate all required fields
+  if (!email || !name || !password || accept_terms !== true) {
+    return {
+      content: [{
+        type: 'text',
+        text: JSON.stringify({
+          status: 'error',
+          message: 'All fields are required: email, name, password, and accept_terms must be true',
+          required_fields: {
+            email: email ? '✓ provided' : '✗ missing',
+            name: name ? '✓ provided' : '✗ missing',
+            password: password ? '✓ provided' : '✗ missing',
+            accept_terms: accept_terms === true ? '✓ accepted' : '✗ must explicitly accept terms'
+          }
+        }, null, 2)
+      }]
+    };
+  }
+
+  console.error(`Creating user: ${email}`);
+
+  try {
+    // Generate SSH key pair
+    console.error('Generating SSH key pair...');
+    const { publicKey, privateKeyPath } = await generateSSHKeyPair(email);
+    const publicKeyPath = privateKeyPath + '.pub';
+    console.error(`SSH key generated: ${privateKeyPath}`);
+
+    // Create user via backend API with SSH key
+    const result = await apiRequest('POST', '/api/v1/users', {
+      email,
+      name,
+      password,
+      ssh_key: publicKey
+    }, false);
+
+    if (!result.success) {
+      return {
+        content: [{
+          type: 'text',
+          text: `Failed to create user: ${result.error}`
+        }]
+      };
+    }
+
+    // Save authentication token
+    if (result.data.token) {
+      await saveAuth(email, result.data.token);
+    }
+
+    const userData = result.data.user || {};
+    const sshKeyStatus = result.data.ssh_key_status || 'Unknown';
+    const sshKeyUploaded = sshKeyStatus === 'SSH key uploaded successfully';
+
+    const nextSteps = [
+      'Using your provided password',
+      `SSH key generated locally at: ${privateKeyPath}`
+    ];
+
+    if (sshKeyUploaded) {
+      nextSteps.push(`✅ SSH key uploaded to GitLab (ID: ${result.data.ssh_key_id || 'unknown'})`);
+      nextSteps.push(`Add to SSH agent: ssh-add "${privateKeyPath}"`);
+      nextSteps.push('You can now push code to GitLab repositories');
+    } else {
+      nextSteps.push(`⚠️ SSH key upload failed: ${sshKeyStatus}`);
+      nextSteps.push('You need to manually add the SSH key to GitLab:');
+      nextSteps.push(`cat ${publicKeyPath} # Copy this key`);
+      nextSteps.push('Then add it at: https://git.mlgym.io/-/user_settings/ssh_keys');
+    }
+
+    const response = {
+      user_id: userData.user_id || userData.UserID,
+      email: userData.email || email,
+      name: userData.name || name,
+      gitlab_username: userData.gitlab_username || userData.GitLabUsername,
+      ssh_key_path: privateKeyPath,
+      ssh_key_status: sshKeyStatus,
+      ssh_key_uploaded: sshKeyUploaded,
+      token: result.data.token,
+      message: result.data.message || 'User created successfully',
+      next_steps: nextSteps
+    };
+
+    return {
+      content: [{
+        type: 'text',
+        text: JSON.stringify(response, null, 2)
+      }]
+    };
+  } catch (error) {
+    return {
+      content: [{
+        type: 'text',
+        text: `Failed to create user: ${error.message}`
+      }]
+    };
+  }
+}
+
+// Login User (from v2.3.0 - ENABLED)
+async function loginUser(args) {
+  const { email, password } = args;
+
+  if (!email || !password) {
+    return {
+      content: [{
+        type: 'text',
+        text: JSON.stringify({
+          status: 'error',
+          message: 'Email and password are required'
+        }, null, 2)
+      }]
+    };
+  }
+
+  console.error(`Logging in user: ${email}`);
+
+  try {
+    const result = await apiRequest('POST', '/api/v1/auth/login', {
+      email,
+      password
+    }, false);
+
+    if (!result.success) {
+      return {
+        content: [{
+          type: 'text',
+          text: JSON.stringify({
+            status: 'error',
+            message: result.error || 'Login failed',
+            details: 'Invalid email or password'
+          }, null, 2)
+        }]
+      };
+    }
+
+    // Save authentication token
+    if (result.data.token) {
+      await saveAuth(email, result.data.token);
+    }
+
+    const userData = result.data.user || {};
+    const response = {
+      status: 'success',
+      token: result.data.token,
+      user: {
+        user_id: userData.user_id || userData.UserID,
+        email: userData.email || email,
+        name: userData.name || userData.Name,
+        gitlab_username: userData.gitlab_username || userData.GitLabUsername
+      },
+      expires_at: result.data.expires_at || new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString(),
+      message: 'Login successful',
+      next_steps: [
+        'You can now create and manage projects',
+        'Use mlgym_project_init or mlgym_deploy to create a new project',
+        'Token will expire in 24 hours'
+      ]
+    };
+
+    return {
+      content: [{
+        type: 'text',
+        text: JSON.stringify(response, null, 2)
+      }]
+    };
+  } catch (error) {
+    return {
+      content: [{
+        type: 'text',
+        text: JSON.stringify({
+          status: 'error',
+          message: `Login failed: ${error.message}`
+        }, null, 2)
+      }]
+    };
+  }
+}
+
 // ============================================================================
 // MONOLITHIC DEPLOYMENT WORKFLOW CLASS (v3.0.0)
 // ============================================================================
@@ -1533,6 +1760,56 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             }
           }
         }
+      },
+      // ========== LEGACY TOOLS (Re-enabled for specific use cases) ==========
+      {
+        name: 'mlgym_user_create',
+        description: 'Create a new MLGym user account. All fields required: email, name, password, and accept_terms=true.',
+        inputSchema: {
+          type: 'object',
+          properties: {
+            email: {
+              type: 'string',
+              description: 'User email address',
+              pattern: '^[^@]+@[^@]+\\.[^@]+$'
+            },
+            name: {
+              type: 'string',
+              description: 'User full name',
+              minLength: 2
+            },
+            password: {
+              type: 'string',
+              description: 'User password (minimum 8 characters)',
+              minLength: 8
+            },
+            accept_terms: {
+              type: 'boolean',
+              description: 'User must explicitly accept terms and conditions (must be true)'
+            }
+          },
+          required: ['email', 'name', 'password', 'accept_terms']
+        }
+      },
+      {
+        name: 'mlgym_auth_login',
+        description: 'Login with existing user credentials to get authentication token.',
+        inputSchema: {
+          type: 'object',
+          properties: {
+            email: {
+              type: 'string',
+              description: 'Email address',
+              pattern: '^[^@]+@[^@]+\\.[^@]+$'
+            },
+            password: {
+              type: 'string',
+              description: 'Password',
+              minLength: 8
+            }
+          },
+          required: ['email', 'password']
+        }
       }
     ]
   };
@@ -1552,8 +1829,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       case 'mlgym_status':
         return await getStatus(args);
 
+      case 'mlgym_user_create':
+        return await createUser(args);
+
+      case 'mlgym_auth_login':
+        return await loginUser(args);
+
       default:
-        throw new Error(`Unknown tool: ${name}. Available tools: mlgym_deploy, mlgym_status`);
+        throw new Error(`Unknown tool: ${name}. Available tools: mlgym_deploy, mlgym_status, mlgym_user_create, mlgym_auth_login`);
     }
   } catch (error) {
     console.error(`Tool execution failed:`, error);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mlgym-deploy",
-  "version": "3.0.0",
-  "description": "MCP server for MLGym - Monolithic deployment workflow with reduced AI complexity",
+  "version": "3.0.2",
+  "description": "MCP server for MLGym - Fixed SSH key propagation for git push operations",
   "main": "index.js",
   "type": "module",
   "bin": {
@@ -30,7 +30,7 @@
   },
   "mcp": {
     "name": "MLGym Deploy",
-    "description": "Deploy applications to MLGym with monolithic server-side workflows - just 2 tools",
+    "description": "Deploy applications to MLGym with monolithic workflows plus legacy user management",
     "tools": [
       {
         "name": "mlgym_deploy",
@@ -39,6 +39,14 @@
       {
         "name": "mlgym_status",
         "description": "Check authentication and project configuration status"
+      },
+      {
+        "name": "mlgym_user_create",
+        "description": "Create new MLGym user account with SSH key setup"
+      },
+      {
+        "name": "mlgym_auth_login",
+        "description": "Login with existing credentials"
       }
     ]
   }