@vm0/cli 4.22.0 → 4.24.0

package/index.js

@@ -15407,17 +15407,18 @@ ${action}...`));
 function showNextSteps(result) {
   const { runId, sessionId, checkpointId } = result;
   console.log();
-  console.log("Next steps:");
-  console.log("  View telemetry logs:");
+  console.log("  View agent logs:");
   console.log(chalk5.cyan(`    vm0 logs ${runId}`));
   if (sessionId) {
-    console.log("  Continue with session (latest state):");
+    console.log("  Continue with session (latest conversation and artifact):");
     console.log(
       chalk5.cyan(`    vm0 run continue ${sessionId} "your next prompt"`)
     );
   }
   if (checkpointId) {
-    console.log("  Resume from checkpoint (exact snapshot state):");
+    console.log(
+      "  Resume from checkpoint (snapshotted conversation and artifact):"
+    );
     console.log(
       chalk5.cyan(`    vm0 run resume ${checkpointId} "your next prompt"`)
     );
@@ -16397,8 +16398,8 @@ 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 readFile5, mkdir as mkdir5, writeFile as writeFile5, appendFile } from "fs/promises";
-import { existsSync as existsSync6, readFileSync } from "fs";
+import { readFile as readFile6, 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";
@@ -16512,9 +16513,37 @@ async function checkAndUpgrade(currentVersion, prompt) {
   return true;
 }
 
+// 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 { existsSync as existsSync6 } from "fs";
+var CONFIG_DIR3 = join6(homedir2(), ".vm0");
+var COOK_STATE_FILE = join6(CONFIG_DIR3, "cook.json");
+async function loadCookState() {
+  if (!existsSync6(COOK_STATE_FILE)) {
+    return {};
+  }
+  try {
+    const content = await readFile5(COOK_STATE_FILE, "utf8");
+    return JSON.parse(content);
+  } catch {
+    return {};
+  }
+}
+async function saveCookState(state) {
+  await mkdir5(CONFIG_DIR3, { recursive: true });
+  const existing = await loadCookState();
+  const merged = { ...existing, ...state };
+  await writeFile5(COOK_STATE_FILE, JSON.stringify(merged, null, 2), "utf8");
+}
+
 // src/commands/cook.ts
 var CONFIG_FILE3 = "vm0.yaml";
 var ARTIFACT_DIR = "artifact";
+function printCommand(cmd) {
+  console.log(chalk16.dim(`> ${cmd}`));
+}
 function execVm0Command(args, options = {}) {
   return new Promise((resolve2, reject) => {
     const proc = spawn2("vm0", args, {
@@ -16590,6 +16619,20 @@ function parseArtifactVersionFromCompletion(output, artifactName) {
 function escapeRegExp(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+function parseRunIdsFromOutput(output) {
+  const completionMarker = "Run completed successfully";
+  const completionIndex = output.indexOf(completionMarker);
+  if (completionIndex === -1) return {};
+  const section = output.slice(completionIndex);
+  const ESC = String.fromCharCode(27);
+  const ansiPattern = new RegExp(`${ESC}\\[[0-9;]*m`, "g");
+  const stripped = section.replace(ansiPattern, "");
+  return {
+    runId: stripped.match(/vm0 logs ([0-9a-f-]{36})/)?.[1],
+    sessionId: stripped.match(/vm0 run continue ([0-9a-f-]{36})/)?.[1],
+    checkpointId: stripped.match(/vm0 run resume ([0-9a-f-]{36})/)?.[1]
+  };
+}
 function extractRequiredVarNames(config2) {
   const refs = extractVariableReferences(config2);
   const grouped = groupVariablesBySource(refs);
@@ -16599,7 +16642,7 @@ function extractRequiredVarNames(config2) {
 }
 function checkMissingVariables(varNames, envFilePath) {
   let dotenvValues = {};
-  if (existsSync6(envFilePath)) {
+  if (existsSync7(envFilePath)) {
     const result = dotenvConfig2({ path: envFilePath, quiet: true });
     if (result.parsed) {
       dotenvValues = result.parsed;
@@ -16617,31 +16660,56 @@ function checkMissingVariables(varNames, envFilePath) {
 }
 async function generateEnvPlaceholders(missingVars, envFilePath) {
   const placeholders = missingVars.map((name) => `${name}=`).join("\n");
-  if (existsSync6(envFilePath)) {
+  if (existsSync7(envFilePath)) {
     const existingContent = readFileSync(envFilePath, "utf8");
     const needsNewline = existingContent.length > 0 && !existingContent.endsWith("\n");
     const prefix = needsNewline ? "\n" : "";
     await appendFile(envFilePath, `${prefix}${placeholders}
 `);
   } else {
-    await writeFile5(envFilePath, `${placeholders}
+    await writeFile6(envFilePath, `${placeholders}
 `);
   }
 }
-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.22.0", prompt);
+async function autoPullArtifact(runOutput, artifactDir) {
+  const serverVersion = parseArtifactVersionFromCompletion(
+    runOutput,
+    ARTIFACT_DIR
+  );
+  if (serverVersion && existsSync7(artifactDir)) {
+    console.log();
+    console.log(chalk16.blue("Pulling updated artifact:"));
+    printCommand(`cd ${ARTIFACT_DIR}`);
+    printCommand(`vm0 artifact pull ${serverVersion}`);
+    try {
+      await execVm0Command(["artifact", "pull", serverVersion], {
+        cwd: artifactDir,
+        silent: true
+      });
+      printCommand("cd ..");
+    } catch (error43) {
+      console.error(chalk16.red(`\u2717 Artifact pull failed`));
+      if (error43 instanceof Error) {
+        console.error(chalk16.gray(`  ${error43.message}`));
+      }
+    }
+  }
+}
+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.24.0", prompt);
   if (shouldExit) {
     process.exit(0);
   }
   const cwd = process.cwd();
   console.log(chalk16.blue(`Reading config: ${CONFIG_FILE3}`));
-  if (!existsSync6(CONFIG_FILE3)) {
+  if (!existsSync7(CONFIG_FILE3)) {
     console.error(chalk16.red(`\u2717 Config file not found: ${CONFIG_FILE3}`));
     process.exit(1);
   }
   let config2;
   try {
-    const content = await readFile5(CONFIG_FILE3, "utf8");
+    const content = await readFile6(CONFIG_FILE3, "utf8");
     config2 = parseYaml3(content);
   } catch (error43) {
     console.error(chalk16.red("\u2717 Invalid YAML format"));
@@ -16681,78 +16749,80 @@ var cookCommand = new Command13().name("cook").description("One-click agent prep
   }
   if (config2.volumes && Object.keys(config2.volumes).length > 0) {
     console.log();
-    console.log(chalk16.blue("Processing volumes..."));
+    console.log(chalk16.blue("Processing volumes:"));
     for (const volumeConfig of Object.values(config2.volumes)) {
       const volumeDir = path11.join(cwd, volumeConfig.name);
-      console.log(chalk16.gray(`  ${volumeConfig.name}/`));
-      if (!existsSync6(volumeDir)) {
+      if (!existsSync7(volumeDir)) {
         console.error(
           chalk16.red(
-            `    \u2717 Directory not found. Create the directory and add files first.`
+            `\u2717 Directory not found: ${volumeConfig.name}. Create the directory and add files first.`
           )
         );
         process.exit(1);
       }
       try {
+        printCommand(`cd ${volumeConfig.name}`);
         const existingConfig = await readStorageConfig(volumeDir);
         if (!existingConfig) {
+          printCommand("vm0 volume init");
           await execVm0Command(["volume", "init"], {
             cwd: volumeDir,
             silent: true
           });
-          console.log(chalk16.green(`    \u2713 Initialized`));
         }
+        printCommand("vm0 volume push");
         await execVm0Command(["volume", "push"], {
           cwd: volumeDir,
           silent: true
         });
-        console.log(chalk16.green(`    \u2713 Pushed`));
+        printCommand("cd ..");
       } catch (error43) {
-        console.error(chalk16.red(`    \u2717 Failed`));
+        console.error(chalk16.red(`\u2717 Failed`));
         if (error43 instanceof Error) {
-          console.error(chalk16.gray(`      ${error43.message}`));
+          console.error(chalk16.gray(`  ${error43.message}`));
         }
         process.exit(1);
       }
     }
   }
   console.log();
-  console.log(chalk16.blue("Processing artifact..."));
+  console.log(chalk16.blue("Processing artifact:"));
   const artifactDir = path11.join(cwd, ARTIFACT_DIR);
-  console.log(chalk16.gray(`  ${ARTIFACT_DIR}/`));
   try {
-    if (!existsSync6(artifactDir)) {
-      await mkdir5(artifactDir, { recursive: true });
-      console.log(chalk16.green(`    \u2713 Created directory`));
+    if (!existsSync7(artifactDir)) {
+      printCommand(`mkdir ${ARTIFACT_DIR}`);
+      await mkdir6(artifactDir, { recursive: true });
     }
+    printCommand(`cd ${ARTIFACT_DIR}`);
     const existingConfig = await readStorageConfig(artifactDir);
     if (!existingConfig) {
+      printCommand("vm0 artifact init");
       await execVm0Command(["artifact", "init"], {
         cwd: artifactDir,
         silent: true
       });
-      console.log(chalk16.green(`    \u2713 Initialized`));
     }
+    printCommand("vm0 artifact push");
     await execVm0Command(["artifact", "push"], {
       cwd: artifactDir,
       silent: true
     });
-    console.log(chalk16.green(`    \u2713 Pushed`));
+    printCommand("cd ..");
   } catch (error43) {
-    console.error(chalk16.red(`    \u2717 Failed`));
+    console.error(chalk16.red(`\u2717 Failed`));
     if (error43 instanceof Error) {
-      console.error(chalk16.gray(`      ${error43.message}`));
+      console.error(chalk16.gray(`  ${error43.message}`));
     }
     process.exit(1);
   }
   console.log();
-  console.log(chalk16.blue("Uploading compose..."));
+  console.log(chalk16.blue("Composing agent:"));
+  printCommand(`vm0 compose ${CONFIG_FILE3}`);
   try {
     await execVm0Command(["compose", CONFIG_FILE3], {
       cwd,
       silent: true
     });
-    console.log(chalk16.green(`\u2713 Compose uploaded: ${agentName}`));
   } catch (error43) {
     console.error(chalk16.red(`\u2717 Compose failed`));
     if (error43 instanceof Error) {
@@ -16762,7 +16832,10 @@ var cookCommand = new Command13().name("cook").description("One-click agent prep
   }
   if (prompt) {
     console.log();
-    console.log(chalk16.blue(`Running agent: ${agentName}`));
+    console.log(chalk16.blue("Running agent:"));
+    printCommand(
+      `vm0 run ${agentName} --artifact-name ${ARTIFACT_DIR} "${prompt}"`
+    );
     console.log();
     let runOutput;
     try {
@@ -16777,36 +16850,98 @@ var cookCommand = new Command13().name("cook").description("One-click agent prep
     } catch {
       process.exit(1);
     }
-    const serverVersion = parseArtifactVersionFromCompletion(
-      runOutput,
-      ARTIFACT_DIR
-    );
-    if (serverVersion) {
-      console.log();
-      console.log(chalk16.blue("Pulling updated artifact..."));
-      try {
-        await execVm0Command(["artifact", "pull", serverVersion], {
-          cwd: artifactDir,
-          silent: true
-        });
-        console.log(chalk16.green(`\u2713 Artifact pulled (${serverVersion})`));
-      } catch (error43) {
-        console.error(chalk16.red(`\u2717 Artifact pull failed`));
-        if (error43 instanceof Error) {
-          console.error(chalk16.gray(`  ${error43.message}`));
-        }
-      }
+    const runIds = parseRunIdsFromOutput(runOutput);
+    if (runIds.runId || runIds.sessionId || runIds.checkpointId) {
+      await saveCookState({
+        lastRunId: runIds.runId,
+        lastSessionId: runIds.sessionId,
+        lastCheckpointId: runIds.checkpointId
+      });
     }
+    await autoPullArtifact(runOutput, artifactDir);
   } else {
     console.log();
-    console.log("  Run your agent:");
-    console.log(
-      chalk16.cyan(
-        `    vm0 run ${agentName} --artifact-name ${ARTIFACT_DIR} "your prompt"`
-      )
+    console.log("To run your agent:");
+    printCommand(
+      `vm0 run ${agentName} --artifact-name ${ARTIFACT_DIR} "your prompt"`
+    );
+  }
+});
+cookCmd.command("logs").description("View logs from the last cook run").action(async () => {
+  const state = await loadCookState();
+  if (!state.lastRunId) {
+    console.error(chalk16.red("\u2717 No previous run found"));
+    console.error(chalk16.gray("  Run 'vm0 cook <prompt>' first"));
+    process.exit(1);
+  }
+  printCommand(`vm0 logs ${state.lastRunId}`);
+  await execVm0Command(["logs", state.lastRunId]);
+});
+cookCmd.command("continue").description(
+  "Continue from the last session (latest conversation and artifact)"
+).argument("<prompt>", "Prompt for the continued agent").action(async (prompt) => {
+  const state = await loadCookState();
+  if (!state.lastSessionId) {
+    console.error(chalk16.red("\u2717 No previous session found"));
+    console.error(chalk16.gray("  Run 'vm0 cook <prompt>' first"));
+    process.exit(1);
+  }
+  const cwd = process.cwd();
+  const artifactDir = path11.join(cwd, ARTIFACT_DIR);
+  printCommand(`vm0 run continue ${state.lastSessionId} "${prompt}"`);
+  console.log();
+  let runOutput;
+  try {
+    runOutput = await execVm0RunWithCapture(
+      ["run", "continue", state.lastSessionId, prompt],
+      { cwd }
     );
+  } catch {
+    process.exit(1);
+  }
+  const newIds = parseRunIdsFromOutput(runOutput);
+  if (newIds.runId || newIds.sessionId || newIds.checkpointId) {
+    await saveCookState({
+      lastRunId: newIds.runId,
+      lastSessionId: newIds.sessionId,
+      lastCheckpointId: newIds.checkpointId
+    });
+  }
+  await autoPullArtifact(runOutput, artifactDir);
+});
+cookCmd.command("resume").description(
+  "Resume from the last checkpoint (snapshotted conversation and artifact)"
+).argument("<prompt>", "Prompt for the resumed agent").action(async (prompt) => {
+  const state = await loadCookState();
+  if (!state.lastCheckpointId) {
+    console.error(chalk16.red("\u2717 No previous checkpoint found"));
+    console.error(chalk16.gray("  Run 'vm0 cook <prompt>' first"));
+    process.exit(1);
+  }
+  const cwd = process.cwd();
+  const artifactDir = path11.join(cwd, ARTIFACT_DIR);
+  printCommand(`vm0 run resume ${state.lastCheckpointId} "${prompt}"`);
+  console.log();
+  let runOutput;
+  try {
+    runOutput = await execVm0RunWithCapture(
+      ["run", "resume", state.lastCheckpointId, prompt],
+      { cwd }
+    );
+  } catch {
+    process.exit(1);
+  }
+  const newIds = parseRunIdsFromOutput(runOutput);
+  if (newIds.runId || newIds.sessionId || newIds.checkpointId) {
+    await saveCookState({
+      lastRunId: newIds.runId,
+      lastSessionId: newIds.sessionId,
+      lastCheckpointId: newIds.checkpointId
+    });
   }
+  await autoPullArtifact(runOutput, artifactDir);
 });
+var cookCommand = cookCmd;
 
 // src/commands/image/index.ts
 import { Command as Command18 } from "commander";
@@ -16814,8 +16949,8 @@ import { Command as Command18 } from "commander";
 // src/commands/image/build.ts
 import { Command as Command14 } from "commander";
 import chalk17 from "chalk";
-import { readFile as readFile6 } from "fs/promises";
-import { existsSync as existsSync7 } from "fs";
+import { readFile as readFile7 } from "fs/promises";
+import { existsSync as existsSync8 } from "fs";
 
 // src/lib/dockerfile-validator.ts
 var ALLOWED_INSTRUCTIONS = /* @__PURE__ */ new Set(["FROM", "RUN"]);
@@ -16852,7 +16987,7 @@ 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) => {
     const { file: file2, name, deleteExisting } = options;
-    if (!existsSync7(file2)) {
+    if (!existsSync8(file2)) {
       console.error(chalk17.red(`\u2717 Dockerfile not found: ${file2}`));
       process.exit(1);
     }
@@ -16875,7 +17010,7 @@ var buildCommand = new Command14().name("build").description("Build a custom ima
     }
     try {
       const scope = await apiClient.getScope();
-      const dockerfile = await readFile6(file2, "utf8");
+      const dockerfile = await readFile7(file2, "utf8");
       const validation = validateDockerfile(dockerfile);
       if (!validation.valid) {
         console.error(chalk17.red("\u2717 Dockerfile validation failed\n"));
@@ -17567,7 +17702,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.22.0");
+program.name("vm0").description("VM0 CLI - A modern build tool").version("4.24.0");
 program.command("info").description("Display environment information").action(async () => {
   console.log(chalk24.cyan("System Information:"));
   console.log(`Node Version: ${process.version}`);

package/package.json

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