@magpiecloud/mags 1.8.17 → 1.9.0

package/bin/mags.js

@@ -48,6 +48,21 @@ const config = loadConfig();
 const API_URL = process.env.MAGS_API_URL || config.api_url || 'https://api.magpiecloud.com';
 let API_TOKEN = process.env.MAGS_API_TOKEN || config.api_token || '';
 
+// V2 flag: --v2 switches API paths from /api/v1/ to /api/v2/
+let apiVersion = process.env.MAGS_API_VERSION || 'v1';
+{
+  const v2Index = process.argv.indexOf('--v2');
+  if (v2Index !== -1) {
+    apiVersion = 'v2';
+    process.argv.splice(v2Index, 1);
+  }
+}
+
+// Helper to build versioned API paths
+function apiPath(resource) {
+  return `/api/${apiVersion}/${resource}`;
+}
+
 // Colors
 const colors = {
   red: '\x1b[31m',
@@ -147,7 +162,7 @@ async function resolveJobId(nameOrId) {
   }
 
   // Otherwise, search by name/workspace
-  const resp = await request('GET', `/api/v1/mags-jobs?page=1&page_size=50`);
+  const resp = await request('GET', `${apiPath('mags-jobs')}?page=1&page_size=50`);
   if (resp.jobs && resp.jobs.length > 0) {
     // Try exact match on name first (prefer running/sleeping)
     let job = resp.jobs.find(j => j.name === nameOrId && (j.status === 'running' || j.status === 'sleeping'));
@@ -178,7 +193,7 @@ async function resolveJobId(nameOrId) {
 
 // Find a running or sleeping job for a workspace
 async function findWorkspaceJob(workspace) {
-  const resp = await request('GET', `/api/v1/mags-jobs?page=1&page_size=50`);
+  const resp = await request('GET', `${apiPath('mags-jobs')}?page=1&page_size=50`);
   if (resp.jobs && resp.jobs.length > 0) {
     // Prefer running, then sleeping
     let job = resp.jobs.find(j => j.workspace_id === workspace && j.status === 'running');
@@ -311,7 +326,7 @@ To authenticate, you need an API token from Magpie.
   log('blue', 'Verifying token...');
 
   try {
-    const resp = await request('GET', '/api/v1/mags-jobs?page=1&page_size=1');
+    const resp = await request('GET', `${apiPath('mags-jobs')}?page=1&page_size=1`);
 
     if (resp.error === 'unauthorized' || resp.error === 'Unauthorized') {
       log('red', 'Invalid token. Please check and try again.');
@@ -365,7 +380,7 @@ async function whoami() {
   log('blue', 'Checking authentication...');
 
   try {
-    const resp = await request('GET', '/api/v1/mags-jobs?page=1&page_size=1');
+    const resp = await request('GET', `${apiPath('mags-jobs')}?page=1&page_size=1`);
 
     if (resp.error === 'unauthorized' || resp.error === 'Unauthorized') {
       log('red', 'Token is invalid or expired.');
@@ -436,7 +451,7 @@ async function newVM(args) {
 
   // Check if a VM with this name already exists (running or sleeping)
   try {
-    const jobs = await request('GET', '/api/v1/mags-jobs');
+    const jobs = await request('GET', apiPath('mags-jobs'));
     const existing = (jobs.jobs || []).find(j =>
       j.name === name && (j.status === 'running' || j.status === 'sleeping')
     );
@@ -457,14 +472,13 @@ async function newVM(args) {
     persistent: true,
     name: name,
     workspace_id: name,
-    startup_command: 'sleep infinity',
-    no_sync: !persistent
+    startup_command: 'sleep infinity'
   };
   if (baseWorkspace) payload.base_workspace_id = baseWorkspace;
   if (diskGB) payload.disk_gb = diskGB;
   if (rootfsType) payload.rootfs_type = rootfsType;
 
-  const response = await request('POST', '/api/v1/mags-jobs', payload);
+  const response = await request('POST', apiPath('mags-jobs'), payload);
 
   if (!response.request_id) {
     log('red', 'Failed to create VM:');
@@ -477,7 +491,7 @@ async function newVM(args) {
   let attempt = 0;
 
   while (attempt < maxAttempts) {
-    const status = await request('GET', `/api/v1/mags-jobs/${response.request_id}/status`);
+    const status = await request('GET', `${apiPath('mags-jobs')}/${response.request_id}/status`);
 
     if (status.status === 'running') {
       log('green', `VM '${name}' created successfully${persistent ? ' (persistent)' : ' (local disk)'}`);
@@ -621,7 +635,7 @@ async function runJob(args) {
   if (diskGB) payload.disk_gb = diskGB;
   if (rootfsType) payload.rootfs_type = rootfsType;
 
-  const response = await request('POST', '/api/v1/mags-jobs', payload);
+  const response = await request('POST', apiPath('mags-jobs'), payload);
 
   if (!response.request_id) {
     log('red', 'Failed to submit job:');
@@ -640,7 +654,7 @@ async function runJob(args) {
   let attempt = 0;
 
   while (attempt < maxAttempts) {
-    const status = await request('GET', `/api/v1/mags-jobs/${requestId}/status`);
+    const status = await request('GET', `${apiPath('mags-jobs')}/${requestId}/status`);
 
     if (status.status === 'completed') {
       log('green', `Completed in ${status.script_duration_ms}ms`);
@@ -658,7 +672,7 @@ async function runJob(args) {
 
       if (enableUrl && status.subdomain) {
         log('blue', `Enabling URL access on port ${port}...`);
-        const accessResp = await request('POST', `/api/v1/mags-jobs/${requestId}/access`, { port });
+        const accessResp = await request('POST', `${apiPath('mags-jobs')}/${requestId}/access`, { port });
         if (accessResp.success) {
           log('green', `URL: https://${status.subdomain}.apps.magpiecloud.com`);
         } else {
@@ -681,7 +695,7 @@ async function runJob(args) {
 
   // Get logs
   log('cyan', 'Output:');
-  const logsResp = await request('GET', `/api/v1/mags-jobs/${requestId}/logs`);
+  const logsResp = await request('GET', `${apiPath('mags-jobs')}/${requestId}/logs`);
   if (logsResp.logs) {
     logsResp.logs
       .filter(l => l.source === 'stdout' || l.source === 'stderr')
@@ -698,10 +712,10 @@ async function enableUrlAccess(nameOrId, port = 8080) {
   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 });
+  const accessResp = await request('POST', `${apiPath('mags-jobs')}/${requestId}/access`, { port });
 
   if (accessResp.success) {
-    const status = await request('GET', `/api/v1/mags-jobs/${requestId}/status`);
+    const status = await request('GET', `${apiPath('mags-jobs')}/${requestId}/status`);
     if (status.subdomain) {
       log('green', `URL enabled: https://${status.subdomain}.apps.magpiecloud.com`);
     } else {
@@ -760,7 +774,7 @@ async function urlAliasCreate(subdomain, workspaceId, useLfg) {
   const domain = useLfg ? 'app.lfg.run' : 'apps.magpiecloud.com';
   log('blue', `Creating URL alias: ${subdomain}.${domain} → workspace '${workspaceId}'...`);
 
-  const resp = await request('POST', '/api/v1/mags-url-aliases', {
+  const resp = await request('POST', apiPath('mags-url-aliases'), {
     subdomain,
     workspace_id: workspaceId,
     domain,
@@ -779,7 +793,7 @@ async function urlAliasCreate(subdomain, workspaceId, useLfg) {
 }
 
 async function urlAliasList() {
-  const resp = await request('GET', '/api/v1/mags-url-aliases');
+  const resp = await request('GET', apiPath('mags-url-aliases'));
   const aliases = resp.aliases || [];
 
   if (aliases.length > 0) {
@@ -798,7 +812,7 @@ async function urlAliasList() {
 
 async function urlAliasRemove(subdomain) {
   log('blue', `Removing URL alias '${subdomain}'...`);
-  const resp = await request('DELETE', `/api/v1/mags-url-aliases/${subdomain}`);
+  const resp = await request('DELETE', `${apiPath('mags-url-aliases')}/${subdomain}`);
   if (resp.error) {
     log('red', `Error: ${resp.error}`);
     process.exit(1);
@@ -812,7 +826,7 @@ async function getStatus(nameOrId) {
     usage();
   }
   const requestId = await resolveJobId(nameOrId);
-  const status = await request('GET', `/api/v1/mags-jobs/${requestId}/status`);
+  const status = await request('GET', `${apiPath('mags-jobs')}/${requestId}/status`);
   console.log(JSON.stringify(status, null, 2));
 }
 
@@ -822,7 +836,7 @@ async function getLogs(nameOrId) {
     usage();
   }
   const requestId = await resolveJobId(nameOrId);
-  const logsResp = await request('GET', `/api/v1/mags-jobs/${requestId}/logs`);
+  const logsResp = await request('GET', `${apiPath('mags-jobs')}/${requestId}/logs`);
   if (logsResp.logs) {
     logsResp.logs.forEach(l => {
       const levelColor = l.level === 'error' ? 'red' : l.level === 'warn' ? 'yellow' : 'gray';
@@ -832,7 +846,7 @@ async function getLogs(nameOrId) {
 }
 
 async function listJobs() {
-  const resp = await request('GET', '/api/v1/mags-jobs?page=1&page_size=10');
+  const resp = await request('GET', `${apiPath('mags-jobs')}?page=1&page_size=10`);
   if (resp.jobs && resp.jobs.length > 0) {
     log('cyan', 'Recent Jobs:\n');
     resp.jobs.forEach(job => {
@@ -860,7 +874,7 @@ async function stopJob(nameOrId) {
   }
   const requestId = await resolveJobId(nameOrId);
   log('blue', `Stopping job ${requestId}...`);
-  const resp = await request('POST', `/api/v1/mags-jobs/${requestId}/stop`);
+  const resp = await request('POST', `${apiPath('mags-jobs')}/${requestId}/stop`);
   if (resp.success) {
     log('green', 'Job stopped');
   } else {
@@ -902,7 +916,7 @@ async function setJobSettings(args) {
 
   const requestId = await resolveJobId(nameOrId);
   log('blue', `Updating settings for ${requestId}...`);
-  const resp = await request('PATCH', `/api/v1/mags-jobs/${requestId}`, payload);
+  const resp = await request('PATCH', `${apiPath('mags-jobs')}/${requestId}`, payload);
   if (resp.success) {
     if (noSleep === true) log('green', 'VM set to never auto-sleep');
     if (noSleep === false) log('green', 'VM set to auto-sleep when idle');
@@ -935,10 +949,10 @@ async function resizeVM(args) {
     // Sync workspace before stopping (preserve files)
     if (existingJob.status === 'running') {
       log('blue', 'Syncing workspace before resize...');
-      await request('POST', `/api/v1/mags-jobs/${existingJob.request_id}/sync`);
+      await request('POST', `${apiPath('mags-jobs')}/${existingJob.request_id}/sync`);
     }
     log('blue', `Stopping existing VM...`);
-    await request('POST', `/api/v1/mags-jobs/${existingJob.request_id}/stop`);
+    await request('POST', `${apiPath('mags-jobs')}/${existingJob.request_id}/stop`);
     // Brief wait for the stop to complete
     await new Promise(r => setTimeout(r, 1000));
   }
@@ -955,7 +969,7 @@ async function resizeVM(args) {
     disk_gb: diskGB,
   };
 
-  const response = await request('POST', '/api/v1/mags-jobs', payload);
+  const response = await request('POST', apiPath('mags-jobs'), payload);
   if (!response.request_id) {
     log('red', 'Failed to create VM:');
     console.log(JSON.stringify(response, null, 2));
@@ -990,7 +1004,7 @@ async function syncWorkspace(nameOrId) {
   }
 
   log('blue', `Syncing workspace...`);
-  const resp = await request('POST', `/api/v1/mags-jobs/${requestId}/sync`);
+  const resp = await request('POST', `${apiPath('mags-jobs')}/${requestId}/sync`);
   if (resp.success) {
     log('green', 'Workspace synced to S3 successfully');
   } else {
@@ -1110,7 +1124,7 @@ async function uploadFile(filePath) {
   const body = Buffer.concat([header, fileData, footer]);
 
   return new Promise((resolve, reject) => {
-    const url = new URL('/api/v1/mags-files', API_URL);
+    const url = new URL(apiPath('mags-files'), API_URL);
     const isHttps = url.protocol === 'https:';
     const lib = isHttps ? https : http;
 
@@ -1247,7 +1261,7 @@ async function cronAdd(args) {
   };
   if (workspace) payload.workspace_id = workspace;
 
-  const resp = await request('POST', '/api/v1/mags-cron', payload);
+  const resp = await request('POST', apiPath('mags-cron'), payload);
   if (resp.id) {
     log('green', `Cron job created: ${resp.id}`);
     log('blue', `Name: ${cronName}`);
@@ -1261,7 +1275,7 @@ async function cronAdd(args) {
 }
 
 async function cronList() {
-  const resp = await request('GET', '/api/v1/mags-cron');
+  const resp = await request('GET', apiPath('mags-cron'));
   if (resp.cron_jobs && resp.cron_jobs.length > 0) {
     log('cyan', 'Cron Jobs:\n');
     resp.cron_jobs.forEach(cron => {
@@ -1283,7 +1297,7 @@ async function cronList() {
 }
 
 async function cronRemove(id) {
-  const resp = await request('DELETE', `/api/v1/mags-cron/${id}`);
+  const resp = await request('DELETE', `${apiPath('mags-cron')}/${id}`);
   if (resp.success) {
     log('green', 'Cron job deleted');
   } else {
@@ -1293,7 +1307,7 @@ async function cronRemove(id) {
 }
 
 async function cronToggle(id, enabled) {
-  const resp = await request('PATCH', `/api/v1/mags-cron/${id}`, { enabled });
+  const resp = await request('PATCH', `${apiPath('mags-cron')}/${id}`, { enabled });
   if (resp.id) {
     log('green', `Cron job ${enabled ? 'enabled' : 'disabled'}`);
     if (resp.next_run_at) log('blue', `Next run: ${resp.next_run_at}`);
@@ -1340,7 +1354,7 @@ async function workspaceCommand(args) {
 }
 
 async function workspaceList() {
-  const resp = await request('GET', '/api/v1/mags-workspaces');
+  const resp = await request('GET', apiPath('mags-workspaces'));
   if (resp.workspaces && resp.workspaces.length > 0) {
     log('cyan', 'Workspaces:\n');
     resp.workspaces.forEach(ws => {
@@ -1358,7 +1372,7 @@ async function workspaceList() {
 
 async function workspaceDelete(workspaceId) {
   log('blue', `Deleting workspace '${workspaceId}'...`);
-  const resp = await request('DELETE', `/api/v1/mags-workspaces/${workspaceId}`);
+  const resp = await request('DELETE', `${apiPath('mags-workspaces')}/${workspaceId}`);
   if (resp.success) {
     log('green', resp.message || `Workspace '${workspaceId}' deleted`);
   } else {
@@ -1389,7 +1403,7 @@ async function browserSession(args) {
 
     if (existingJob && existingJob.status === 'running') {
       // Check if it's already a browser session
-      const status = await request('GET', `/api/v1/mags-jobs/${existingJob.request_id}/status`);
+      const status = await request('GET', `${apiPath('mags-jobs')}/${existingJob.request_id}/status`);
       if (status.browser_mode && status.debug_ws_url) {
         log('green', 'Found existing browser session');
         console.log('');
@@ -1417,7 +1431,7 @@ async function browserSession(args) {
   if (name) payload.name = name;
   if (!name && workspace) payload.name = `browser-${workspace}`;
 
-  const response = await request('POST', '/api/v1/mags-jobs', payload);
+  const response = await request('POST', apiPath('mags-jobs'), payload);
 
   if (!response.request_id) {
     log('red', 'Failed to start browser session:');
@@ -1432,7 +1446,7 @@ async function browserSession(args) {
   log('blue', 'Waiting for Chromium to start...');
   let status;
   for (let i = 0; i < 90; i++) {
-    status = await request('GET', `/api/v1/mags-jobs/${requestId}/status`);
+    status = await request('GET', `${apiPath('mags-jobs')}/${requestId}/status`);
     if (status.status === 'running' && status.debug_ws_url) {
       break;
     }
@@ -1481,7 +1495,7 @@ async function browserSession(args) {
 // WebSocket tunnel proxy — pipes stdin/stdout through a WebSocket to the agent SSH proxy.
 // Used as SSH ProxyCommand: ssh -o ProxyCommand="mags proxy <jobID>" root@mags-vm
 async function proxyTunnel(jobID) {
-  const url = new URL(`/api/v1/mags-jobs/${jobID}/tunnel`, API_URL);
+  const url = new URL(`${apiPath('mags-jobs')}/${jobID}/tunnel`, API_URL);
   const wsUrl = url.toString().replace(/^http/, 'ws');
 
   // Dynamic import for WebSocket
@@ -1564,7 +1578,7 @@ async function proxyTunnel(jobID) {
 // Fetch SSH key from tunnel endpoint (quick WS handshake)
 async function fetchTunnelKey(jobID) {
   const WebSocket = require('ws');
-  const url = new URL(`/api/v1/mags-jobs/${jobID}/tunnel`, API_URL);
+  const url = new URL(`${apiPath('mags-jobs')}/${jobID}/tunnel`, API_URL);
   const wsUrl = url.toString().replace(/^http/, 'ws');
 
   return new Promise((resolve, reject) => {
@@ -1624,7 +1638,7 @@ async function resolveOrCreateJob(nameOrId) {
     startup_command: 'sleep 3600'
   };
 
-  const response = await request('POST', '/api/v1/mags-jobs', payload);
+  const response = await request('POST', apiPath('mags-jobs'), payload);
   if (!response.request_id) {
     log('red', 'Failed to start VM:');
     console.log(JSON.stringify(response, null, 2));
@@ -1636,7 +1650,7 @@ async function resolveOrCreateJob(nameOrId) {
 
   log('blue', 'Waiting for VM...');
   for (let i = 0; i < 60; i++) {
-    const status = await request('GET', `/api/v1/mags-jobs/${jobID}/status`);
+    const status = await request('GET', `${apiPath('mags-jobs')}/${jobID}/status`);
     if (status.status === 'running' && status.vm_id) break;
     if (status.status === 'error') {
       log('red', 'VM failed to start');
@@ -1651,7 +1665,7 @@ async function resolveOrCreateJob(nameOrId) {
 
 // Get SSH key for a job (calls EnableAccess to set up agent proxy and get key)
 async function getSSHKey(jobID) {
-  const accessResp = await request('POST', `/api/v1/mags-jobs/${jobID}/access`, { port: 22 });
+  const accessResp = await request('POST', `${apiPath('mags-jobs')}/${jobID}/access`, { port: 22 });
   if (!accessResp.success) {
     log('red', 'Failed to enable SSH access');
     if (accessResp.error) log('red', accessResp.error);

package/nodejs/index.js

@@ -124,7 +124,6 @@ class Mags {
     };
 
     if (options.noSleep) payload.no_sleep = true;
-    if (options.noSync) payload.no_sync = true;
     if (options.name) payload.name = options.name;
     if (!options.ephemeral && options.workspaceId) payload.workspace_id = options.workspaceId;
     if (options.baseWorkspaceId) payload.base_workspace_id = options.baseWorkspaceId;
@@ -284,9 +283,9 @@ class Mags {
     const result = await this.run('sleep infinity', {
       workspaceId: name,
       persistent: true,
-      noSync: !options.persistent,
       baseWorkspaceId: options.baseWorkspaceId,
       diskGb: options.diskGb,
+      rootfsType: options.rootfsType,
     });
     const requestId = result.request_id;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpiecloud/mags",
-  "version": "1.8.17",
+  "version": "1.9.0",
   "description": "Mags CLI & SDK - Execute commands and scripts on Mags Sandboxes",
   "main": "index.js",
   "bin": {

package/test-sdk.js

@@ -0,0 +1,68 @@
+const Mags = require('./nodejs/index.js');
+
+const API_TOKEN = 'e1e90cc27dfe6a50cc28699cdcb937ef8c443567b62cf064a063f9b34af0b91b';
+
+async function main() {
+  const mags = new Mags({ apiToken: API_TOKEN });
+
+  // Test 1: Basic runAndWait
+  console.log('=== Test 1: Basic runAndWait ===');
+  const r1 = await mags.runAndWait('echo "hello from SDK" && node --version');
+  const r1out = (r1.logs || []).map(l => l.output || l.message || '').join('').trim();
+  console.log('Output:', r1out || '(check logs)');
+  console.log('Status:', r1.status, '| Exit:', r1.exitCode);
+  console.log('Logs:', JSON.stringify(r1.logs?.slice(0, 3)));
+  console.log();
+
+  // Test 2: Run with claude type
+  console.log('=== Test 2: runAndWait with --type claude ===');
+  const r2 = await mags.runAndWait('claude --version && node --version', { rootfsType: 'claude', timeout: 120000 });
+  const r2out = (r2.logs || []).map(l => l.output || l.message || '').join('').trim();
+  console.log('Output:', r2out || '(check logs)');
+  console.log('Status:', r2.status);
+  console.log();
+
+  // Test 3: Create persistent VM — use run() not runAndWait() since persistent stays "running"
+  console.log('=== Test 3: Create persistent VM ===');
+  const r3 = await mags.run('echo "data123" > /root/sdk-test.txt && echo "created"', {
+    name: 'sdk-test-vm',
+    persistent: true,
+  });
+  console.log('Submitted:', r3.request_id);
+  // Wait for VM to be fully ready (needs VM ID assigned)
+  let s3;
+  for (let i = 0; i < 20; i++) {
+    await new Promise(r => setTimeout(r, 1000));
+    s3 = await mags.status(r3.request_id);
+    if (s3.vm_id) break;
+  }
+  console.log('Status:', s3.status, '| VM:', s3.vm_id);
+  console.log();
+
+  // Test 4: exec on persistent VM
+  console.log('=== Test 4: exec on persistent VM ===');
+  const r4 = await mags.exec('sdk-test-vm', 'cat /root/sdk-test.txt && echo "exec works"');
+  console.log('Output:', r4.output?.trim());
+  console.log('Exit:', r4.exitCode);
+  console.log();
+
+  // Test 5: exec again after wait
+  await new Promise(r => setTimeout(r, 5000));
+  console.log('=== Test 5: Second exec (VM still alive?) ===');
+  const r5 = await mags.exec('sdk-test-vm', 'cat /root/sdk-test.txt && uptime');
+  console.log('Output:', r5.output?.trim());
+  console.log('Exit:', r5.exitCode);
+  console.log();
+
+  // Cleanup
+  console.log('=== Cleanup ===');
+  await mags.stop('sdk-test-vm');
+  console.log('Stopped.');
+
+  console.log('\n✓ All tests passed');
+}
+
+main().catch(err => {
+  console.error('FAILED:', err.message);
+  process.exit(1);
+});