@vm0/cli 4.30.0 → 4.31.0

package/index.js

@@ -190,10 +190,11 @@ async function setupToken() {
 // src/commands/compose.ts
 import { Command } from "commander";
 import chalk2 from "chalk";
-import { readFile as readFile3 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 import { existsSync as existsSync3 } from "fs";
 import { dirname as dirname2 } from "path";
-import { parse as parseYaml } from "yaml";
+import { parse as parseYaml2 } from "yaml";
+import prompts from "prompts";
 
 // ../../packages/core/src/variable-expander.ts
 var VARIABLE_PATTERN = /\$\{\{\s*(env|vars|secrets)\.([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g;
@@ -14250,6 +14251,7 @@ import * as path from "path";
 import * as os from "os";
 import { exec } from "child_process";
 import { promisify } from "util";
+import { parse as parseYaml } from "yaml";
 var execAsync = promisify(exec);
 function parseGitHubTreeUrl2(url2) {
   const parsed = parseGitHubTreeUrl(url2);
@@ -14295,6 +14297,37 @@ async function validateSkillDirectory(skillDir) {
     );
   }
 }
+function parseSkillFrontmatter(content) {
+  const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!frontmatterMatch) {
+    return {};
+  }
+  const yamlContent = frontmatterMatch[1];
+  if (!yamlContent) {
+    return {};
+  }
+  let parsed;
+  try {
+    parsed = parseYaml(yamlContent);
+  } catch {
+    return {};
+  }
+  if (!parsed || typeof parsed !== "object") {
+    return {};
+  }
+  const data = parsed;
+  return {
+    name: typeof data.name === "string" ? data.name : void 0,
+    description: typeof data.description === "string" ? data.description : void 0,
+    vm0_secrets: Array.isArray(data.vm0_secrets) ? data.vm0_secrets.filter((s) => typeof s === "string") : void 0,
+    vm0_vars: Array.isArray(data.vm0_vars) ? data.vm0_vars.filter((s) => typeof s === "string") : void 0
+  };
+}
+async function readSkillFrontmatter(skillDir) {
+  const skillMdPath = path.join(skillDir, "SKILL.md");
+  const content = await fs.readFile(skillMdPath, "utf8");
+  return parseSkillFrontmatter(content);
+}
 
 // src/lib/direct-upload.ts
 import { createHash } from "crypto";
@@ -14631,11 +14664,14 @@ async function uploadSkill(skillUrl) {
   try {
     const skillDir = await downloadGitHubSkill(parsed, tmpDir);
     await validateSkillDirectory(skillDir);
+    const frontmatter = await readSkillFrontmatter(skillDir);
     const result = await directUpload(storageName, "volume", skillDir);
     return {
       name: storageName,
       versionId: result.versionId,
-      action: result.deduplicated ? "deduplicated" : "created"
+      action: result.deduplicated ? "deduplicated" : "created",
+      skillName: parsed.skillName,
+      frontmatter
     };
   } finally {
     await fs4.rm(tmpDir, { recursive: true, force: true });
@@ -14670,16 +14706,16 @@ function transformExperimentalShorthand(agent) {
     agent.environment = environment;
   }
 }
-var composeCommand = new Command().name("compose").description("Create or update agent compose").argument("<config-file>", "Path to config YAML file").action(async (configFile) => {
+var composeCommand = new Command().name("compose").description("Create or update agent compose").argument("<config-file>", "Path to config YAML file").option("-y, --yes", "Skip confirmation prompts for skill requirements").action(async (configFile, options) => {
   try {
     if (!existsSync3(configFile)) {
       console.error(chalk2.red(`\u2717 Config file not found: ${configFile}`));
       process.exit(1);
     }
-    const content = await readFile3(configFile, "utf8");
+    const content = await readFile4(configFile, "utf8");
     let config2;
     try {
-      config2 = parseYaml(content);
+      config2 = parseYaml2(content);
     } catch (error43) {
       console.error(chalk2.red("\u2717 Invalid YAML format"));
       if (error43 instanceof Error) {
@@ -14756,6 +14792,7 @@ var composeCommand = new Command().name("compose").description("Create or update
         process.exit(1);
       }
     }
+    const skillResults = [];
     if (agent.skills && Array.isArray(agent.skills)) {
       const skillUrls = agent.skills;
       console.log(`Uploading ${skillUrls.length} skill(s)...`);
@@ -14763,9 +14800,10 @@ var composeCommand = new Command().name("compose").description("Create or update
         try {
           console.log(chalk2.dim(`  Downloading: ${skillUrl}`));
           const result = await uploadSkill(skillUrl);
+          skillResults.push(result);
           console.log(
             chalk2.green(
-              `  \u2713 Skill ${result.action === "deduplicated" ? "(unchanged)" : "uploaded"}: ${result.versionId.slice(0, 8)}`
+              `  \u2713 Skill ${result.action === "deduplicated" ? "(unchanged)" : "uploaded"}: ${result.skillName} (${result.versionId.slice(0, 8)})`
             )
           );
         } catch (error43) {
@@ -14777,6 +14815,83 @@ var composeCommand = new Command().name("compose").description("Create or update
         }
       }
     }
+    const skillSecrets = /* @__PURE__ */ new Map();
+    const skillVars = /* @__PURE__ */ new Map();
+    for (const result of skillResults) {
+      const { frontmatter, skillName } = result;
+      if (frontmatter.vm0_secrets) {
+        for (const secret of frontmatter.vm0_secrets) {
+          if (!skillSecrets.has(secret)) {
+            skillSecrets.set(secret, []);
+          }
+          skillSecrets.get(secret).push(skillName);
+        }
+      }
+      if (frontmatter.vm0_vars) {
+        for (const varName of frontmatter.vm0_vars) {
+          if (!skillVars.has(varName)) {
+            skillVars.set(varName, []);
+          }
+          skillVars.get(varName).push(skillName);
+        }
+      }
+    }
+    const environment = agent.environment || {};
+    const newSecrets = [...skillSecrets.entries()].filter(
+      ([name]) => !(name in environment)
+    );
+    const newVars = [...skillVars.entries()].filter(
+      ([name]) => !(name in environment)
+    );
+    if (newSecrets.length > 0 || newVars.length > 0) {
+      console.log();
+      console.log(
+        chalk2.bold("Skills require the following environment variables:")
+      );
+      console.log();
+      if (newSecrets.length > 0) {
+        console.log(chalk2.cyan("  Secrets:"));
+        for (const [name, skills] of newSecrets) {
+          console.log(`    ${name.padEnd(24)} <- ${skills.join(", ")}`);
+        }
+      }
+      if (newVars.length > 0) {
+        console.log(chalk2.cyan("  Vars:"));
+        for (const [name, skills] of newVars) {
+          console.log(`    ${name.padEnd(24)} <- ${skills.join(", ")}`);
+        }
+      }
+      console.log();
+      if (!options.yes) {
+        if (!process.stdin.isTTY) {
+          console.error(
+            chalk2.red(
+              "\u2717 Non-interactive terminal. Use --yes flag to skip confirmation."
+            )
+          );
+          process.exit(1);
+        }
+        const response2 = await prompts({
+          type: "confirm",
+          name: "value",
+          message: "Proceed with compose?",
+          initial: true
+        });
+        if (!response2.value) {
+          console.log(chalk2.yellow("Compose cancelled."));
+          process.exit(0);
+        }
+      }
+      for (const [name] of newSecrets) {
+        environment[name] = `\${{ secrets.${name} }}`;
+      }
+      for (const [name] of newVars) {
+        environment[name] = `\${{ vars.${name} }}`;
+      }
+      if (Object.keys(environment).length > 0) {
+        agent.environment = environment;
+      }
+    }
     console.log("Uploading compose...");
     const response = await apiClient.createOrUpdateCompose({
       content: config2
@@ -15815,6 +15930,16 @@ var runCmd = new Command2().name("run").description("Execute an agent").argument
   }
 );
 runCmd.command("resume").description("Resume an agent run from a checkpoint (uses all snapshot data)").argument("<checkpointId>", "Checkpoint ID to resume from").argument("<prompt>", "Prompt for the resumed agent").option(
+  "--vars <KEY=value>",
+  "Variables for ${{ vars.xxx }} (repeatable, falls back to env vars and .env)",
+  collectKeyValue,
+  {}
+).option(
+  "--secrets <KEY=value>",
+  "Secrets for ${{ secrets.xxx }} (repeatable, required for resume)",
+  collectKeyValue,
+  {}
+).option(
   "--volume-version <name=version>",
   "Volume version override (repeatable)",
   collectVolumeVersions,
@@ -15824,6 +15949,8 @@ runCmd.command("resume").description("Resume an agent run from a checkpoint (use
     const startTimestamp = /* @__PURE__ */ new Date();
     const allOpts = command.optsWithGlobals();
     const verbose = options.verbose || allOpts.verbose;
+    const vars = { ...allOpts.vars, ...options.vars };
+    const secrets = { ...allOpts.secrets, ...options.secrets };
     try {
       if (!isUUID(checkpointId)) {
         console.error(
@@ -15832,10 +15959,20 @@ runCmd.command("resume").description("Resume an agent run from a checkpoint (use
         console.error(chalk5.dim("  Checkpoint ID must be a valid UUID"));
         process.exit(1);
       }
+      const secretNames = Object.keys(secrets);
+      const loadedSecrets = secretNames.length > 0 ? secrets : loadValues({}, []);
       if (verbose) {
         logVerbosePreFlight("Resuming agent run from checkpoint", [
           { label: "Checkpoint ID", value: checkpointId },
           { label: "Prompt", value: prompt },
+          {
+            label: "Variables",
+            value: Object.keys(vars).length > 0 ? JSON.stringify(vars) : void 0
+          },
+          {
+            label: "Secrets",
+            value: loadedSecrets && Object.keys(loadedSecrets).length > 0 ? `${Object.keys(loadedSecrets).length} loaded` : void 0
+          },
           {
             label: "Volume overrides",
             value: Object.keys(allOpts.volumeVersion).length > 0 ? JSON.stringify(allOpts.volumeVersion) : void 0
@@ -15845,6 +15982,8 @@ runCmd.command("resume").description("Resume an agent run from a checkpoint (use
       const response = await apiClient.createRun({
         checkpointId,
         prompt,
+        vars: Object.keys(vars).length > 0 ? vars : void 0,
+        secrets: loadedSecrets,
         volumeVersions: Object.keys(allOpts.volumeVersion).length > 0 ? allOpts.volumeVersion : void 0
       });
       if (response.status === "failed") {
@@ -15888,6 +16027,16 @@ runCmd.command("resume").description("Resume an agent run from a checkpoint (use
 runCmd.command("continue").description(
   "Continue an agent run from a session (uses latest artifact version)"
 ).argument("<agentSessionId>", "Agent session ID to continue from").argument("<prompt>", "Prompt for the continued agent").option(
+  "--vars <KEY=value>",
+  "Variables for ${{ vars.xxx }} (repeatable, falls back to env vars and .env)",
+  collectKeyValue,
+  {}
+).option(
+  "--secrets <KEY=value>",
+  "Secrets for ${{ secrets.xxx }} (repeatable, required for continue)",
+  collectKeyValue,
+  {}
+).option(
   "--volume-version <name=version>",
   "Volume version override (repeatable)",
   collectVolumeVersions,
@@ -15897,6 +16046,8 @@ runCmd.command("continue").description(
     const startTimestamp = /* @__PURE__ */ new Date();
     const allOpts = command.optsWithGlobals();
     const verbose = options.verbose || allOpts.verbose;
+    const vars = { ...allOpts.vars, ...options.vars };
+    const secrets = { ...allOpts.secrets, ...options.secrets };
     try {
       if (!isUUID(agentSessionId)) {
         console.error(
@@ -15905,11 +16056,21 @@ runCmd.command("continue").description(
         console.error(chalk5.dim("  Agent session ID must be a valid UUID"));
         process.exit(1);
       }
+      const secretNames = Object.keys(secrets);
+      const loadedSecrets = secretNames.length > 0 ? secrets : loadValues({}, []);
       if (verbose) {
         logVerbosePreFlight("Continuing agent run from session", [
           { label: "Session ID", value: agentSessionId },
           { label: "Prompt", value: prompt },
           { label: "Note", value: "Using latest artifact version" },
+          {
+            label: "Variables",
+            value: Object.keys(vars).length > 0 ? JSON.stringify(vars) : void 0
+          },
+          {
+            label: "Secrets",
+            value: loadedSecrets && Object.keys(loadedSecrets).length > 0 ? `${Object.keys(loadedSecrets).length} loaded` : void 0
+          },
           {
             label: "Volume overrides",
             value: Object.keys(allOpts.volumeVersion).length > 0 ? JSON.stringify(allOpts.volumeVersion) : void 0
@@ -15919,6 +16080,8 @@ runCmd.command("continue").description(
       const response = await apiClient.createRun({
         sessionId: agentSessionId,
         prompt,
+        vars: Object.keys(vars).length > 0 ? vars : void 0,
+        secrets: loadedSecrets,
         volumeVersions: Object.keys(allOpts.volumeVersion).length > 0 ? allOpts.volumeVersion : void 0
       });
       if (response.status === "failed") {
@@ -15972,9 +16135,9 @@ import chalk6 from "chalk";
 import path7 from "path";
 
 // src/lib/storage-utils.ts
-import { readFile as readFile4, writeFile as writeFile4, mkdir as mkdir4 } from "fs/promises";
+import { readFile as readFile5, writeFile as writeFile4, mkdir as mkdir4 } from "fs/promises";
 import { existsSync as existsSync5 } from "fs";
-import { parse as parseYaml2, stringify as stringifyYaml } from "yaml";
+import { parse as parseYaml3, stringify as stringifyYaml } from "yaml";
 import path6 from "path";
 var CONFIG_DIR2 = ".vm0";
 var CONFIG_FILE2 = "storage.yaml";
@@ -15997,8 +16160,8 @@ async function readStorageConfig(basePath = process.cwd()) {
   if (!actualPath) {
     return null;
   }
-  const content = await readFile4(actualPath, "utf8");
-  const config2 = parseYaml2(content);
+  const content = await readFile5(actualPath, "utf8");
+  const config2 = parseYaml3(content);
   if (!config2.type) {
     config2.type = "volume";
   }
@@ -16586,11 +16749,11 @@ var artifactCommand = new Command12().name("artifact").description("Manage cloud
 // src/commands/cook.ts
 import { Command as Command13 } from "commander";
 import chalk16 from "chalk";
-import { readFile as readFile6, mkdir as mkdir6, writeFile as writeFile6, appendFile } from "fs/promises";
+import { readFile as readFile7, mkdir as mkdir6, writeFile as writeFile6, appendFile } from "fs/promises";
 import { existsSync as existsSync7, readFileSync } from "fs";
 import path11 from "path";
 import { spawn as spawn2 } from "child_process";
-import { parse as parseYaml3 } from "yaml";
+import { parse as parseYaml4 } from "yaml";
 import { config as dotenvConfig2 } from "dotenv";
 
 // src/lib/update-checker.ts
@@ -16704,7 +16867,7 @@ async function checkAndUpgrade(currentVersion, prompt) {
 // src/lib/cook-state.ts
 import { homedir as homedir2 } from "os";
 import { join as join6 } from "path";
-import { readFile as readFile5, writeFile as writeFile5, mkdir as mkdir5 } from "fs/promises";
+import { readFile as readFile6, writeFile as writeFile5, mkdir as mkdir5 } from "fs/promises";
 import { existsSync as existsSync6 } from "fs";
 var CONFIG_DIR3 = join6(homedir2(), ".vm0");
 var COOK_STATE_FILE = join6(CONFIG_DIR3, "cook.json");
@@ -16714,7 +16877,7 @@ async function loadCookStateFile() {
     return { ppid: {} };
   }
   try {
-    const content = await readFile5(COOK_STATE_FILE, "utf8");
+    const content = await readFile6(COOK_STATE_FILE, "utf8");
     const data = JSON.parse(content);
     if (!data.ppid) {
       const oldState = data;
@@ -16925,7 +17088,7 @@ async function autoPullArtifact(runOutput, artifactDir) {
 }
 var cookCmd = new Command13().name("cook").description("One-click agent preparation and execution from vm0.yaml");
 cookCmd.argument("[prompt]", "Prompt for the agent").action(async (prompt) => {
-  const shouldExit = await checkAndUpgrade("4.30.0", prompt);
+  const shouldExit = await checkAndUpgrade("4.31.0", prompt);
   if (shouldExit) {
     process.exit(0);
   }
@@ -16937,8 +17100,8 @@ cookCmd.argument("[prompt]", "Prompt for the agent").action(async (prompt) => {
   }
   let config2;
   try {
-    const content = await readFile6(CONFIG_FILE3, "utf8");
-    config2 = parseYaml3(content);
+    const content = await readFile7(CONFIG_FILE3, "utf8");
+    config2 = parseYaml4(content);
   } catch (error43) {
     console.error(chalk16.red("\u2717 Invalid YAML format"));
     if (error43 instanceof Error) {
@@ -17212,7 +17375,7 @@ import { Command as Command18 } from "commander";
 // src/commands/image/build.ts
 import { Command as Command14 } from "commander";
 import chalk17 from "chalk";
-import { readFile as readFile7 } from "fs/promises";
+import { readFile as readFile8 } from "fs/promises";
 import { existsSync as existsSync8 } from "fs";
 
 // src/lib/dockerfile-validator.ts
@@ -17273,7 +17436,7 @@ var buildCommand = new Command14().name("build").description("Build a custom ima
     }
     try {
       const scope = await apiClient.getScope();
-      const dockerfile = await readFile7(file2, "utf8");
+      const dockerfile = await readFile8(file2, "utf8");
       const validation = validateDockerfile(dockerfile);
       if (!validation.valid) {
         console.error(chalk17.red("\u2717 Dockerfile validation failed\n"));
@@ -18079,9 +18242,9 @@ import { Command as Command24 } from "commander";
 import chalk25 from "chalk";
 import * as readline3 from "readline";
 import { existsSync as existsSync10 } from "fs";
-import { mkdir as mkdir7, readFile as readFile8, writeFile as writeFile8 } from "fs/promises";
+import { mkdir as mkdir7, readFile as readFile9, writeFile as writeFile8 } from "fs/promises";
 import { execSync, spawnSync } from "child_process";
-import { parse as parseYaml4 } from "yaml";
+import { parse as parseYaml5 } from "yaml";
 function isGhInstalled() {
   try {
     execSync("gh --version", { stdio: "ignore" });
@@ -18401,8 +18564,8 @@ var setupGithubCommand = new Command24().name("setup-github").description("Initi
     }
     console.log();
     console.log("Analyzing vm0.yaml...");
-    const content = await readFile8("vm0.yaml", "utf8");
-    const config2 = parseYaml4(content);
+    const content = await readFile9("vm0.yaml", "utf8");
+    const config2 = parseYaml5(content);
     const agents = config2.agents;
     const agentName = Object.keys(agents)[0];
     console.log(chalk25.green(`\u2713 Agent: ${agentName}`));
@@ -18538,7 +18701,7 @@ var setupGithubCommand = new Command24().name("setup-github").description("Initi
 
 // src/index.ts
 var program = new Command25();
-program.name("vm0").description("VM0 CLI - A modern build tool").version("4.30.0");
+program.name("vm0").description("VM0 CLI - A modern build tool").version("4.31.0");
 program.command("info").description("Display environment information").action(async () => {
   console.log(chalk26.bold("System Information:"));
   console.log(`Node Version: ${process.version}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vm0/cli",
-  "version": "4.30.0",
+  "version": "4.31.0",
   "description": "CLI application",
   "repository": {
     "type": "git",
@@ -19,6 +19,7 @@
     "chalk": "^5.6.0",
     "commander": "^14.0.0",
     "dotenv": "^17.2.1",
+    "prompts": "^2.4.2",
     "tar": "^7.5.2",
     "yaml": "^2.3.4"
   }