@vm0/cli 1.16.0 → 3.0.0

package/index.js

@@ -12488,44 +12488,56 @@ function validateAgentConfig(config2) {
   if (!cfg.version) {
     return { valid: false, error: "Missing config.version" };
   }
-  if (!cfg.agents || !Array.isArray(cfg.agents)) {
-    return { valid: false, error: "Missing config.agents array" };
+  if (!cfg.agents || typeof cfg.agents !== "object") {
+    return { valid: false, error: "Missing agents object in config" };
   }
-  if (cfg.agents.length === 0) {
-    return { valid: false, error: "config.agents array must not be empty" };
-  }
-  const agent = cfg.agents[0];
-  if (!agent || typeof agent !== "object") {
-    return { valid: false, error: "First agent must be an object" };
+  if (Array.isArray(cfg.agents)) {
+    return {
+      valid: false,
+      error: "agents must be an object, not an array. Use format: agents: { agent-name: { ... } }"
+    };
   }
-  if (!agent.name) {
-    return { valid: false, error: "Missing agents[0].name" };
+  const agentKeys = Object.keys(cfg.agents);
+  if (agentKeys.length === 0) {
+    return {
+      valid: false,
+      error: "agents must have at least one agent defined"
+    };
   }
-  if (typeof agent.name !== "string") {
-    return { valid: false, error: "agents[0].name must be a string" };
+  if (agentKeys.length > 1) {
+    return {
+      valid: false,
+      error: "Multiple agents not supported yet. Only one agent allowed."
+    };
   }
-  if (!validateAgentName(agent.name)) {
+  const agentName = agentKeys[0];
+  if (!validateAgentName(agentName)) {
     return {
       valid: false,
-      error: "Invalid agents[0].name format. Must be 3-64 characters, letters, numbers, and hyphens only. Must start and end with letter or number."
+      error: "Invalid agent name format. Must be 3-64 characters, letters, numbers, and hyphens only. Must start and end with letter or number."
     };
   }
+  const agentsObj = cfg.agents;
+  const agent = agentsObj[agentName];
+  if (!agent || typeof agent !== "object") {
+    return { valid: false, error: "Agent definition must be an object" };
+  }
   if (!agent.working_dir || typeof agent.working_dir !== "string") {
     return {
       valid: false,
-      error: "Missing or invalid agents[0].working_dir (must be a string)"
+      error: "Missing or invalid agent.working_dir (must be a string)"
     };
   }
   if (!agent.image || typeof agent.image !== "string") {
     return {
       valid: false,
-      error: "Missing or invalid agents[0].image (must be a string)"
+      error: "Missing or invalid agent.image (must be a string)"
     };
   }
   if (!agent.provider || typeof agent.provider !== "string") {
     return {
       valid: false,
-      error: "Missing or invalid agents[0].provider (must be a string)"
+      error: "Missing or invalid agent.provider (must be a string)"
     };
   }
   const agentVolumes = agent.volumes;
@@ -13446,15 +13458,96 @@ var initCommand = new Command3().name("init").description("Initialize a volume i
 // src/commands/volume/push.ts
 import { Command as Command4 } from "commander";
 import chalk6 from "chalk";
-import path3 from "path";
+import path4 from "path";
+import * as fs2 from "fs";
+import * as os from "os";
+import * as tar2 from "tar";
+
+// src/lib/file-utils.ts
 import * as fs from "fs";
-import AdmZip from "adm-zip";
+import * as path3 from "path";
+import * as tar from "tar";
+function excludeVm0Filter(filePath) {
+  const shouldExclude = filePath === ".vm0" || filePath.startsWith(".vm0/") || filePath.startsWith("./.vm0");
+  return !shouldExclude;
+}
+function listTarFiles(tarPath) {
+  return new Promise((resolve, reject) => {
+    const files = [];
+    tar.list({
+      file: tarPath,
+      onReadEntry: (entry) => {
+        if (entry.type === "File") {
+          files.push(entry.path);
+        }
+      }
+    }).then(() => resolve(files)).catch(reject);
+  });
+}
+async function listLocalFiles(dir, excludeDirs = [".vm0"]) {
+  const files = [];
+  async function walkDir(currentDir, relativePath = "") {
+    const entries = await fs.promises.readdir(currentDir, {
+      withFileTypes: true
+    });
+    for (const entry of entries) {
+      const entryRelativePath = relativePath ? path3.join(relativePath, entry.name) : entry.name;
+      if (entry.isDirectory()) {
+        if (!excludeDirs.includes(entry.name)) {
+          await walkDir(path3.join(currentDir, entry.name), entryRelativePath);
+        }
+      } else {
+        files.push(entryRelativePath);
+      }
+    }
+  }
+  await walkDir(dir);
+  return files;
+}
+async function removeExtraFiles(dir, remoteFiles, excludeDirs = [".vm0"]) {
+  const localFiles = await listLocalFiles(dir, excludeDirs);
+  let removedCount = 0;
+  for (const localFile of localFiles) {
+    const normalizedPath = localFile.replace(/\\/g, "/");
+    if (!remoteFiles.has(normalizedPath)) {
+      const fullPath = path3.join(dir, localFile);
+      await fs.promises.unlink(fullPath);
+      removedCount++;
+    }
+  }
+  await removeEmptyDirs(dir, excludeDirs);
+  return removedCount;
+}
+async function removeEmptyDirs(dir, excludeDirs = [".vm0"]) {
+  const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+  let isEmpty = true;
+  for (const entry of entries) {
+    const fullPath = path3.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (excludeDirs.includes(entry.name)) {
+        isEmpty = false;
+      } else {
+        const subDirEmpty = await removeEmptyDirs(fullPath, excludeDirs);
+        if (subDirEmpty) {
+          await fs.promises.rmdir(fullPath);
+        } else {
+          isEmpty = false;
+        }
+      }
+    } else {
+      isEmpty = false;
+    }
+  }
+  return isEmpty;
+}
+
+// src/commands/volume/push.ts
 async function getAllFiles(dirPath, baseDir = dirPath) {
   const files = [];
-  const entries = await fs.promises.readdir(dirPath, { withFileTypes: true });
+  const entries = await fs2.promises.readdir(dirPath, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = path3.join(dirPath, entry.name);
-    const relativePath = path3.relative(baseDir, fullPath);
+    const fullPath = path4.join(dirPath, entry.name);
+    const relativePath = path4.relative(baseDir, fullPath);
     if (relativePath.startsWith(".vm0")) {
       continue;
     }
@@ -13491,7 +13584,7 @@ var pushCommand = new Command4().name("push").description("Push local files to c
     const files = await getAllFiles(cwd);
     let totalSize = 0;
     for (const file2 of files) {
-      const stats = await fs.promises.stat(file2);
+      const stats = await fs2.promises.stat(file2);
       totalSize += stats.size;
     }
     if (files.length === 0) {
@@ -13502,14 +13595,34 @@ var pushCommand = new Command4().name("push").description("Push local files to c
       );
     }
     console.log(chalk6.gray("Compressing files..."));
-    const zip = new AdmZip();
-    for (const file2 of files) {
-      const relativePath = path3.relative(cwd, file2);
-      zip.addLocalFile(file2, path3.dirname(relativePath));
+    const tmpDir = fs2.mkdtempSync(path4.join(os.tmpdir(), "vm0-"));
+    const tarPath = path4.join(tmpDir, "volume.tar.gz");
+    const relativePaths = files.map((file2) => path4.relative(cwd, file2));
+    if (relativePaths.length > 0) {
+      await tar2.create(
+        {
+          gzip: true,
+          file: tarPath,
+          cwd
+        },
+        relativePaths
+      );
+    } else {
+      await tar2.create(
+        {
+          gzip: true,
+          file: tarPath,
+          cwd,
+          filter: excludeVm0Filter
+        },
+        ["."]
+      );
     }
-    const zipBuffer = zip.toBuffer();
+    const tarBuffer = await fs2.promises.readFile(tarPath);
+    await fs2.promises.unlink(tarPath);
+    await fs2.promises.rmdir(tmpDir);
     console.log(
-      chalk6.green(`\u2713 Compressed to ${formatBytes(zipBuffer.length)}`)
+      chalk6.green(`\u2713 Compressed to ${formatBytes(tarBuffer.length)}`)
     );
     console.log(chalk6.gray("Uploading..."));
     const formData = new FormData();
@@ -13520,8 +13633,8 @@ var pushCommand = new Command4().name("push").description("Push local files to c
     }
     formData.append(
       "file",
-      new Blob([zipBuffer], { type: "application/zip" }),
-      "volume.zip"
+      new Blob([tarBuffer], { type: "application/gzip" }),
+      "volume.tar.gz"
     );
     const response = await apiClient.post("/api/storages", {
       body: formData
@@ -13555,78 +13668,8 @@ import { Command as Command5 } from "commander";
 import chalk7 from "chalk";
 import path5 from "path";
 import * as fs3 from "fs";
-import AdmZip2 from "adm-zip";
-
-// src/lib/file-utils.ts
-import * as fs2 from "fs";
-import * as path4 from "path";
-function getRemoteFilesFromZip(zipEntries) {
-  const remoteFiles = /* @__PURE__ */ new Set();
-  for (const entry of zipEntries) {
-    if (!entry.isDirectory) {
-      remoteFiles.add(entry.entryName.replace(/\\/g, "/"));
-    }
-  }
-  return remoteFiles;
-}
-async function listLocalFiles(dir, excludeDirs = [".vm0"]) {
-  const files = [];
-  async function walkDir(currentDir, relativePath = "") {
-    const entries = await fs2.promises.readdir(currentDir, {
-      withFileTypes: true
-    });
-    for (const entry of entries) {
-      const entryRelativePath = relativePath ? path4.join(relativePath, entry.name) : entry.name;
-      if (entry.isDirectory()) {
-        if (!excludeDirs.includes(entry.name)) {
-          await walkDir(path4.join(currentDir, entry.name), entryRelativePath);
-        }
-      } else {
-        files.push(entryRelativePath);
-      }
-    }
-  }
-  await walkDir(dir);
-  return files;
-}
-async function removeExtraFiles(dir, remoteFiles, excludeDirs = [".vm0"]) {
-  const localFiles = await listLocalFiles(dir, excludeDirs);
-  let removedCount = 0;
-  for (const localFile of localFiles) {
-    const normalizedPath = localFile.replace(/\\/g, "/");
-    if (!remoteFiles.has(normalizedPath)) {
-      const fullPath = path4.join(dir, localFile);
-      await fs2.promises.unlink(fullPath);
-      removedCount++;
-    }
-  }
-  await removeEmptyDirs(dir, excludeDirs);
-  return removedCount;
-}
-async function removeEmptyDirs(dir, excludeDirs = [".vm0"]) {
-  const entries = await fs2.promises.readdir(dir, { withFileTypes: true });
-  let isEmpty = true;
-  for (const entry of entries) {
-    const fullPath = path4.join(dir, entry.name);
-    if (entry.isDirectory()) {
-      if (excludeDirs.includes(entry.name)) {
-        isEmpty = false;
-      } else {
-        const subDirEmpty = await removeEmptyDirs(fullPath, excludeDirs);
-        if (subDirEmpty) {
-          await fs2.promises.rmdir(fullPath);
-        } else {
-          isEmpty = false;
-        }
-      }
-    } else {
-      isEmpty = false;
-    }
-  }
-  return isEmpty;
-}
-
-// src/commands/volume/pull.ts
+import * as os2 from "os";
+import * as tar3 from "tar";
 function formatBytes2(bytes) {
   if (bytes === 0) return "0 B";
   const k = 1024;
@@ -13674,31 +13717,31 @@ var pullCommand = new Command5().name("pull").description("Pull cloud files to l
       process.exit(1);
     }
     const arrayBuffer = await response.arrayBuffer();
-    const zipBuffer = Buffer.from(arrayBuffer);
-    console.log(chalk7.green(`\u2713 Downloaded ${formatBytes2(zipBuffer.length)}`));
-    console.log(chalk7.gray("Extracting files..."));
-    const zip = new AdmZip2(zipBuffer);
-    const zipEntries = zip.getEntries();
-    const remoteFiles = getRemoteFilesFromZip(zipEntries);
+    const tarBuffer = Buffer.from(arrayBuffer);
+    console.log(chalk7.green(`\u2713 Downloaded ${formatBytes2(tarBuffer.length)}`));
+    const tmpDir = fs3.mkdtempSync(path5.join(os2.tmpdir(), "vm0-"));
+    const tarPath = path5.join(tmpDir, "volume.tar.gz");
+    await fs3.promises.writeFile(tarPath, tarBuffer);
     console.log(chalk7.gray("Syncing local files..."));
-    const removedCount = await removeExtraFiles(cwd, remoteFiles);
+    const remoteFiles = await listTarFiles(tarPath);
+    const remoteFilesSet = new Set(
+      remoteFiles.map((f) => f.replace(/\\/g, "/"))
+    );
+    const removedCount = await removeExtraFiles(cwd, remoteFilesSet);
     if (removedCount > 0) {
       console.log(
         chalk7.green(`\u2713 Removed ${removedCount} files not in remote`)
       );
     }
-    let extractedCount = 0;
-    for (const entry of zipEntries) {
-      if (!entry.isDirectory) {
-        const targetPath = path5.join(cwd, entry.entryName);
-        const dir = path5.dirname(targetPath);
-        await fs3.promises.mkdir(dir, { recursive: true });
-        const data = entry.getData();
-        await fs3.promises.writeFile(targetPath, data);
-        extractedCount++;
-      }
-    }
-    console.log(chalk7.green(`\u2713 Extracted ${extractedCount} files`));
+    console.log(chalk7.gray("Extracting files..."));
+    await tar3.extract({
+      file: tarPath,
+      cwd,
+      gzip: true
+    });
+    await fs3.promises.unlink(tarPath);
+    await fs3.promises.rmdir(tmpDir);
+    console.log(chalk7.green(`\u2713 Extracted ${remoteFiles.length} files`));
   } catch (error43) {
     console.error(chalk7.red("\u2717 Pull failed"));
     if (error43 instanceof Error) {
@@ -13781,7 +13824,8 @@ import { Command as Command8 } from "commander";
 import chalk9 from "chalk";
 import path7 from "path";
 import * as fs4 from "fs";
-import AdmZip3 from "adm-zip";
+import * as os3 from "os";
+import * as tar4 from "tar";
 async function getAllFiles2(dirPath, baseDir = dirPath) {
   const files = [];
   const entries = await fs4.promises.readdir(dirPath, { withFileTypes: true });
@@ -13844,14 +13888,34 @@ var pushCommand2 = new Command8().name("push").description("Push local files to
       );
     }
     console.log(chalk9.gray("Compressing files..."));
-    const zip = new AdmZip3();
-    for (const file2 of files) {
-      const relativePath = path7.relative(cwd, file2);
-      zip.addLocalFile(file2, path7.dirname(relativePath));
+    const tmpDir = fs4.mkdtempSync(path7.join(os3.tmpdir(), "vm0-"));
+    const tarPath = path7.join(tmpDir, "artifact.tar.gz");
+    const relativePaths = files.map((file2) => path7.relative(cwd, file2));
+    if (relativePaths.length > 0) {
+      await tar4.create(
+        {
+          gzip: true,
+          file: tarPath,
+          cwd
+        },
+        relativePaths
+      );
+    } else {
+      await tar4.create(
+        {
+          gzip: true,
+          file: tarPath,
+          cwd,
+          filter: excludeVm0Filter
+        },
+        ["."]
+      );
     }
-    const zipBuffer = zip.toBuffer();
+    const tarBuffer = await fs4.promises.readFile(tarPath);
+    await fs4.promises.unlink(tarPath);
+    await fs4.promises.rmdir(tmpDir);
     console.log(
-      chalk9.green(`\u2713 Compressed to ${formatBytes3(zipBuffer.length)}`)
+      chalk9.green(`\u2713 Compressed to ${formatBytes3(tarBuffer.length)}`)
     );
     console.log(chalk9.gray("Uploading..."));
     const formData = new FormData();
@@ -13862,8 +13926,8 @@ var pushCommand2 = new Command8().name("push").description("Push local files to
     }
     formData.append(
       "file",
-      new Blob([zipBuffer], { type: "application/zip" }),
-      "artifact.zip"
+      new Blob([tarBuffer], { type: "application/gzip" }),
+      "artifact.tar.gz"
     );
     const response = await apiClient.post("/api/storages", {
       body: formData
@@ -13896,7 +13960,8 @@ import { Command as Command9 } from "commander";
 import chalk10 from "chalk";
 import path8 from "path";
 import * as fs5 from "fs";
-import AdmZip4 from "adm-zip";
+import * as os4 from "os";
+import * as tar5 from "tar";
 function formatBytes4(bytes) {
   if (bytes === 0) return "0 B";
   const k = 1024;
@@ -13955,31 +14020,31 @@ var pullCommand2 = new Command9().name("pull").description("Pull cloud artifact
       process.exit(1);
     }
     const arrayBuffer = await response.arrayBuffer();
-    const zipBuffer = Buffer.from(arrayBuffer);
-    console.log(chalk10.green(`\u2713 Downloaded ${formatBytes4(zipBuffer.length)}`));
-    console.log(chalk10.gray("Extracting files..."));
-    const zip = new AdmZip4(zipBuffer);
-    const zipEntries = zip.getEntries();
-    const remoteFiles = getRemoteFilesFromZip(zipEntries);
+    const tarBuffer = Buffer.from(arrayBuffer);
+    console.log(chalk10.green(`\u2713 Downloaded ${formatBytes4(tarBuffer.length)}`));
+    const tmpDir = fs5.mkdtempSync(path8.join(os4.tmpdir(), "vm0-"));
+    const tarPath = path8.join(tmpDir, "artifact.tar.gz");
+    await fs5.promises.writeFile(tarPath, tarBuffer);
     console.log(chalk10.gray("Syncing local files..."));
-    const removedCount = await removeExtraFiles(cwd, remoteFiles);
+    const remoteFiles = await listTarFiles(tarPath);
+    const remoteFilesSet = new Set(
+      remoteFiles.map((f) => f.replace(/\\/g, "/"))
+    );
+    const removedCount = await removeExtraFiles(cwd, remoteFilesSet);
     if (removedCount > 0) {
       console.log(
         chalk10.green(`\u2713 Removed ${removedCount} files not in remote`)
       );
     }
-    let extractedCount = 0;
-    for (const entry of zipEntries) {
-      if (!entry.isDirectory) {
-        const targetPath = path8.join(cwd, entry.entryName);
-        const dir = path8.dirname(targetPath);
-        await fs5.promises.mkdir(dir, { recursive: true });
-        const data = entry.getData();
-        await fs5.promises.writeFile(targetPath, data);
-        extractedCount++;
-      }
-    }
-    console.log(chalk10.green(`\u2713 Extracted ${extractedCount} files`));
+    console.log(chalk10.gray("Extracting files..."));
+    await tar5.extract({
+      file: tarPath,
+      cwd,
+      gzip: true
+    });
+    await fs5.promises.unlink(tarPath);
+    await fs5.promises.rmdir(tmpDir);
+    console.log(chalk10.green(`\u2713 Extracted ${remoteFiles.length} files`));
   } catch (error43) {
     console.error(chalk10.red("\u2717 Pull failed"));
     if (error43 instanceof Error) {
@@ -13994,7 +14059,7 @@ var artifactCommand = new Command10().name("artifact").description("Manage cloud
 
 // src/index.ts
 var program = new Command11();
-program.name("vm0").description("VM0 CLI - A modern build tool").version("1.16.0");
+program.name("vm0").description("VM0 CLI - A modern build tool").version("3.0.0");
 program.command("hello").description("Say hello from the App").action(() => {
   console.log(chalk11.blue("Welcome to the VM0 CLI!"));
   console.log(chalk11.green(`Core says: ${FOO}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vm0/cli",
-  "version": "1.16.0",
+  "version": "3.0.0",
   "description": "CLI application",
   "repository": {
     "type": "git",
@@ -15,9 +15,9 @@
     "."
   ],
   "dependencies": {
-    "adm-zip": "^0.5.16",
     "chalk": "^5.6.0",
     "commander": "^14.0.0",
+    "tar": "^7.5.2",
     "yaml": "^2.3.4"
   }
 }