@vm0/cli 4.12.0 → 4.13.0

package/index.js

@@ -176,14 +176,22 @@ async function setupToken() {
     );
     process.exit(1);
   }
+  console.log(chalk.green("\u2713 Authentication token exported successfully!"));
+  console.log("");
+  console.log("Your token:");
+  console.log("");
   console.log(token);
+  console.log("");
+  console.log(
+    `Use this token by setting: ${chalk.cyan("export VM0_TOKEN=<token>")}`
+  );
 }
 
 // src/commands/compose.ts
 import { Command } from "commander";
 import chalk2 from "chalk";
 import { readFile as readFile3 } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { dirname as dirname2 } from "path";
 import { parse as parseYaml } from "yaml";
 
@@ -446,7 +454,7 @@ var ApiClient = class {
   /**
    * Generic GET request
    */
-  async get(path13) {
+  async get(path12) {
     const baseUrl = await this.getBaseUrl();
     const token = await getToken();
     if (!token) {
@@ -459,7 +467,7 @@ var ApiClient = class {
     if (bypassSecret) {
       headers["x-vercel-protection-bypass"] = bypassSecret;
     }
-    return fetch(`${baseUrl}${path13}`, {
+    return fetch(`${baseUrl}${path12}`, {
       method: "GET",
       headers
     });
@@ -467,7 +475,7 @@ var ApiClient = class {
   /**
    * Generic POST request
    */
-  async post(path13, options) {
+  async post(path12, options) {
     const baseUrl = await this.getBaseUrl();
     const token = await getToken();
     if (!token) {
@@ -483,7 +491,7 @@ var ApiClient = class {
     if (bypassSecret) {
       headers["x-vercel-protection-bypass"] = bypassSecret;
     }
-    return fetch(`${baseUrl}${path13}`, {
+    return fetch(`${baseUrl}${path12}`, {
       method: "POST",
       headers,
       body: options?.body
@@ -492,7 +500,7 @@ var ApiClient = class {
   /**
    * Generic DELETE request
    */
-  async delete(path13) {
+  async delete(path12) {
     const baseUrl = await this.getBaseUrl();
     const token = await getToken();
     if (!token) {
@@ -505,7 +513,7 @@ var ApiClient = class {
     if (bypassSecret) {
       headers["x-vercel-protection-bypass"] = bypassSecret;
     }
-    return fetch(`${baseUrl}${path13}`, {
+    return fetch(`${baseUrl}${path12}`, {
       method: "DELETE",
       headers
     });
@@ -709,10 +717,9 @@ function validateAgentCompose(config2) {
 }
 
 // src/lib/system-storage.ts
-import * as fs2 from "fs/promises";
-import * as path2 from "path";
-import * as os2 from "os";
-import * as tar from "tar";
+import * as fs4 from "fs/promises";
+import * as path4 from "path";
+import * as os3 from "os";
 
 // src/lib/github-skills.ts
 import * as fs from "fs/promises";
@@ -787,100 +794,330 @@ async function validateSkillDirectory(skillDir) {
   }
 }
 
+// src/lib/direct-upload.ts
+import { createHash } from "crypto";
+import * as fs3 from "fs";
+import * as path3 from "path";
+import * as os2 from "os";
+import * as tar2 from "tar";
+
+// src/lib/file-utils.ts
+import * as fs2 from "fs";
+import * as path2 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((resolve2, reject) => {
+    const files = [];
+    tar.list({
+      file: tarPath,
+      onReadEntry: (entry) => {
+        if (entry.type === "File") {
+          files.push(entry.path);
+        }
+      }
+    }).then(() => resolve2(files)).catch(reject);
+  });
+}
+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 ? path2.join(relativePath, entry.name) : entry.name;
+      if (entry.isDirectory()) {
+        if (!excludeDirs.includes(entry.name)) {
+          await walkDir(path2.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 = path2.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 = path2.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/lib/direct-upload.ts
+async function hashFileStream(filePath) {
+  return new Promise((resolve2, reject) => {
+    const hash2 = createHash("sha256");
+    const stream = fs3.createReadStream(filePath);
+    stream.on("data", (chunk) => hash2.update(chunk));
+    stream.on("end", () => resolve2(hash2.digest("hex")));
+    stream.on("error", reject);
+  });
+}
+async function getAllFiles(dirPath, baseDir = dirPath) {
+  const files = [];
+  const entries = await fs3.promises.readdir(dirPath, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = path3.join(dirPath, entry.name);
+    const relativePath = path3.relative(baseDir, fullPath);
+    if (relativePath.startsWith(".vm0")) {
+      continue;
+    }
+    if (entry.isDirectory()) {
+      const subFiles = await getAllFiles(fullPath, baseDir);
+      files.push(...subFiles);
+    } else {
+      files.push(fullPath);
+    }
+  }
+  return files;
+}
+async function collectFileMetadata(cwd, files, onProgress) {
+  const fileEntries = [];
+  for (let i = 0; i < files.length; i++) {
+    const file2 = files[i];
+    const relativePath = path3.relative(cwd, file2);
+    const [hash2, stats] = await Promise.all([
+      hashFileStream(file2),
+      fs3.promises.stat(file2)
+    ]);
+    fileEntries.push({
+      path: relativePath,
+      hash: hash2,
+      size: stats.size
+    });
+    if (onProgress && (i + 1) % 100 === 0) {
+      onProgress(`Hashing files... ${i + 1}/${files.length}`);
+    }
+  }
+  return fileEntries;
+}
+async function createArchive(cwd, files) {
+  const tmpDir = fs3.mkdtempSync(path3.join(os2.tmpdir(), "vm0-"));
+  const tarPath = path3.join(tmpDir, "archive.tar.gz");
+  try {
+    const relativePaths = files.map((file2) => path3.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 tarBuffer = await fs3.promises.readFile(tarPath);
+    return tarBuffer;
+  } finally {
+    if (fs3.existsSync(tarPath)) {
+      await fs3.promises.unlink(tarPath);
+    }
+    await fs3.promises.rmdir(tmpDir);
+  }
+}
+function createManifest(files) {
+  const manifest = {
+    version: 1,
+    files,
+    createdAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  return Buffer.from(JSON.stringify(manifest, null, 2));
+}
+function sleep(ms) {
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
+}
+async function uploadToPresignedUrl(presignedUrl, data, contentType, maxRetries = 3) {
+  let lastError = null;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      const response = await fetch(presignedUrl, {
+        method: "PUT",
+        body: data,
+        headers: {
+          "Content-Type": contentType
+        }
+      });
+      if (response.ok) {
+        return;
+      }
+      if (response.status >= 400 && response.status < 500) {
+        const text2 = await response.text();
+        throw new Error(`S3 upload failed: ${response.status} - ${text2}`);
+      }
+      const text = await response.text();
+      lastError = new Error(`S3 upload failed: ${response.status} - ${text}`);
+    } catch (error43) {
+      lastError = error43 instanceof Error ? error43 : new Error("Unknown upload error");
+      if (lastError.message.includes("400") || lastError.message.includes("403")) {
+        throw lastError;
+      }
+    }
+    if (attempt < maxRetries) {
+      const backoffMs = Math.pow(2, attempt - 1) * 1e3;
+      await sleep(backoffMs);
+    }
+  }
+  throw lastError || new Error("S3 upload failed after retries");
+}
+async function directUpload(storageName, storageType, cwd, options) {
+  const { onProgress, force } = options || {};
+  onProgress?.("Collecting files...");
+  const files = await getAllFiles(cwd);
+  onProgress?.("Computing file hashes...");
+  const fileEntries = await collectFileMetadata(cwd, files, onProgress);
+  const totalSize = fileEntries.reduce((sum, f) => sum + f.size, 0);
+  onProgress?.("Preparing upload...");
+  const prepareResponse = await apiClient.post("/api/storages/prepare", {
+    body: JSON.stringify({
+      storageName,
+      storageType,
+      files: fileEntries,
+      force
+    })
+  });
+  if (!prepareResponse.ok) {
+    const error43 = await prepareResponse.json();
+    throw new Error(error43.error?.message || "Prepare failed");
+  }
+  const prepareResult = await prepareResponse.json();
+  if (prepareResult.existing) {
+    return {
+      versionId: prepareResult.versionId,
+      size: totalSize,
+      fileCount: fileEntries.length,
+      deduplicated: true,
+      empty: fileEntries.length === 0
+    };
+  }
+  onProgress?.("Compressing files...");
+  const archiveBuffer = await createArchive(cwd, files);
+  onProgress?.("Uploading archive to S3...");
+  if (!prepareResult.uploads) {
+    throw new Error("No upload URLs received from prepare endpoint");
+  }
+  await uploadToPresignedUrl(
+    prepareResult.uploads.archive.presignedUrl,
+    archiveBuffer,
+    "application/gzip"
+  );
+  onProgress?.("Uploading manifest...");
+  const manifestBuffer = createManifest(fileEntries);
+  await uploadToPresignedUrl(
+    prepareResult.uploads.manifest.presignedUrl,
+    manifestBuffer,
+    "application/json"
+  );
+  onProgress?.("Committing...");
+  const commitResponse = await apiClient.post("/api/storages/commit", {
+    body: JSON.stringify({
+      storageName,
+      storageType,
+      versionId: prepareResult.versionId,
+      files: fileEntries
+    })
+  });
+  if (!commitResponse.ok) {
+    const error43 = await commitResponse.json();
+    throw new Error(error43.error?.message || "Commit failed");
+  }
+  const commitResult = await commitResponse.json();
+  return {
+    versionId: commitResult.versionId,
+    size: commitResult.size,
+    fileCount: commitResult.fileCount,
+    deduplicated: commitResult.deduplicated || false,
+    empty: commitResult.fileCount === 0
+  };
+}
+
 // src/lib/system-storage.ts
 async function uploadSystemPrompt(agentName, promptFilePath, basePath) {
   const storageName = getSystemPromptStorageName(agentName);
-  const absolutePath = path2.isAbsolute(promptFilePath) ? promptFilePath : path2.join(basePath, promptFilePath);
-  const content = await fs2.readFile(absolutePath, "utf8");
-  const tmpDir = await fs2.mkdtemp(path2.join(os2.tmpdir(), "vm0-prompt-"));
-  const promptDir = path2.join(tmpDir, "prompt");
-  await fs2.mkdir(promptDir);
-  await fs2.writeFile(path2.join(promptDir, "CLAUDE.md"), content);
+  const absolutePath = path4.isAbsolute(promptFilePath) ? promptFilePath : path4.join(basePath, promptFilePath);
+  const content = await fs4.readFile(absolutePath, "utf8");
+  const tmpDir = await fs4.mkdtemp(path4.join(os3.tmpdir(), "vm0-prompt-"));
+  const promptDir = path4.join(tmpDir, "prompt");
+  await fs4.mkdir(promptDir);
+  await fs4.writeFile(path4.join(promptDir, "CLAUDE.md"), content);
   try {
-    const tarPath = path2.join(tmpDir, "prompt.tar.gz");
-    await tar.create(
-      {
-        gzip: true,
-        file: tarPath,
-        cwd: promptDir
-      },
-      ["."]
-    );
-    const tarBuffer = await fs2.readFile(tarPath);
-    const formData = new FormData();
-    formData.append("name", storageName);
-    formData.append("type", "volume");
-    formData.append(
-      "file",
-      new Blob([new Uint8Array(tarBuffer)], { type: "application/gzip" }),
-      "volume.tar.gz"
-    );
-    const response = await apiClient.post("/api/storages", {
-      body: formData
-    });
-    if (!response.ok) {
-      const errorBody = await response.json();
-      const errorMessage = typeof errorBody.error === "string" ? errorBody.error : errorBody.error?.message || "Upload failed";
-      throw new Error(errorMessage);
-    }
-    const result = await response.json();
+    const result = await directUpload(storageName, "volume", promptDir);
     return {
       name: storageName,
       versionId: result.versionId,
       action: result.deduplicated ? "deduplicated" : "created"
     };
   } finally {
-    await fs2.rm(tmpDir, { recursive: true, force: true });
+    await fs4.rm(tmpDir, { recursive: true, force: true });
   }
 }
 async function uploadSystemSkill(skillUrl) {
   const parsed = parseGitHubTreeUrl(skillUrl);
   const storageName = getSkillStorageName(parsed);
-  const tmpDir = await fs2.mkdtemp(path2.join(os2.tmpdir(), "vm0-skill-"));
+  const tmpDir = await fs4.mkdtemp(path4.join(os3.tmpdir(), "vm0-skill-"));
   try {
     const skillDir = await downloadGitHubSkill(parsed, tmpDir);
     await validateSkillDirectory(skillDir);
-    const tarPath = path2.join(tmpDir, "skill.tar.gz");
-    await tar.create(
-      {
-        gzip: true,
-        file: tarPath,
-        cwd: skillDir
-      },
-      ["."]
-    );
-    const tarBuffer = await fs2.readFile(tarPath);
-    const formData = new FormData();
-    formData.append("name", storageName);
-    formData.append("type", "volume");
-    formData.append(
-      "file",
-      new Blob([new Uint8Array(tarBuffer)], { type: "application/gzip" }),
-      "volume.tar.gz"
-    );
-    const response = await apiClient.post("/api/storages", {
-      body: formData
-    });
-    if (!response.ok) {
-      const errorBody = await response.json();
-      const errorMessage = typeof errorBody.error === "string" ? errorBody.error : errorBody.error?.message || "Upload failed";
-      throw new Error(errorMessage);
-    }
-    const result = await response.json();
+    const result = await directUpload(storageName, "volume", skillDir);
     return {
       name: storageName,
       versionId: result.versionId,
       action: result.deduplicated ? "deduplicated" : "created"
     };
   } finally {
-    await fs2.rm(tmpDir, { recursive: true, force: true });
+    await fs4.rm(tmpDir, { recursive: true, force: true });
   }
 }
 
 // src/commands/compose.ts
 var composeCommand = new Command().name("compose").description("Create or update agent compose").argument("<config-file>", "Path to config YAML file").action(async (configFile) => {
   try {
-    if (!existsSync2(configFile)) {
+    if (!existsSync3(configFile)) {
       console.error(chalk2.red(`\u2717 Config file not found: ${configFile}`));
       process.exit(1);
     }
@@ -1003,8 +1240,8 @@ var composeCommand = new Command().name("compose").description("Create or update
 // src/commands/run.ts
 import { Command as Command2 } from "commander";
 import chalk4 from "chalk";
-import * as fs3 from "fs";
-import * as path3 from "path";
+import * as fs5 from "fs";
+import * as path5 from "path";
 import { config as dotenvConfig } from "dotenv";
 
 // src/lib/event-parser.ts
@@ -2088,15 +2325,15 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path13) {
-  if (!path13)
+function getElementAtPath(obj, path12) {
+  if (!path12)
     return obj;
-  return path13.reduce((acc, key) => acc?.[key], obj);
+  return path12.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
-  const promises6 = keys.map((key) => promisesObj[key]);
-  return Promise.all(promises6).then((results) => {
+  const promises5 = keys.map((key) => promisesObj[key]);
+  return Promise.all(promises5).then((results) => {
     const resolvedObj = {};
     for (let i = 0; i < keys.length; i++) {
       resolvedObj[keys[i]] = results[i];
@@ -2450,11 +2687,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path13, issues) {
+function prefixIssues(path12, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path13);
+    iss.path.unshift(path12);
     return iss;
   });
 }
@@ -2622,7 +2859,7 @@ function treeifyError(error43, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error44, path13 = []) => {
+  const processError = (error44, path12 = []) => {
     var _a, _b;
     for (const issue2 of error44.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -2632,7 +2869,7 @@ function treeifyError(error43, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path13, ...issue2.path];
+        const fullpath = [...path12, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -2664,8 +2901,8 @@ function treeifyError(error43, _mapper) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path13 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path13) {
+  const path12 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path12) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -14536,9 +14773,9 @@ function loadValues(cliValues, configNames) {
   const result = { ...cliValues };
   const missingNames = configNames.filter((name) => !(name in result));
   if (missingNames.length > 0) {
-    const envFilePath = path3.resolve(process.cwd(), ".env");
+    const envFilePath = path5.resolve(process.cwd(), ".env");
     let dotenvValues = {};
-    if (fs3.existsSync(envFilePath)) {
+    if (fs5.existsSync(envFilePath)) {
       const dotenvResult = dotenvConfig({ path: envFilePath });
       if (dotenvResult.parsed) {
         dotenvValues = Object.fromEntries(
@@ -15021,13 +15258,13 @@ import { Command as Command6 } from "commander";
 // src/commands/volume/init.ts
 import { Command as Command3 } from "commander";
 import chalk5 from "chalk";
-import path5 from "path";
+import path7 from "path";
 
 // src/lib/storage-utils.ts
 import { readFile as readFile4, writeFile as writeFile4, mkdir as mkdir4 } from "fs/promises";
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { parse as parseYaml2, stringify as stringifyYaml } from "yaml";
-import path4 from "path";
+import path6 from "path";
 var CONFIG_DIR2 = ".vm0";
 var CONFIG_FILE2 = "storage.yaml";
 function isValidStorageName(name) {
@@ -15038,12 +15275,12 @@ function isValidStorageName(name) {
   return pattern.test(name) && !name.includes("--");
 }
 async function readStorageConfig(basePath = process.cwd()) {
-  const configPath = path4.join(basePath, CONFIG_DIR2, CONFIG_FILE2);
-  const legacyConfigPath = path4.join(basePath, CONFIG_DIR2, "volume.yaml");
+  const configPath = path6.join(basePath, CONFIG_DIR2, CONFIG_FILE2);
+  const legacyConfigPath = path6.join(basePath, CONFIG_DIR2, "volume.yaml");
   let actualPath = null;
-  if (existsSync4(configPath)) {
+  if (existsSync5(configPath)) {
     actualPath = configPath;
-  } else if (existsSync4(legacyConfigPath)) {
+  } else if (existsSync5(legacyConfigPath)) {
     actualPath = legacyConfigPath;
   }
   if (!actualPath) {
@@ -15057,9 +15294,9 @@ async function readStorageConfig(basePath = process.cwd()) {
   return config2;
 }
 async function writeStorageConfig(storageName, basePath = process.cwd(), type = "volume") {
-  const configDir = path4.join(basePath, CONFIG_DIR2);
-  const configPath = path4.join(configDir, CONFIG_FILE2);
-  if (!existsSync4(configDir)) {
+  const configDir = path6.join(basePath, CONFIG_DIR2);
+  const configPath = path6.join(configDir, CONFIG_FILE2);
+  if (!existsSync5(configDir)) {
     await mkdir4(configDir, { recursive: true });
   }
   const config2 = {
@@ -15074,14 +15311,14 @@ async function writeStorageConfig(storageName, basePath = process.cwd(), type =
 var initCommand = new Command3().name("init").description("Initialize a volume in the current directory").action(async () => {
   try {
     const cwd = process.cwd();
-    const dirName = path5.basename(cwd);
+    const dirName = path7.basename(cwd);
     const existingConfig = await readStorageConfig(cwd);
     if (existingConfig) {
       console.log(
         chalk5.yellow(`Volume already initialized: ${existingConfig.name}`)
       );
       console.log(
-        chalk5.gray(`Config file: ${path5.join(cwd, ".vm0", "storage.yaml")}`)
+        chalk5.gray(`Config file: ${path7.join(cwd, ".vm0", "storage.yaml")}`)
       );
       return;
     }
@@ -15102,7 +15339,7 @@ var initCommand = new Command3().name("init").description("Initialize a volume i
     console.log(chalk5.green(`\u2713 Initialized volume: ${volumeName}`));
     console.log(
       chalk5.gray(
-        `\u2713 Config saved to ${path5.join(cwd, ".vm0", "storage.yaml")}`
+        `\u2713 Config saved to ${path7.join(cwd, ".vm0", "storage.yaml")}`
       )
     );
   } catch (error43) {
@@ -15117,108 +15354,6 @@ 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 path7 from "path";
-import * as fs5 from "fs";
-import * as os3 from "os";
-import * as tar3 from "tar";
-
-// src/lib/file-utils.ts
-import * as fs4 from "fs";
-import * as path6 from "path";
-import * as tar2 from "tar";
-function excludeVm0Filter(filePath) {
-  const shouldExclude = filePath === ".vm0" || filePath.startsWith(".vm0/") || filePath.startsWith("./.vm0");
-  return !shouldExclude;
-}
-function listTarFiles(tarPath) {
-  return new Promise((resolve2, reject) => {
-    const files = [];
-    tar2.list({
-      file: tarPath,
-      onReadEntry: (entry) => {
-        if (entry.type === "File") {
-          files.push(entry.path);
-        }
-      }
-    }).then(() => resolve2(files)).catch(reject);
-  });
-}
-async function listLocalFiles(dir, excludeDirs = [".vm0"]) {
-  const files = [];
-  async function walkDir(currentDir, relativePath = "") {
-    const entries = await fs4.promises.readdir(currentDir, {
-      withFileTypes: true
-    });
-    for (const entry of entries) {
-      const entryRelativePath = relativePath ? path6.join(relativePath, entry.name) : entry.name;
-      if (entry.isDirectory()) {
-        if (!excludeDirs.includes(entry.name)) {
-          await walkDir(path6.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 = path6.join(dir, localFile);
-      await fs4.promises.unlink(fullPath);
-      removedCount++;
-    }
-  }
-  await removeEmptyDirs(dir, excludeDirs);
-  return removedCount;
-}
-async function removeEmptyDirs(dir, excludeDirs = [".vm0"]) {
-  const entries = await fs4.promises.readdir(dir, { withFileTypes: true });
-  let isEmpty = true;
-  for (const entry of entries) {
-    const fullPath = path6.join(dir, entry.name);
-    if (entry.isDirectory()) {
-      if (excludeDirs.includes(entry.name)) {
-        isEmpty = false;
-      } else {
-        const subDirEmpty = await removeEmptyDirs(fullPath, excludeDirs);
-        if (subDirEmpty) {
-          await fs4.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 fs5.promises.readdir(dirPath, { withFileTypes: true });
-  for (const entry of entries) {
-    const fullPath = path7.join(dirPath, entry.name);
-    const relativePath = path7.relative(baseDir, fullPath);
-    if (relativePath.startsWith(".vm0")) {
-      continue;
-    }
-    if (entry.isDirectory()) {
-      const subFiles = await getAllFiles(fullPath, baseDir);
-      files.push(...subFiles);
-    } else {
-      files.push(fullPath);
-    }
-  }
-  return files;
-}
 function formatBytes(bytes) {
   if (bytes === 0) return "0 B";
   const k = 1024;
@@ -15239,73 +15374,16 @@ var pushCommand = new Command4().name("push").description("Push local files to c
       process.exit(1);
     }
     console.log(chalk6.cyan(`Pushing volume: ${config2.name}`));
-    console.log(chalk6.gray("Collecting files..."));
-    const files = await getAllFiles(cwd);
-    let totalSize = 0;
-    for (const file2 of files) {
-      const stats = await fs5.promises.stat(file2);
-      totalSize += stats.size;
-    }
-    if (files.length === 0) {
-      console.log(chalk6.gray("No files found (empty volume)"));
-    } else {
-      console.log(
-        chalk6.gray(`Found ${files.length} files (${formatBytes(totalSize)})`)
-      );
-    }
-    console.log(chalk6.gray("Compressing files..."));
-    const tmpDir = fs5.mkdtempSync(path7.join(os3.tmpdir(), "vm0-"));
-    const tarPath = path7.join(tmpDir, "volume.tar.gz");
-    const relativePaths = files.map((file2) => path7.relative(cwd, file2));
-    if (relativePaths.length > 0) {
-      await tar3.create(
-        {
-          gzip: true,
-          file: tarPath,
-          cwd
-        },
-        relativePaths
-      );
-    } else {
-      await tar3.create(
-        {
-          gzip: true,
-          file: tarPath,
-          cwd,
-          filter: excludeVm0Filter
-        },
-        ["."]
-      );
-    }
-    const tarBuffer = await fs5.promises.readFile(tarPath);
-    await fs5.promises.unlink(tarPath);
-    await fs5.promises.rmdir(tmpDir);
-    console.log(
-      chalk6.green(`\u2713 Compressed to ${formatBytes(tarBuffer.length)}`)
-    );
-    console.log(chalk6.gray("Uploading..."));
-    const formData = new FormData();
-    formData.append("name", config2.name);
-    formData.append("type", "volume");
-    if (options.force) {
-      formData.append("force", "true");
-    }
-    formData.append(
-      "file",
-      new Blob([tarBuffer], { type: "application/gzip" }),
-      "volume.tar.gz"
-    );
-    const response = await apiClient.post("/api/storages", {
-      body: formData
+    const result = await directUpload(config2.name, "volume", cwd, {
+      onProgress: (message) => {
+        console.log(chalk6.gray(message));
+      },
+      force: options.force
     });
-    if (!response.ok) {
-      const error43 = await response.json();
-      const message = error43.cause ? `${error43.error} (cause: ${error43.cause})` : error43.error || "Upload failed";
-      throw new Error(message);
-    }
-    const result = await response.json();
     const shortVersion = result.versionId.slice(0, 8);
-    if (result.deduplicated) {
+    if (result.empty) {
+      console.log(chalk6.yellow("No files found (empty volume)"));
+    } else if (result.deduplicated) {
       console.log(chalk6.green("\u2713 Content unchanged (deduplicated)"));
     } else {
       console.log(chalk6.green("\u2713 Upload complete"));
@@ -15328,7 +15406,7 @@ import chalk8 from "chalk";
 import path8 from "path";
 import * as fs6 from "fs";
 import * as os4 from "os";
-import * as tar4 from "tar";
+import * as tar3 from "tar";
 
 // src/lib/pull-utils.ts
 import chalk7 from "chalk";
@@ -15366,8 +15444,8 @@ var pullCommand = new Command5().name("pull").description("Pull cloud files to l
     } else {
       console.log(chalk8.cyan(`Pulling volume: ${config2.name}`));
     }
-    console.log(chalk8.gray("Downloading..."));
-    let url2 = `/api/storages?name=${encodeURIComponent(config2.name)}&type=volume`;
+    console.log(chalk8.gray("Getting download URL..."));
+    let url2 = `/api/storages/download?name=${encodeURIComponent(config2.name)}&type=volume`;
     if (versionId) {
       url2 += `&version=${encodeURIComponent(versionId)}`;
     }
@@ -15389,11 +15467,20 @@ var pullCommand = new Command5().name("pull").description("Pull cloud files to l
       }
       process.exit(1);
     }
-    if (response.status === 204) {
+    const downloadInfo = await response.json();
+    if (downloadInfo.empty) {
       await handleEmptyStorageResponse(cwd);
       return;
     }
-    const arrayBuffer = await response.arrayBuffer();
+    if (!downloadInfo.url) {
+      throw new Error("No download URL returned");
+    }
+    console.log(chalk8.gray("Downloading from S3..."));
+    const s3Response = await fetch(downloadInfo.url);
+    if (!s3Response.ok) {
+      throw new Error(`S3 download failed: ${s3Response.status}`);
+    }
+    const arrayBuffer = await s3Response.arrayBuffer();
     const tarBuffer = Buffer.from(arrayBuffer);
     console.log(chalk8.green(`\u2713 Downloaded ${formatBytes2(tarBuffer.length)}`));
     const tmpDir = fs6.mkdtempSync(path8.join(os4.tmpdir(), "vm0-"));
@@ -15411,7 +15498,7 @@ var pullCommand = new Command5().name("pull").description("Pull cloud files to l
       );
     }
     console.log(chalk8.gray("Extracting files..."));
-    await tar4.extract({
+    await tar3.extract({
       file: tarPath,
       cwd,
       gzip: true
@@ -15499,28 +15586,6 @@ var initCommand2 = new Command7().name("init").description("Initialize an artifa
 // src/commands/artifact/push.ts
 import { Command as Command8 } from "commander";
 import chalk10 from "chalk";
-import path10 from "path";
-import * as fs7 from "fs";
-import * as os5 from "os";
-import * as tar5 from "tar";
-async function getAllFiles2(dirPath, baseDir = dirPath) {
-  const files = [];
-  const entries = await fs7.promises.readdir(dirPath, { withFileTypes: true });
-  for (const entry of entries) {
-    const fullPath = path10.join(dirPath, entry.name);
-    const relativePath = path10.relative(baseDir, fullPath);
-    if (relativePath.startsWith(".vm0")) {
-      continue;
-    }
-    if (entry.isDirectory()) {
-      const subFiles = await getAllFiles2(fullPath, baseDir);
-      files.push(...subFiles);
-    } else {
-      files.push(fullPath);
-    }
-  }
-  return files;
-}
 function formatBytes3(bytes) {
   if (bytes === 0) return "0 B";
   const k = 1024;
@@ -15550,72 +15615,16 @@ var pushCommand2 = new Command8().name("push").description("Push local files to
       process.exit(1);
     }
     console.log(chalk10.cyan(`Pushing artifact: ${config2.name}`));
-    console.log(chalk10.gray("Collecting files..."));
-    const files = await getAllFiles2(cwd);
-    let totalSize = 0;
-    for (const file2 of files) {
-      const stats = await fs7.promises.stat(file2);
-      totalSize += stats.size;
-    }
-    if (files.length === 0) {
-      console.log(chalk10.gray("No files found (empty artifact)"));
-    } else {
-      console.log(
-        chalk10.gray(`Found ${files.length} files (${formatBytes3(totalSize)})`)
-      );
-    }
-    console.log(chalk10.gray("Compressing files..."));
-    const tmpDir = fs7.mkdtempSync(path10.join(os5.tmpdir(), "vm0-"));
-    const tarPath = path10.join(tmpDir, "artifact.tar.gz");
-    const relativePaths = files.map((file2) => path10.relative(cwd, file2));
-    if (relativePaths.length > 0) {
-      await tar5.create(
-        {
-          gzip: true,
-          file: tarPath,
-          cwd
-        },
-        relativePaths
-      );
-    } else {
-      await tar5.create(
-        {
-          gzip: true,
-          file: tarPath,
-          cwd,
-          filter: excludeVm0Filter
-        },
-        ["."]
-      );
-    }
-    const tarBuffer = await fs7.promises.readFile(tarPath);
-    await fs7.promises.unlink(tarPath);
-    await fs7.promises.rmdir(tmpDir);
-    console.log(
-      chalk10.green(`\u2713 Compressed to ${formatBytes3(tarBuffer.length)}`)
-    );
-    console.log(chalk10.gray("Uploading..."));
-    const formData = new FormData();
-    formData.append("name", config2.name);
-    formData.append("type", "artifact");
-    if (options.force) {
-      formData.append("force", "true");
-    }
-    formData.append(
-      "file",
-      new Blob([tarBuffer], { type: "application/gzip" }),
-      "artifact.tar.gz"
-    );
-    const response = await apiClient.post("/api/storages", {
-      body: formData
+    const result = await directUpload(config2.name, "artifact", cwd, {
+      onProgress: (message) => {
+        console.log(chalk10.gray(message));
+      },
+      force: options.force
     });
-    if (!response.ok) {
-      const error43 = await response.json();
-      throw new Error(error43.error || "Upload failed");
-    }
-    const result = await response.json();
     const shortVersion = result.versionId.slice(0, 8);
-    if (result.deduplicated) {
+    if (result.empty) {
+      console.log(chalk10.yellow("No files found (empty artifact)"));
+    } else if (result.deduplicated) {
       console.log(chalk10.green("\u2713 Content unchanged (deduplicated)"));
     } else {
       console.log(chalk10.green("\u2713 Upload complete"));
@@ -15635,10 +15644,10 @@ var pushCommand2 = new Command8().name("push").description("Push local files to
 // src/commands/artifact/pull.ts
 import { Command as Command9 } from "commander";
 import chalk11 from "chalk";
-import path11 from "path";
-import * as fs8 from "fs";
-import * as os6 from "os";
-import * as tar6 from "tar";
+import path10 from "path";
+import * as fs7 from "fs";
+import * as os5 from "os";
+import * as tar4 from "tar";
 function formatBytes4(bytes) {
   if (bytes === 0) return "0 B";
   const k = 1024;
@@ -15673,8 +15682,8 @@ var pullCommand2 = new Command9().name("pull").description("Pull cloud artifact
     } else {
       console.log(chalk11.cyan(`Pulling artifact: ${config2.name}`));
     }
-    console.log(chalk11.gray("Downloading..."));
-    let url2 = `/api/storages?name=${encodeURIComponent(config2.name)}&type=artifact`;
+    console.log(chalk11.gray("Getting download URL..."));
+    let url2 = `/api/storages/download?name=${encodeURIComponent(config2.name)}&type=artifact`;
     if (versionId) {
       url2 += `&version=${encodeURIComponent(versionId)}`;
     }
@@ -15696,16 +15705,25 @@ var pullCommand2 = new Command9().name("pull").description("Pull cloud artifact
       }
       process.exit(1);
     }
-    if (response.status === 204) {
+    const downloadInfo = await response.json();
+    if (downloadInfo.empty) {
       await handleEmptyStorageResponse(cwd);
       return;
     }
-    const arrayBuffer = await response.arrayBuffer();
+    if (!downloadInfo.url) {
+      throw new Error("No download URL returned");
+    }
+    console.log(chalk11.gray("Downloading from S3..."));
+    const s3Response = await fetch(downloadInfo.url);
+    if (!s3Response.ok) {
+      throw new Error(`S3 download failed: ${s3Response.status}`);
+    }
+    const arrayBuffer = await s3Response.arrayBuffer();
     const tarBuffer = Buffer.from(arrayBuffer);
     console.log(chalk11.green(`\u2713 Downloaded ${formatBytes4(tarBuffer.length)}`));
-    const tmpDir = fs8.mkdtempSync(path11.join(os6.tmpdir(), "vm0-"));
-    const tarPath = path11.join(tmpDir, "artifact.tar.gz");
-    await fs8.promises.writeFile(tarPath, tarBuffer);
+    const tmpDir = fs7.mkdtempSync(path10.join(os5.tmpdir(), "vm0-"));
+    const tarPath = path10.join(tmpDir, "artifact.tar.gz");
+    await fs7.promises.writeFile(tarPath, tarBuffer);
     console.log(chalk11.gray("Syncing local files..."));
     const remoteFiles = await listTarFiles(tarPath);
     const remoteFilesSet = new Set(
@@ -15718,13 +15736,13 @@ var pullCommand2 = new Command9().name("pull").description("Pull cloud artifact
       );
     }
     console.log(chalk11.gray("Extracting files..."));
-    await tar6.extract({
+    await tar4.extract({
       file: tarPath,
       cwd,
       gzip: true
     });
-    await fs8.promises.unlink(tarPath);
-    await fs8.promises.rmdir(tmpDir);
+    await fs7.promises.unlink(tarPath);
+    await fs7.promises.rmdir(tmpDir);
     console.log(chalk11.green(`\u2713 Extracted ${remoteFiles.length} files`));
   } catch (error43) {
     console.error(chalk11.red("\u2717 Pull failed"));
@@ -15742,8 +15760,8 @@ var artifactCommand = new Command10().name("artifact").description("Manage cloud
 import { Command as Command11 } from "commander";
 import chalk13 from "chalk";
 import { readFile as readFile5, mkdir as mkdir5, writeFile as writeFile5, appendFile } from "fs/promises";
-import { existsSync as existsSync5, readFileSync } from "fs";
-import path12 from "path";
+import { existsSync as existsSync6, readFileSync } from "fs";
+import path11 from "path";
 import { spawn as spawn2 } from "child_process";
 import { parse as parseYaml3 } from "yaml";
 import { config as dotenvConfig2 } from "dotenv";
@@ -15755,6 +15773,13 @@ import chalk12 from "chalk";
 var PACKAGE_NAME = "@vm0/cli";
 var NPM_REGISTRY_URL = `https://registry.npmjs.org/${encodeURIComponent(PACKAGE_NAME)}/latest`;
 var TIMEOUT_MS = 5e3;
+function detectPackageManager() {
+  const execPath = process.argv[1] ?? "";
+  if (execPath.includes("pnpm")) {
+    return "pnpm";
+  }
+  return "npm";
+}
 function escapeForShell(str) {
   return `"${str.replace(/"/g, '\\"')}"`;
 }
@@ -15789,12 +15814,14 @@ function getLatestVersion() {
     });
   });
 }
-function performUpgrade() {
+function performUpgrade(packageManager) {
   return new Promise((resolve2) => {
-    const npm = process.platform === "win32" ? "npm.cmd" : "npm";
-    const child = spawn(npm, ["install", "-g", `${PACKAGE_NAME}@latest`], {
+    const isWindows = process.platform === "win32";
+    const command = isWindows ? `${packageManager}.cmd` : packageManager;
+    const args = packageManager === "pnpm" ? ["add", "-g", `${PACKAGE_NAME}@latest`] : ["install", "-g", `${PACKAGE_NAME}@latest`];
+    const child = spawn(command, args, {
       stdio: "inherit",
-      shell: process.platform === "win32"
+      shell: isWindows
     });
     child.on("close", (code) => {
       resolve2(code === 0);
@@ -15826,8 +15853,9 @@ async function checkAndUpgrade(currentVersion, prompt) {
     )
   );
   console.log();
-  console.log("Upgrading...");
-  const success2 = await performUpgrade();
+  const packageManager = detectPackageManager();
+  console.log(`Upgrading via ${packageManager}...`);
+  const success2 = await performUpgrade(packageManager);
   if (success2) {
     console.log(chalk12.green(`Upgraded to ${latestVersion}`));
     console.log();
@@ -15838,6 +15866,8 @@ async function checkAndUpgrade(currentVersion, prompt) {
   console.log();
   console.log(chalk12.red("Upgrade failed. Please run manually:"));
   console.log(chalk12.cyan(`  npm install -g ${PACKAGE_NAME}@latest`));
+  console.log(chalk12.gray("  # or"));
+  console.log(chalk12.cyan(`  pnpm add -g ${PACKAGE_NAME}@latest`));
   console.log();
   console.log("Then re-run:");
   console.log(chalk12.cyan(`  ${buildRerunCommand(prompt)}`));
@@ -15931,7 +15961,7 @@ function extractRequiredVarNames(config2) {
 }
 function checkMissingVariables(varNames, envFilePath) {
   let dotenvValues = {};
-  if (existsSync5(envFilePath)) {
+  if (existsSync6(envFilePath)) {
     const result = dotenvConfig2({ path: envFilePath });
     if (result.parsed) {
       dotenvValues = result.parsed;
@@ -15949,7 +15979,7 @@ function checkMissingVariables(varNames, envFilePath) {
 }
 async function generateEnvPlaceholders(missingVars, envFilePath) {
   const placeholders = missingVars.map((name) => `${name}=`).join("\n");
-  if (existsSync5(envFilePath)) {
+  if (existsSync6(envFilePath)) {
     const existingContent = readFileSync(envFilePath, "utf8");
     const needsNewline = existingContent.length > 0 && !existingContent.endsWith("\n");
     const prefix = needsNewline ? "\n" : "";
@@ -15961,13 +15991,13 @@ async function generateEnvPlaceholders(missingVars, envFilePath) {
   }
 }
 var cookCommand = new Command11().name("cook").description("One-click agent preparation and execution from vm0.yaml").argument("[prompt]", "Prompt for the agent").action(async (prompt) => {
-  const shouldExit = await checkAndUpgrade("4.12.0", prompt);
+  const shouldExit = await checkAndUpgrade("4.13.0", prompt);
   if (shouldExit) {
     process.exit(0);
   }
   const cwd = process.cwd();
   console.log(chalk13.blue(`Reading config: ${CONFIG_FILE3}`));
-  if (!existsSync5(CONFIG_FILE3)) {
+  if (!existsSync6(CONFIG_FILE3)) {
     console.error(chalk13.red(`\u2717 Config file not found: ${CONFIG_FILE3}`));
     process.exit(1);
   }
@@ -15995,7 +16025,7 @@ var cookCommand = new Command11().name("cook").description("One-click agent prep
   );
   const requiredVarNames = extractRequiredVarNames(config2);
   if (requiredVarNames.length > 0) {
-    const envFilePath = path12.join(cwd, ".env");
+    const envFilePath = path11.join(cwd, ".env");
     const missingVars = checkMissingVariables(requiredVarNames, envFilePath);
     if (missingVars.length > 0) {
       await generateEnvPlaceholders(missingVars, envFilePath);
@@ -16015,9 +16045,9 @@ var cookCommand = new Command11().name("cook").description("One-click agent prep
     console.log();
     console.log(chalk13.blue("Processing volumes..."));
     for (const volumeConfig of Object.values(config2.volumes)) {
-      const volumeDir = path12.join(cwd, volumeConfig.name);
+      const volumeDir = path11.join(cwd, volumeConfig.name);
       console.log(chalk13.gray(`  ${volumeConfig.name}/`));
-      if (!existsSync5(volumeDir)) {
+      if (!existsSync6(volumeDir)) {
         console.error(
           chalk13.red(
             `    \u2717 Directory not found. Create the directory and add files first.`
@@ -16050,10 +16080,10 @@ var cookCommand = new Command11().name("cook").description("One-click agent prep
   }
   console.log();
   console.log(chalk13.blue("Processing artifact..."));
-  const artifactDir = path12.join(cwd, ARTIFACT_DIR);
+  const artifactDir = path11.join(cwd, ARTIFACT_DIR);
   console.log(chalk13.gray(`  ${ARTIFACT_DIR}/`));
   try {
-    if (!existsSync5(artifactDir)) {
+    if (!existsSync6(artifactDir)) {
       await mkdir5(artifactDir, { recursive: true });
       console.log(chalk13.green(`    \u2713 Created directory`));
     }
@@ -16147,12 +16177,12 @@ import { Command as Command15 } from "commander";
 import { Command as Command12 } from "commander";
 import chalk14 from "chalk";
 import { readFile as readFile6 } from "fs/promises";
-import { existsSync as existsSync6 } from "fs";
-var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+import { existsSync as existsSync7 } from "fs";
+var sleep2 = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 var buildCommand = new Command12().name("build").description("Build a custom image from a Dockerfile").requiredOption("-f, --file <path>", "Path to Dockerfile").requiredOption("-n, --name <name>", "Name for the image").option("--delete-existing", "Delete existing image before building").action(
   async (options) => {
     const { file: file2, name, deleteExisting } = options;
-    if (!existsSync6(file2)) {
+    if (!existsSync7(file2)) {
       console.error(chalk14.red(`\u2717 Dockerfile not found: ${file2}`));
       process.exit(1);
     }
@@ -16205,7 +16235,7 @@ var buildCommand = new Command12().name("build").description("Build a custom ima
         logsOffset = statusData.logsOffset;
         status = statusData.status;
         if (status === "building") {
-          await sleep(2e3);
+          await sleep2(2e3);
         }
       }
       console.log();
@@ -16598,7 +16628,7 @@ function handleError(error43, runId) {
 
 // src/index.ts
 var program = new Command17();
-program.name("vm0").description("VM0 CLI - A modern build tool").version("4.12.0");
+program.name("vm0").description("VM0 CLI - A modern build tool").version("4.13.0");
 program.command("info").description("Display environment information").action(async () => {
   console.log(chalk18.cyan("System Information:"));
   console.log(`Node Version: ${process.version}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vm0/cli",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "description": "CLI application",
   "repository": {
     "type": "git",