@vm0/cli 3.4.0 → 3.6.0

package/index.js

@@ -736,10 +736,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path9) {
-  if (!path9)
+function getElementAtPath(obj, path10) {
+  if (!path10)
     return obj;
-  return path9.reduce((acc, key) => acc?.[key], obj);
+  return path10.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1098,11 +1098,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path9, issues) {
+function prefixIssues(path10, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path9);
+    iss.path.unshift(path10);
     return iss;
   });
 }
@@ -1270,7 +1270,7 @@ function treeifyError(error43, _mapper) {
     return issue2.message;
   };
   const result = { errors: [] };
-  const processError = (error44, path9 = []) => {
+  const processError = (error44, path10 = []) => {
     var _a, _b;
     for (const issue2 of error44.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -1280,7 +1280,7 @@ function treeifyError(error43, _mapper) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path9, ...issue2.path];
+        const fullpath = [...path10, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1312,8 +1312,8 @@ function treeifyError(error43, _mapper) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path9 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path9) {
+  const path10 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path10) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -12147,8 +12147,8 @@ var helloContract = c.router({
 var FOO = "hello";
 
 // src/index.ts
-import { Command as Command11 } from "commander";
-import chalk11 from "chalk";
+import { Command as Command16 } from "commander";
+import chalk15 from "chalk";
 
 // src/lib/auth.ts
 import chalk from "chalk";
@@ -12352,6 +12352,19 @@ var ApiClient = class {
     }
     return await response.json();
   }
+  async getComposeById(id) {
+    const baseUrl = await this.getBaseUrl();
+    const headers = await this.getHeaders();
+    const response = await fetch(`${baseUrl}/api/agent/composes/${id}`, {
+      method: "GET",
+      headers
+    });
+    if (!response.ok) {
+      const error43 = await response.json();
+      throw new Error(error43.error?.message || `Compose not found: ${id}`);
+    }
+    return await response.json();
+  }
   /**
    * Resolve a version specifier to a full version ID
    * Supports: "latest", full hash (64 chars), or hash prefix (8+ chars)
@@ -12389,6 +12402,7 @@ var ApiClient = class {
   /**
    * Create a run with unified request format
    * Supports new runs, checkpoint resume, and session continue
+   * Note: Environment variables are expanded server-side from templateVars
    */
   async createRun(body) {
     const baseUrl = await this.getBaseUrl();
@@ -12439,7 +12453,7 @@ var ApiClient = class {
   /**
    * Generic GET request
    */
-  async get(path9) {
+  async get(path10) {
     const baseUrl = await this.getBaseUrl();
     const token = await getToken();
     if (!token) {
@@ -12452,7 +12466,7 @@ var ApiClient = class {
     if (bypassSecret) {
       headers["x-vercel-protection-bypass"] = bypassSecret;
     }
-    return fetch(`${baseUrl}${path9}`, {
+    return fetch(`${baseUrl}${path10}`, {
       method: "GET",
       headers
     });
@@ -12460,7 +12474,7 @@ var ApiClient = class {
   /**
    * Generic POST request
    */
-  async post(path9, options) {
+  async post(path10, options) {
     const baseUrl = await this.getBaseUrl();
     const token = await getToken();
     if (!token) {
@@ -12473,12 +12487,33 @@ var ApiClient = class {
     if (bypassSecret) {
       headers["x-vercel-protection-bypass"] = bypassSecret;
     }
-    return fetch(`${baseUrl}${path9}`, {
+    return fetch(`${baseUrl}${path10}`, {
       method: "POST",
       headers,
       body: options?.body
     });
   }
+  /**
+   * Generic DELETE request
+   */
+  async delete(path10) {
+    const baseUrl = await this.getBaseUrl();
+    const token = await getToken();
+    if (!token) {
+      throw new Error("Not authenticated. Run: vm0 auth login");
+    }
+    const headers = {
+      Authorization: `Bearer ${token}`
+    };
+    const bypassSecret = process.env.VERCEL_AUTOMATION_BYPASS_SECRET;
+    if (bypassSecret) {
+      headers["x-vercel-protection-bypass"] = bypassSecret;
+    }
+    return fetch(`${baseUrl}${path10}`, {
+      method: "DELETE",
+      headers
+    });
+  }
 };
 var apiClient = new ApiClient();
 
@@ -12560,6 +12595,23 @@ function validateAgentCompose(config2) {
       error: "Missing or invalid agent.provider (must be a string)"
     };
   }
+  if (agent.environment !== void 0) {
+    if (agent.environment === null || typeof agent.environment !== "object" || Array.isArray(agent.environment)) {
+      return {
+        valid: false,
+        error: "agent.environment must be an object with string keys and values"
+      };
+    }
+    const env = agent.environment;
+    for (const [key, value] of Object.entries(env)) {
+      if (typeof value !== "string") {
+        return {
+          valid: false,
+          error: `agent.environment.${key} must be a string`
+        };
+      }
+    }
+  }
   const agentVolumes = agent.volumes;
   if (agentVolumes && Array.isArray(agentVolumes) && agentVolumes.length > 0) {
     const volumesSection = cfg.volumes;
@@ -12600,62 +12652,6 @@ function validateAgentCompose(config2) {
   return { valid: true };
 }
 
-// src/lib/env-expander.ts
-function expandEnvVars(value) {
-  return value.replace(/\$\{([^}]+)\}/g, (_, varName) => {
-    return process.env[varName] ?? "";
-  });
-}
-function extractEnvVarReferences(obj) {
-  const varNames = /* @__PURE__ */ new Set();
-  function scan(value) {
-    if (typeof value === "string") {
-      const matches = value.matchAll(/\$\{([^}]+)\}/g);
-      for (const match of matches) {
-        const varName = match[1];
-        if (varName) {
-          varNames.add(varName);
-        }
-      }
-    } else if (Array.isArray(value)) {
-      for (const item of value) {
-        scan(item);
-      }
-    } else if (value !== null && typeof value === "object") {
-      for (const val of Object.values(value)) {
-        scan(val);
-      }
-    }
-  }
-  scan(obj);
-  return Array.from(varNames);
-}
-function validateEnvVars(varNames) {
-  const missing = [];
-  for (const varName of varNames) {
-    if (process.env[varName] === void 0) {
-      missing.push(varName);
-    }
-  }
-  return missing;
-}
-function expandEnvVarsInObject(obj) {
-  if (typeof obj === "string") {
-    return expandEnvVars(obj);
-  }
-  if (Array.isArray(obj)) {
-    return obj.map((item) => expandEnvVarsInObject(item));
-  }
-  if (obj !== null && typeof obj === "object") {
-    const result = {};
-    for (const [key, value] of Object.entries(obj)) {
-      result[key] = expandEnvVarsInObject(value);
-    }
-    return result;
-  }
-  return obj;
-}
-
 // src/commands/build.ts
 var buildCommand = new Command().name("build").description("Create or update agent compose").argument("<config-file>", "Path to config YAML file").action(async (configFile) => {
   try {
@@ -12674,24 +12670,6 @@ var buildCommand = new Command().name("build").description("Create or update age
       }
       process.exit(1);
     }
-    const referencedVars = extractEnvVarReferences(config2);
-    const missingVars = validateEnvVars(referencedVars);
-    if (missingVars.length > 0) {
-      console.error(chalk2.red("\u2717 Missing required environment variables:"));
-      for (const varName of missingVars) {
-        console.error(chalk2.red(`  - ${varName}`));
-      }
-      console.error();
-      console.error(
-        chalk2.gray("Please set these variables before running 'vm0 build'.")
-      );
-      console.error(chalk2.gray("Example:"));
-      for (const varName of missingVars) {
-        console.error(chalk2.gray(`  export ${varName}=your-value`));
-      }
-      process.exit(1);
-    }
-    config2 = expandEnvVarsInObject(config2);
     const validation = validateAgentCompose(config2);
     if (!validation.valid) {
       console.error(chalk2.red(`\u2717 ${validation.error}`));
@@ -13246,7 +13224,7 @@ var runCmd = new Command2().name("run").description("Execute an agent").argument
       if (isUUID(name)) {
         composeId = name;
         if (verbose) {
-          console.log(chalk4.gray(`  Using compose ID: ${composeId}`));
+          console.log(chalk4.gray(`  Using compose ID: ${identifier}`));
         }
       } else {
         if (verbose) {
@@ -14204,15 +14182,298 @@ var pullCommand2 = new Command9().name("pull").description("Pull cloud artifact
 // src/commands/artifact/index.ts
 var artifactCommand = new Command10().name("artifact").description("Manage cloud artifacts (work products)").addCommand(initCommand2).addCommand(pushCommand2).addCommand(pullCommand2);
 
+// src/commands/secret/index.ts
+import { Command as Command14 } from "commander";
+
+// src/commands/secret/set.ts
+import { Command as Command11 } from "commander";
+import chalk11 from "chalk";
+var setCommand = new Command11().name("set").description("Create or update a secret").argument(
+  "<name>",
+  "Secret name (must start with letter, alphanumeric and underscores only)"
+).argument("<value>", "Secret value").action(async (name, value) => {
+  try {
+    const nameRegex = /^[a-zA-Z][a-zA-Z0-9_]*$/;
+    if (!nameRegex.test(name)) {
+      console.error(chalk11.red("\u2717 Invalid secret name"));
+      console.error(
+        chalk11.gray(
+          "  Must start with a letter and contain only letters, numbers, and underscores"
+        )
+      );
+      process.exit(1);
+    }
+    if (name.length > 255) {
+      console.error(chalk11.red("\u2717 Secret name too long (max 255 characters)"));
+      process.exit(1);
+    }
+    const response = await apiClient.post("/api/secrets", {
+      body: JSON.stringify({ name, value })
+    });
+    if (!response.ok) {
+      const error43 = await response.json();
+      throw new Error(error43.error?.message || "Failed to set secret");
+    }
+    const result = await response.json();
+    if (result.action === "created") {
+      console.log(chalk11.green(`\u2713 Secret created: ${name}`));
+    } else {
+      console.log(chalk11.green(`\u2713 Secret updated: ${name}`));
+    }
+  } catch (error43) {
+    console.error(chalk11.red("\u2717 Failed to set secret"));
+    if (error43 instanceof Error) {
+      console.error(chalk11.gray(`  ${error43.message}`));
+    }
+    process.exit(1);
+  }
+});
+
+// src/commands/secret/list.ts
+import { Command as Command12 } from "commander";
+import chalk12 from "chalk";
+var listCommand = new Command12().name("list").alias("ls").description("List all secrets (names only)").action(async () => {
+  try {
+    const response = await apiClient.get("/api/secrets");
+    if (!response.ok) {
+      const error43 = await response.json();
+      throw new Error(error43.error?.message || "Failed to list secrets");
+    }
+    const result = await response.json();
+    if (result.secrets.length === 0) {
+      console.log(chalk12.gray("No secrets found"));
+      console.log(
+        chalk12.gray("  Create one with: vm0 secret set <name> <value>")
+      );
+      return;
+    }
+    console.log(chalk12.cyan("Secrets:"));
+    for (const secret of result.secrets) {
+      const updatedAt = new Date(secret.updatedAt).toLocaleDateString();
+      console.log(
+        `  ${chalk12.white(secret.name)} ${chalk12.gray(`(updated: ${updatedAt})`)}`
+      );
+    }
+    console.log(chalk12.gray(`
+Total: ${result.secrets.length} secret(s)`));
+  } catch (error43) {
+    console.error(chalk12.red("\u2717 Failed to list secrets"));
+    if (error43 instanceof Error) {
+      console.error(chalk12.gray(`  ${error43.message}`));
+    }
+    process.exit(1);
+  }
+});
+
+// src/commands/secret/delete.ts
+import { Command as Command13 } from "commander";
+import chalk13 from "chalk";
+var deleteCommand = new Command13().name("delete").alias("rm").description("Delete a secret").argument("<name>", "Secret name to delete").action(async (name) => {
+  try {
+    const response = await apiClient.delete(
+      `/api/secrets?name=${encodeURIComponent(name)}`
+    );
+    if (!response.ok) {
+      const error43 = await response.json();
+      throw new Error(error43.error?.message || `Secret not found: ${name}`);
+    }
+    const result = await response.json();
+    if (result.deleted) {
+      console.log(chalk13.green(`\u2713 Secret deleted: ${name}`));
+    }
+  } catch (error43) {
+    console.error(chalk13.red("\u2717 Failed to delete secret"));
+    if (error43 instanceof Error) {
+      console.error(chalk13.gray(`  ${error43.message}`));
+    }
+    process.exit(1);
+  }
+});
+
+// src/commands/secret/index.ts
+var secretCommand = new Command14().name("secret").description("Manage secrets for agent compose configurations").addCommand(setCommand).addCommand(listCommand).addCommand(deleteCommand);
+
+// src/commands/cook.ts
+import { Command as Command15 } from "commander";
+import chalk14 from "chalk";
+import { readFile as readFile4, mkdir as mkdir3 } from "fs/promises";
+import { existsSync as existsSync4 } from "fs";
+import path9 from "path";
+import { spawn } from "child_process";
+import { parse as parseYaml3 } from "yaml";
+var CONFIG_FILE3 = "vm0.yaml";
+var ARTIFACT_DIR = "artifact";
+function execVm0Command(args, options = {}) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn("vm0", args, {
+      cwd: options.cwd,
+      stdio: options.silent ? "pipe" : ["inherit", "inherit", "inherit"],
+      shell: process.platform === "win32"
+    });
+    let stdout = "";
+    let stderr = "";
+    if (options.silent) {
+      proc.stdout?.on("data", (data) => {
+        stdout += data.toString();
+      });
+      proc.stderr?.on("data", (data) => {
+        stderr += data.toString();
+      });
+    }
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve(stdout);
+      } else {
+        reject(new Error(stderr || `Command failed with exit code ${code}`));
+      }
+    });
+    proc.on("error", (err) => {
+      reject(err);
+    });
+  });
+}
+var cookCommand = new Command15().name("cook").description("One-click agent preparation and execution from vm0.yaml").argument("[prompt]", "Prompt for the agent").action(async (prompt) => {
+  const cwd = process.cwd();
+  console.log(chalk14.blue(`Reading config: ${CONFIG_FILE3}`));
+  if (!existsSync4(CONFIG_FILE3)) {
+    console.error(chalk14.red(`\u2717 Config file not found: ${CONFIG_FILE3}`));
+    process.exit(1);
+  }
+  let config2;
+  try {
+    const content = await readFile4(CONFIG_FILE3, "utf8");
+    config2 = parseYaml3(content);
+  } catch (error43) {
+    console.error(chalk14.red("\u2717 Invalid YAML format"));
+    if (error43 instanceof Error) {
+      console.error(chalk14.gray(`  ${error43.message}`));
+    }
+    process.exit(1);
+  }
+  const validation = validateAgentCompose(config2);
+  if (!validation.valid) {
+    console.error(chalk14.red(`\u2717 ${validation.error}`));
+    process.exit(1);
+  }
+  const agentNames = Object.keys(config2.agents);
+  const agentName = agentNames[0];
+  const volumeCount = config2.volumes ? Object.keys(config2.volumes).length : 0;
+  console.log(
+    chalk14.green(`\u2713 Config validated: 1 agent, ${volumeCount} volume(s)`)
+  );
+  if (config2.volumes && Object.keys(config2.volumes).length > 0) {
+    console.log();
+    console.log(chalk14.blue("Processing volumes..."));
+    for (const volumeConfig of Object.values(config2.volumes)) {
+      const volumeDir = path9.join(cwd, volumeConfig.name);
+      console.log(chalk14.gray(`  ${volumeConfig.name}/`));
+      if (!existsSync4(volumeDir)) {
+        console.error(
+          chalk14.red(
+            `    \u2717 Directory not found. Create the directory and add files first.`
+          )
+        );
+        process.exit(1);
+      }
+      try {
+        const existingConfig = await readStorageConfig(volumeDir);
+        if (!existingConfig) {
+          await execVm0Command(["volume", "init"], {
+            cwd: volumeDir,
+            silent: true
+          });
+          console.log(chalk14.green(`    \u2713 Initialized`));
+        }
+        await execVm0Command(["volume", "push"], {
+          cwd: volumeDir,
+          silent: true
+        });
+        console.log(chalk14.green(`    \u2713 Pushed`));
+      } catch (error43) {
+        console.error(chalk14.red(`    \u2717 Failed`));
+        if (error43 instanceof Error) {
+          console.error(chalk14.gray(`      ${error43.message}`));
+        }
+        process.exit(1);
+      }
+    }
+  }
+  console.log();
+  console.log(chalk14.blue("Processing artifact..."));
+  const artifactDir = path9.join(cwd, ARTIFACT_DIR);
+  console.log(chalk14.gray(`  ${ARTIFACT_DIR}/`));
+  try {
+    if (!existsSync4(artifactDir)) {
+      await mkdir3(artifactDir, { recursive: true });
+      console.log(chalk14.green(`    \u2713 Created directory`));
+    }
+    const existingConfig = await readStorageConfig(artifactDir);
+    if (!existingConfig) {
+      await execVm0Command(["artifact", "init"], {
+        cwd: artifactDir,
+        silent: true
+      });
+      console.log(chalk14.green(`    \u2713 Initialized`));
+    }
+    await execVm0Command(["artifact", "push"], {
+      cwd: artifactDir,
+      silent: true
+    });
+    console.log(chalk14.green(`    \u2713 Pushed`));
+  } catch (error43) {
+    console.error(chalk14.red(`    \u2717 Failed`));
+    if (error43 instanceof Error) {
+      console.error(chalk14.gray(`      ${error43.message}`));
+    }
+    process.exit(1);
+  }
+  console.log();
+  console.log(chalk14.blue("Building compose..."));
+  try {
+    await execVm0Command(["build", CONFIG_FILE3], {
+      cwd,
+      silent: true
+    });
+    console.log(chalk14.green(`\u2713 Compose built: ${agentName}`));
+  } catch (error43) {
+    console.error(chalk14.red(`\u2717 Build failed`));
+    if (error43 instanceof Error) {
+      console.error(chalk14.gray(`  ${error43.message}`));
+    }
+    process.exit(1);
+  }
+  if (prompt) {
+    console.log();
+    console.log(chalk14.blue(`Running agent: ${agentName}`));
+    console.log();
+    try {
+      await execVm0Command(
+        ["run", agentName, "--artifact-name", ARTIFACT_DIR, prompt],
+        { cwd, silent: false }
+      );
+    } catch {
+      process.exit(1);
+    }
+  } else {
+    console.log();
+    console.log("  Run your agent:");
+    console.log(
+      chalk14.cyan(
+        `    vm0 run ${agentName} --artifact-name ${ARTIFACT_DIR} "your prompt"`
+      )
+    );
+  }
+});
+
 // src/index.ts
-var program = new Command11();
-program.name("vm0").description("VM0 CLI - A modern build tool").version("3.4.0");
+var program = new Command16();
+program.name("vm0").description("VM0 CLI - A modern build tool").version("3.6.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}`));
+  console.log(chalk15.blue("Welcome to the VM0 CLI!"));
+  console.log(chalk15.green(`Core says: ${FOO}`));
 });
 program.command("info").description("Display environment information").action(async () => {
-  console.log(chalk11.cyan("System Information:"));
+  console.log(chalk15.cyan("System Information:"));
   console.log(`Node Version: ${process.version}`);
   console.log(`Platform: ${process.platform}`);
   console.log(`Architecture: ${process.arch}`);
@@ -14233,6 +14494,8 @@ program.addCommand(buildCommand);
 program.addCommand(runCommand);
 program.addCommand(volumeCommand);
 program.addCommand(artifactCommand);
+program.addCommand(secretCommand);
+program.addCommand(cookCommand);
 if (process.argv[1]?.endsWith("index.js") || process.argv[1]?.endsWith("index.ts") || process.argv[1]?.endsWith("vm0")) {
   program.parse();
 }

package/package.json

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