@vm0/cli 4.18.0 → 4.20.0

package/index.js

@@ -12357,7 +12357,8 @@ var volumeConfigSchema = external_exports.object({
 });
 var agentDefinitionSchema = external_exports.object({
   description: external_exports.string().optional(),
-  image: external_exports.string().min(1, "Image is required"),
+  image: external_exports.string().optional(),
+  // Optional when provider supports auto-config
   provider: external_exports.string().min(1, "Provider is required"),
   volumes: external_exports.array(external_exports.string()).optional(),
   working_dir: external_exports.string().optional(),
@@ -12371,15 +12372,15 @@ var agentDefinitionSchema = external_exports.object({
    */
   beta_network_security: external_exports.boolean().optional().default(false),
   /**
-   * Path to system prompt file (e.g., AGENTS.md).
+   * Path to instructions file (e.g., AGENTS.md).
    * Auto-uploaded as volume and mounted at /home/user/.claude/CLAUDE.md
    */
-  beta_system_prompt: external_exports.string().optional(),
+  instructions: external_exports.string().optional(),
   /**
-   * Array of GitHub tree URLs for system skills.
+   * Array of GitHub tree URLs for agent skills.
    * Each skill is auto-downloaded and mounted at /home/user/.claude/skills/{skillName}/
    */
-  beta_system_skills: external_exports.array(external_exports.string()).optional()
+  skills: external_exports.array(external_exports.string()).optional()
 });
 var agentComposeContentSchema = external_exports.object({
   version: external_exports.string().min(1, "Version is required"),
@@ -13507,6 +13508,14 @@ function formatVersionIdForDisplay(versionId) {
   return versionId.slice(0, VERSION_ID_DISPLAY_LENGTH);
 }
 
+// ../../packages/core/src/storage-names.ts
+function getInstructionsStorageName(agentName) {
+  return `agent-instructions@${agentName}`;
+}
+function getSkillStorageName(fullPath) {
+  return `agent-skills@${fullPath}`;
+}
+
 // src/lib/api-client.ts
 var ApiClient = class {
   async getHeaders() {
@@ -13886,7 +13895,11 @@ var apiClient = new ApiClient();
 // src/lib/provider-config.ts
 var PROVIDER_DEFAULTS = {
   "claude-code": {
-    workingDir: "/home/user/workspace"
+    workingDir: "/home/user/workspace",
+    image: {
+      production: "vm0/claude-code:latest",
+      development: "vm0/claude-code:dev"
+    }
   }
 };
 function getProviderDefaults(provider) {
@@ -13895,6 +13908,12 @@ function getProviderDefaults(provider) {
 function isProviderSupported(provider) {
   return provider in PROVIDER_DEFAULTS;
 }
+function getDefaultImage(provider) {
+  const defaults = PROVIDER_DEFAULTS[provider];
+  if (!defaults) return void 0;
+  const isProduction = process.env.NODE_ENV === "production";
+  return isProduction ? defaults.image.production : defaults.image.development;
+}
 
 // src/lib/yaml-validator.ts
 function validateAgentName(name) {
@@ -13967,10 +13986,16 @@ function validateAgentCompose(config2) {
     };
   }
   const providerIsSupported = isProviderSupported(agent.provider);
-  if (!agent.image || typeof agent.image !== "string") {
+  if (agent.image !== void 0 && typeof agent.image !== "string") {
+    return {
+      valid: false,
+      error: "agent.image must be a string if provided"
+    };
+  }
+  if (!agent.image && !providerIsSupported) {
     return {
       valid: false,
-      error: "Missing or invalid agent.image (must be a string)"
+      error: "Missing agent.image (required when provider is not auto-configured)"
     };
   }
   if (agent.working_dir !== void 0 && typeof agent.working_dir !== "string") {
@@ -13985,38 +14010,38 @@ function validateAgentCompose(config2) {
       error: "Missing agent.working_dir (required when provider is not auto-configured)"
     };
   }
-  if (agent.beta_system_prompt !== void 0) {
-    if (typeof agent.beta_system_prompt !== "string") {
+  if (agent.instructions !== void 0) {
+    if (typeof agent.instructions !== "string") {
       return {
         valid: false,
-        error: "agent.beta_system_prompt must be a string (path to AGENTS.md file)"
+        error: "agent.instructions must be a string (path to instructions file)"
       };
     }
-    if (agent.beta_system_prompt.length === 0) {
+    if (agent.instructions.length === 0) {
       return {
         valid: false,
-        error: "agent.beta_system_prompt cannot be empty"
+        error: "agent.instructions cannot be empty"
       };
     }
   }
-  if (agent.beta_system_skills !== void 0) {
-    if (!Array.isArray(agent.beta_system_skills)) {
+  if (agent.skills !== void 0) {
+    if (!Array.isArray(agent.skills)) {
       return {
         valid: false,
-        error: "agent.beta_system_skills must be an array of GitHub tree URLs"
+        error: "agent.skills must be an array of GitHub tree URLs"
       };
     }
-    for (const skillUrl of agent.beta_system_skills) {
+    for (const skillUrl of agent.skills) {
       if (typeof skillUrl !== "string") {
         return {
           valid: false,
-          error: "Each beta_system_skill must be a string URL"
+          error: "Each skill must be a string URL"
         };
       }
       if (!validateGitHubTreeUrl(skillUrl)) {
         return {
           valid: false,
-          error: `Invalid beta_system_skill URL: ${skillUrl}. Expected format: https://github.com/{owner}/{repo}/tree/{branch}/{path}`
+          error: `Invalid skill URL: ${skillUrl}. Expected format: https://github.com/{owner}/{repo}/tree/{branch}/{path}`
         };
       }
     }
@@ -14117,11 +14142,8 @@ function parseGitHubTreeUrl(url2) {
     fullPath
   };
 }
-function getSkillStorageName(parsed) {
-  return `system-skill@${parsed.fullPath}`;
-}
-function getSystemPromptStorageName(composeName) {
-  return `system-prompt@${composeName}`;
+function getSkillStorageName2(parsed) {
+  return getSkillStorageName(parsed.fullPath);
 }
 async function downloadGitHubSkill(parsed, destDir) {
   const repoUrl = `https://github.com/${parsed.owner}/${parsed.repo}.git`;
@@ -14457,16 +14479,16 @@ async function directUpload(storageName, storageType, cwd, options) {
 }
 
 // src/lib/system-storage.ts
-async function uploadSystemPrompt(agentName, promptFilePath, basePath) {
-  const storageName = getSystemPromptStorageName(agentName);
-  const absolutePath = path4.isAbsolute(promptFilePath) ? promptFilePath : path4.join(basePath, promptFilePath);
+async function uploadInstructions(agentName, instructionsFilePath, basePath) {
+  const storageName = getInstructionsStorageName(agentName);
+  const absolutePath = path4.isAbsolute(instructionsFilePath) ? instructionsFilePath : path4.join(basePath, instructionsFilePath);
   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);
+  const tmpDir = await fs4.mkdtemp(path4.join(os3.tmpdir(), "vm0-instructions-"));
+  const instructionsDir = path4.join(tmpDir, "instructions");
+  await fs4.mkdir(instructionsDir);
+  await fs4.writeFile(path4.join(instructionsDir, "CLAUDE.md"), content);
   try {
-    const result = await directUpload(storageName, "volume", promptDir);
+    const result = await directUpload(storageName, "volume", instructionsDir);
     return {
       name: storageName,
       versionId: result.versionId,
@@ -14476,9 +14498,9 @@ async function uploadSystemPrompt(agentName, promptFilePath, basePath) {
     await fs4.rm(tmpDir, { recursive: true, force: true });
   }
 }
-async function uploadSystemSkill(skillUrl) {
+async function uploadSkill(skillUrl) {
   const parsed = parseGitHubTreeUrl(skillUrl);
-  const storageName = getSkillStorageName(parsed);
+  const storageName = getSkillStorageName2(parsed);
   const tmpDir = await fs4.mkdtemp(path4.join(os3.tmpdir(), "vm0-skill-"));
   try {
     const skillDir = await downloadGitHubSkill(parsed, tmpDir);
@@ -14535,6 +14557,15 @@ var composeCommand = new Command().name("compose").description("Create or update
     if (agent.provider) {
       const defaults = getProviderDefaults(agent.provider);
       if (defaults) {
+        if (!agent.image) {
+          const defaultImage = getDefaultImage(agent.provider);
+          if (defaultImage) {
+            agent.image = defaultImage;
+            console.log(
+              chalk2.gray(`  Auto-configured image: ${defaultImage}`)
+            );
+          }
+        }
         if (!agent.working_dir) {
           agent.working_dir = defaults.workingDir;
           console.log(
@@ -14545,37 +14576,35 @@ var composeCommand = new Command().name("compose").description("Create or update
         }
       }
     }
-    if (agent.beta_system_prompt) {
-      const promptPath = agent.beta_system_prompt;
-      console.log(chalk2.blue(`Uploading system prompt: ${promptPath}`));
+    if (agent.instructions) {
+      const instructionsPath = agent.instructions;
+      console.log(chalk2.blue(`Uploading instructions: ${instructionsPath}`));
       try {
-        const result = await uploadSystemPrompt(
+        const result = await uploadInstructions(
           agentName,
-          promptPath,
+          instructionsPath,
           basePath
         );
         console.log(
           chalk2.green(
-            `\u2713 System prompt ${result.action === "deduplicated" ? "(unchanged)" : "uploaded"}: ${result.versionId.slice(0, 8)}`
+            `\u2713 Instructions ${result.action === "deduplicated" ? "(unchanged)" : "uploaded"}: ${result.versionId.slice(0, 8)}`
           )
         );
       } catch (error43) {
-        console.error(chalk2.red(`\u2717 Failed to upload system prompt`));
+        console.error(chalk2.red(`\u2717 Failed to upload instructions`));
         if (error43 instanceof Error) {
           console.error(chalk2.gray(`  ${error43.message}`));
         }
         process.exit(1);
       }
     }
-    if (agent.beta_system_skills && Array.isArray(agent.beta_system_skills)) {
-      const skillUrls = agent.beta_system_skills;
-      console.log(
-        chalk2.blue(`Uploading ${skillUrls.length} system skill(s)...`)
-      );
+    if (agent.skills && Array.isArray(agent.skills)) {
+      const skillUrls = agent.skills;
+      console.log(chalk2.blue(`Uploading ${skillUrls.length} skill(s)...`));
       for (const skillUrl of skillUrls) {
         try {
           console.log(chalk2.gray(`  Downloading: ${skillUrl}`));
-          const result = await uploadSystemSkill(skillUrl);
+          const result = await uploadSkill(skillUrl);
           console.log(
             chalk2.green(
               `  \u2713 Skill ${result.action === "deduplicated" ? "(unchanged)" : "uploaded"}: ${result.versionId.slice(0, 8)}`
@@ -16294,7 +16323,7 @@ async function generateEnvPlaceholders(missingVars, envFilePath) {
   }
 }
 var cookCommand = new Command13().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.18.0", prompt);
+  const shouldExit = await checkAndUpgrade("4.20.0", prompt);
   if (shouldExit) {
     process.exit(0);
   }
@@ -16481,6 +16510,38 @@ import { Command as Command14 } from "commander";
 import chalk16 from "chalk";
 import { readFile as readFile6 } from "fs/promises";
 import { existsSync as existsSync7 } from "fs";
+
+// src/lib/dockerfile-validator.ts
+var ALLOWED_INSTRUCTIONS = /* @__PURE__ */ new Set(["FROM", "RUN"]);
+function validateDockerfile(content) {
+  const errors = [];
+  const lines = content.split("\n");
+  let inContinuation = false;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (!inContinuation && !trimmed) continue;
+    if (!inContinuation && trimmed.startsWith("#")) continue;
+    if (inContinuation) {
+      inContinuation = trimmed.endsWith("\\");
+      continue;
+    }
+    const match = trimmed.match(/^([A-Za-z]+)\s/);
+    if (match) {
+      const instruction = match[1].toUpperCase();
+      if (!ALLOWED_INSTRUCTIONS.has(instruction)) {
+        errors.push(`Unsupported instruction: ${instruction} (line ${i + 1})`);
+      }
+    }
+    inContinuation = trimmed.endsWith("\\");
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+
+// src/commands/image/build.ts
 var sleep2 = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 var buildCommand = new Command14().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) => {
@@ -16509,6 +16570,25 @@ var buildCommand = new Command14().name("build").description("Build a custom ima
     try {
       const scope = await apiClient.getScope();
       const dockerfile = await readFile6(file2, "utf8");
+      const validation = validateDockerfile(dockerfile);
+      if (!validation.valid) {
+        console.error(chalk16.red("\u2717 Dockerfile validation failed\n"));
+        for (const error43 of validation.errors) {
+          console.error(chalk16.red(`  ${error43}`));
+        }
+        console.error();
+        console.error(
+          chalk16.yellow(
+            "  vm0 image build only supports FROM and RUN instructions."
+          )
+        );
+        console.error(
+          chalk16.yellow(
+            "  The purpose is to pre-install environment dependencies."
+          )
+        );
+        process.exit(1);
+      }
       console.log(chalk16.blue(`Building image: ${scope.slug}/${name}`));
       console.log();
       const buildInfo = await apiClient.createImage({
@@ -17178,7 +17258,7 @@ var scopeCommand = new Command22().name("scope").description("Manage your scope
 
 // src/index.ts
 var program = new Command23();
-program.name("vm0").description("VM0 CLI - A modern build tool").version("4.18.0");
+program.name("vm0").description("VM0 CLI - A modern build tool").version("4.20.0");
 program.command("info").description("Display environment information").action(async () => {
   console.log(chalk23.cyan("System Information:"));
   console.log(`Node Version: ${process.version}`);

package/package.json

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