@magpiecloud/mags 1.2.0 → 1.3.0

package/bin/mags.js

@@ -5,12 +5,14 @@ const http = require('http');
 const { URL } = require('url');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const readline = require('readline');
 const { exec, spawn } = require('child_process');
 
 // Config file path
 const CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE, '.mags');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
+const SSH_KEY_FILE = path.join(CONFIG_DIR, 'ssh_key');
 
 // Load saved config
 function loadConfig() {
@@ -133,6 +135,35 @@ function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+// Resolve job ID from name or ID
+async function resolveJobId(nameOrId) {
+  // If it looks like a UUID, use it directly
+  if (nameOrId.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i)) {
+    return nameOrId;
+  }
+
+  // Otherwise, search by name/workspace
+  const resp = await request('GET', `/api/v1/mags-jobs?page=1&page_size=50`);
+  if (resp.jobs && resp.jobs.length > 0) {
+    // Try exact match on name first
+    let job = resp.jobs.find(j => j.name === nameOrId);
+    if (job) return job.request_id;
+
+    // Try workspace_id match
+    job = resp.jobs.find(j => j.workspace_id === nameOrId);
+    if (job) return job.request_id;
+
+    // Try partial name match (running/sleeping jobs only)
+    job = resp.jobs.find(j =>
+      (j.status === 'running' || j.status === 'sleeping') &&
+      (j.name && j.name.includes(nameOrId))
+    );
+    if (job) return job.request_id;
+  }
+
+  return nameOrId; // Return as-is, let API handle error
+}
+
 function usage() {
   console.log(`
 ${colors.cyan}${colors.bold}Mags CLI - Instant VM Execution${colors.reset}
@@ -143,16 +174,18 @@ ${colors.bold}Commands:${colors.reset}
   login                           Authenticate with Magpie
   logout                          Remove saved credentials
   whoami                          Show current authenticated user
+  new <name>                      Create a new persistent VM (returns ID only)
   run [options] <script>          Execute a script on a microVM
-  ssh <job-id>                    Open SSH session to a running VM
-  status <job-id>                 Get job status
-  logs <job-id>                   Get job logs
+  ssh <name|id>                   Open SSH session to a running VM
+  status <name|id>                Get job status
+  logs <name|id>                  Get job logs
   list                            List recent jobs
-  url <job-id> [port]             Enable URL access for a job
-  stop <job-id>                   Stop a running job
+  url <name|id> [port]            Enable URL access for a job
+  stop <name|id>                  Stop a running job
 
 ${colors.bold}Run Options:${colors.reset}
   -w, --workspace <id>            Use persistent workspace (S3 sync)
+  -n, --name <name>               Set job name (for easier reference)
   -p, --persistent                Keep VM alive after script completes
   --url                           Enable public URL access (requires -p)
   --port <port>                   Port to expose for URL (default: 8080)
@@ -160,14 +193,15 @@ ${colors.bold}Run Options:${colors.reset}
 
 ${colors.bold}Examples:${colors.reset}
   mags login
+  mags new myvm                     # Create VM, get ID
+  mags ssh myvm                     # SSH by name
   mags run 'echo Hello World'
   mags run -w myproject 'python3 script.py'
   mags run -p --url 'python3 -m http.server 8080'
-  mags run -w webapp -p --url --port 3000 'npm start'
-  mags ssh abc123                   # SSH into a running VM
-  mags status abc123
-  mags logs abc123
-  mags url abc123 8080
+  mags run -n webapp -w webapp -p --url --port 3000 'npm start'
+  mags status myvm
+  mags logs myvm
+  mags url myvm 8080
 `);
   process.exit(1);
 }
@@ -182,7 +216,7 @@ To authenticate, you need an API token from Magpie.
   log('blue', 'Opening Magpie dashboard to create an API token...');
   console.log('');
 
-  const tokenUrl = 'https://magpiecloud.com/api-keys';
+  const tokenUrl = 'https://api.magpiecloud.com/api-keys';
   openBrowser(tokenUrl);
 
   await sleep(1000);
@@ -222,7 +256,8 @@ To authenticate, you need an API token from Magpie.
       log('gray', `Token saved to ${CONFIG_FILE}`);
       console.log('');
       log('cyan', 'You can now run mags commands. Try:');
-      console.log(`  ${colors.bold}mags run 'echo Hello World'${colors.reset}`);
+      console.log(`  ${colors.bold}mags new myvm${colors.reset}`);
+      console.log(`  ${colors.bold}mags ssh myvm${colors.reset}`);
     } else {
       log('yellow', 'Login successful, but could not save token to config file.');
       log('yellow', 'You may need to login again next time.');
@@ -299,9 +334,59 @@ To use Mags, you need to authenticate first.
   return true;
 }
 
+// Create a new persistent VM
+async function newVM(name) {
+  if (!name) {
+    log('red', 'Error: Name required');
+    console.log(`\nUsage: mags new <name>\n`);
+    process.exit(1);
+  }
+
+  const payload = {
+    script: 'sleep infinity',
+    type: 'inline',
+    persistent: true,
+    name: name,
+    workspace_id: name,
+    startup_command: 'sleep infinity'
+  };
+
+  const response = await request('POST', '/api/v1/mags-jobs', payload);
+
+  if (!response.request_id) {
+    log('red', 'Failed to create VM:');
+    console.log(JSON.stringify(response, null, 2));
+    process.exit(1);
+  }
+
+  // Wait for VM to be ready
+  const maxAttempts = 60;
+  let attempt = 0;
+
+  while (attempt < maxAttempts) {
+    const status = await request('GET', `/api/v1/mags-jobs/${response.request_id}/status`);
+
+    if (status.status === 'running') {
+      // Just output the ID
+      console.log(response.request_id);
+      return;
+    } else if (status.status === 'error') {
+      log('red', `VM creation failed: ${status.error_message || 'Unknown error'}`);
+      process.exit(1);
+    }
+
+    await sleep(500);
+    attempt++;
+  }
+
+  log('yellow', 'VM creation timed out, but may still be starting');
+  console.log(response.request_id);
+}
+
 async function runJob(args) {
   let script = '';
   let workspace = '';
+  let name = '';
   let persistent = false;
   let enableUrl = false;
   let port = 8080;
@@ -314,6 +399,10 @@ async function runJob(args) {
       case '--workspace':
         workspace = args[++i];
         break;
+      case '-n':
+      case '--name':
+        name = args[++i];
+        break;
       case '-p':
       case '--persistent':
         persistent = true;
@@ -346,6 +435,7 @@ async function runJob(args) {
     persistent
   };
   if (workspace) payload.workspace_id = workspace;
+  if (name) payload.name = name;
   if (startupCommand) payload.startup_command = startupCommand;
 
   const response = await request('POST', '/api/v1/mags-jobs', payload);
@@ -358,6 +448,7 @@ async function runJob(args) {
 
   const requestId = response.request_id;
   log('green', `Job submitted: ${requestId}`);
+  if (name) log('blue', `Name: ${name}`);
   if (workspace) log('blue', `Workspace: ${workspace}`);
   if (persistent) log('yellow', 'Persistent: VM will stay alive');
 
@@ -382,9 +473,6 @@ async function runJob(args) {
         } else {
           log('yellow', 'Warning: Could not enable URL access');
         }
-      } else if (status.subdomain) {
-        log('cyan', `Subdomain: ${status.subdomain}`);
-        log('cyan', `To enable URL: mags url ${requestId} ${port}`);
       }
       return;
     } else if (status.status === 'error') {
@@ -410,12 +498,13 @@ async function runJob(args) {
   }
 }
 
-async function enableUrlAccess(requestId, port = 8080) {
-  if (!requestId) {
-    log('red', 'Error: Job ID required');
+async function enableUrlAccess(nameOrId, port = 8080) {
+  if (!nameOrId) {
+    log('red', 'Error: Job name or ID required');
     usage();
   }
 
+  const requestId = await resolveJobId(nameOrId);
   log('blue', `Enabling URL access on port ${port}...`);
 
   const accessResp = await request('POST', `/api/v1/mags-jobs/${requestId}/access`, { port });
@@ -434,20 +523,22 @@ async function enableUrlAccess(requestId, port = 8080) {
   }
 }
 
-async function getStatus(requestId) {
-  if (!requestId) {
-    log('red', 'Error: Job ID required');
+async function getStatus(nameOrId) {
+  if (!nameOrId) {
+    log('red', 'Error: Job name or ID required');
     usage();
   }
+  const requestId = await resolveJobId(nameOrId);
   const status = await request('GET', `/api/v1/mags-jobs/${requestId}/status`);
   console.log(JSON.stringify(status, null, 2));
 }
 
-async function getLogs(requestId) {
-  if (!requestId) {
-    log('red', 'Error: Job ID required');
+async function getLogs(nameOrId) {
+  if (!nameOrId) {
+    log('red', 'Error: Job name or ID required');
     usage();
   }
+  const requestId = await resolveJobId(nameOrId);
   const logsResp = await request('GET', `/api/v1/mags-jobs/${requestId}/logs`);
   if (logsResp.logs) {
     logsResp.logs.forEach(l => {
@@ -479,11 +570,12 @@ async function listJobs() {
   }
 }
 
-async function stopJob(requestId) {
-  if (!requestId) {
-    log('red', 'Error: Job ID required');
+async function stopJob(nameOrId) {
+  if (!nameOrId) {
+    log('red', 'Error: Job name or ID required');
     usage();
   }
+  const requestId = await resolveJobId(nameOrId);
   log('blue', `Stopping job ${requestId}...`);
   const resp = await request('POST', `/api/v1/mags-jobs/${requestId}/stop`);
   if (resp.success) {
@@ -494,14 +586,21 @@ async function stopJob(requestId) {
   }
 }
 
-async function sshToJob(requestId) {
-  if (!requestId) {
-    log('red', 'Error: Job ID required');
-    console.log(`\nUsage: mags ssh <job-id>\n`);
-    console.log('Get job IDs with: mags list');
+async function sshToJob(nameOrId) {
+  if (!nameOrId) {
+    log('red', 'Error: Job name or ID required');
+    console.log(`\nUsage: mags ssh <name|id>\n`);
+    console.log('Examples:');
+    console.log('  mags ssh myvm');
+    console.log('  mags ssh 7bd12031-25ff-497f-b753-7ae73ce10317');
+    console.log('');
+    console.log('Get job names/IDs with: mags list');
     process.exit(1);
   }
 
+  // Resolve name to ID
+  const requestId = await resolveJobId(nameOrId);
+
   // First check job status
   log('blue', 'Checking job status...');
   const status = await request('GET', `/api/v1/mags-jobs/${requestId}/status`);
@@ -531,6 +630,7 @@ async function sshToJob(requestId) {
 
   const sshHost = accessResp.ssh_host;
   const sshPort = accessResp.ssh_port;
+  const sshKey = accessResp.ssh_private_key;
 
   if (!sshHost || !sshPort) {
     log('red', 'SSH access enabled but no connection details returned');
@@ -541,20 +641,32 @@ async function sshToJob(requestId) {
   log('green', `Connecting to ${sshHost}:${sshPort}...`);
   console.log(`${colors.gray}(Use Ctrl+D or 'exit' to disconnect)${colors.reset}\n`);
 
-  // Spawn SSH process
+  // Build SSH arguments
   const sshArgs = [
     '-o', 'StrictHostKeyChecking=no',
     '-o', 'UserKnownHostsFile=/dev/null',
     '-o', 'LogLevel=ERROR',
-    '-p', sshPort.toString(),
-    `root@${sshHost}`
+    '-p', sshPort.toString()
   ];
 
+  // If API returned an SSH key, write it to a temp file and use it
+  let keyFile = null;
+  if (sshKey) {
+    keyFile = path.join(os.tmpdir(), `mags_ssh_${Date.now()}`);
+    fs.writeFileSync(keyFile, sshKey, { mode: 0o600 });
+    sshArgs.push('-i', keyFile);
+  }
+
+  sshArgs.push(`root@${sshHost}`);
+
   const ssh = spawn('ssh', sshArgs, {
     stdio: 'inherit'  // Inherit stdin/stdout/stderr for interactive session
   });
 
   ssh.on('error', (err) => {
+    if (keyFile) {
+      try { fs.unlinkSync(keyFile); } catch (e) {}
+    }
     if (err.code === 'ENOENT') {
       log('red', 'SSH client not found. Please install OpenSSH.');
       log('gray', 'On macOS/Linux: ssh is usually pre-installed');
@@ -566,6 +678,10 @@ async function sshToJob(requestId) {
   });
 
   ssh.on('close', (code) => {
+    // Clean up temp key file
+    if (keyFile) {
+      try { fs.unlinkSync(keyFile); } catch (e) {}
+    }
     if (code === 0) {
       log('green', '\nSSH session ended');
     } else {
@@ -599,9 +715,13 @@ async function main() {
         break;
       case '--version':
       case '-v':
-        console.log('mags v1.2.0');
+        console.log('mags v1.3.0');
         process.exit(0);
         break;
+      case 'new':
+        await requireAuth();
+        await newVM(args[1]);
+        break;
       case 'run':
         await requireAuth();
         await runJob(args.slice(1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpiecloud/mags",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Mags CLI - Execute scripts on Magpie's instant VM infrastructure",
   "main": "index.js",
   "bin": {