@vm0/cli 2.0.0 → 3.1.0

package/index.js

@@ -12488,44 +12488,56 @@ function validateAgentConfig(config2) {
   if (!cfg.version) {
     return { valid: false, error: "Missing config.version" };
   }
-  if (!cfg.agents || !Array.isArray(cfg.agents)) {
-    return { valid: false, error: "Missing config.agents array" };
+  if (!cfg.agents || typeof cfg.agents !== "object") {
+    return { valid: false, error: "Missing agents object in config" };
   }
-  if (cfg.agents.length === 0) {
-    return { valid: false, error: "config.agents array must not be empty" };
-  }
-  const agent = cfg.agents[0];
-  if (!agent || typeof agent !== "object") {
-    return { valid: false, error: "First agent must be an object" };
+  if (Array.isArray(cfg.agents)) {
+    return {
+      valid: false,
+      error: "agents must be an object, not an array. Use format: agents: { agent-name: { ... } }"
+    };
   }
-  if (!agent.name) {
-    return { valid: false, error: "Missing agents[0].name" };
+  const agentKeys = Object.keys(cfg.agents);
+  if (agentKeys.length === 0) {
+    return {
+      valid: false,
+      error: "agents must have at least one agent defined"
+    };
   }
-  if (typeof agent.name !== "string") {
-    return { valid: false, error: "agents[0].name must be a string" };
+  if (agentKeys.length > 1) {
+    return {
+      valid: false,
+      error: "Multiple agents not supported yet. Only one agent allowed."
+    };
   }
-  if (!validateAgentName(agent.name)) {
+  const agentName = agentKeys[0];
+  if (!validateAgentName(agentName)) {
     return {
       valid: false,
-      error: "Invalid agents[0].name format. Must be 3-64 characters, letters, numbers, and hyphens only. Must start and end with letter or number."
+      error: "Invalid agent name format. Must be 3-64 characters, letters, numbers, and hyphens only. Must start and end with letter or number."
     };
   }
+  const agentsObj = cfg.agents;
+  const agent = agentsObj[agentName];
+  if (!agent || typeof agent !== "object") {
+    return { valid: false, error: "Agent definition must be an object" };
+  }
   if (!agent.working_dir || typeof agent.working_dir !== "string") {
     return {
       valid: false,
-      error: "Missing or invalid agents[0].working_dir (must be a string)"
+      error: "Missing or invalid agent.working_dir (must be a string)"
     };
   }
   if (!agent.image || typeof agent.image !== "string") {
     return {
       valid: false,
-      error: "Missing or invalid agents[0].image (must be a string)"
+      error: "Missing or invalid agent.image (must be a string)"
     };
   }
   if (!agent.provider || typeof agent.provider !== "string") {
     return {
       valid: false,
-      error: "Missing or invalid agents[0].provider (must be a string)"
+      error: "Missing or invalid agent.provider (must be a string)"
     };
   }
   const agentVolumes = agent.volumes;
@@ -12857,39 +12869,67 @@ var ClaudeEventParser = class {
 // src/lib/event-renderer.ts
 import chalk3 from "chalk";
 var EventRenderer = class {
+  /**
+   * Format elapsed time between two timestamps
+   * Returns [+Nms] for < 1000ms, [+N.Ns] for >= 1000ms
+   */
+  static formatElapsed(previous, current) {
+    const elapsedMs = current.getTime() - previous.getTime();
+    if (elapsedMs < 1e3) {
+      return `[+${elapsedMs}ms]`;
+    }
+    return `[+${(elapsedMs / 1e3).toFixed(1)}s]`;
+  }
+  /**
+   * Format total elapsed time
+   * Returns N.Ns format
+   */
+  static formatTotalTime(start, end) {
+    const elapsedMs = end.getTime() - start.getTime();
+    return `${(elapsedMs / 1e3).toFixed(1)}s`;
+  }
   /**
    * Render a parsed event to console
    */
-  static render(event) {
+  static render(event, options) {
+    const elapsedPrefix = options?.verbose && options?.previousTimestamp ? chalk3.gray(
+      this.formatElapsed(options.previousTimestamp, event.timestamp)
+    ) : "";
     switch (event.type) {
       case "init":
-        this.renderInit(event);
+        this.renderInit(event, elapsedPrefix);
         break;
       case "text":
-        this.renderText(event);
+        this.renderText(event, elapsedPrefix);
         break;
       case "tool_use":
-        this.renderToolUse(event);
+        this.renderToolUse(event, elapsedPrefix);
         break;
       case "tool_result":
-        this.renderToolResult(event);
+        this.renderToolResult(event, elapsedPrefix);
         break;
       case "result":
-        this.renderResult(event);
+        this.renderResult(event, elapsedPrefix);
         break;
       case "vm0_start":
-        this.renderVm0Start(event);
+        this.renderVm0Start(event, elapsedPrefix);
         break;
       case "vm0_result":
-        this.renderVm0Result(event);
+        this.renderVm0Result(
+          event,
+          elapsedPrefix,
+          options?.verbose ? options?.startTimestamp : void 0
+        );
         break;
       case "vm0_error":
-        this.renderVm0Error(event);
+        this.renderVm0Error(event, elapsedPrefix);
         break;
     }
   }
-  static renderInit(event) {
-    console.log(chalk3.cyan("[init]") + " Starting Claude Code agent");
+  static renderInit(event, elapsedPrefix) {
+    console.log(
+      chalk3.cyan("[init]") + elapsedPrefix + " Starting Claude Code agent"
+    );
     console.log(`  Session: ${chalk3.gray(String(event.data.sessionId || ""))}`);
     console.log(`  Model: ${chalk3.gray(String(event.data.model || ""))}`);
     console.log(
@@ -12898,13 +12938,13 @@ var EventRenderer = class {
       )}`
     );
   }
-  static renderText(event) {
+  static renderText(event, elapsedPrefix) {
     const text = String(event.data.text || "");
-    console.log(chalk3.blue("[text]") + " " + text);
+    console.log(chalk3.blue("[text]") + elapsedPrefix + " " + text);
   }
-  static renderToolUse(event) {
+  static renderToolUse(event, elapsedPrefix) {
     const tool = String(event.data.tool || "");
-    console.log(chalk3.yellow("[tool_use]") + " " + tool);
+    console.log(chalk3.yellow("[tool_use]") + elapsedPrefix + " " + tool);
     const input = event.data.input;
     if (input && typeof input === "object") {
       for (const [key, value] of Object.entries(input)) {
@@ -12914,19 +12954,19 @@ var EventRenderer = class {
       }
     }
   }
-  static renderToolResult(event) {
+  static renderToolResult(event, elapsedPrefix) {
     const isError = Boolean(event.data.isError);
     const status = isError ? "Error" : "Completed";
     const color = isError ? chalk3.red : chalk3.green;
-    console.log(color("[tool_result]") + " " + status);
+    console.log(color("[tool_result]") + elapsedPrefix + " " + status);
     const result = String(event.data.result || "");
     console.log(`  ${chalk3.gray(result)}`);
   }
-  static renderResult(event) {
+  static renderResult(event, elapsedPrefix) {
     const success2 = Boolean(event.data.success);
     const status = success2 ? "\u2713 completed successfully" : "\u2717 failed";
     const color = success2 ? chalk3.green : chalk3.red;
-    console.log(color("[result]") + " " + status);
+    console.log(color("[result]") + elapsedPrefix + " " + status);
     const durationMs = Number(event.data.durationMs || 0);
     const durationSec = (durationMs / 1e3).toFixed(1);
     console.log(`  Duration: ${chalk3.gray(durationSec + "s")}`);
@@ -12951,8 +12991,8 @@ var EventRenderer = class {
       );
     }
   }
-  static renderVm0Start(event) {
-    console.log(chalk3.cyan("[vm0_start]") + " Run starting");
+  static renderVm0Start(event, elapsedPrefix) {
+    console.log(chalk3.cyan("[vm0_start]") + elapsedPrefix + " Run starting");
     if (event.data.runId) {
       console.log(`  Run ID: ${chalk3.gray(String(event.data.runId))}`);
     }
@@ -12963,8 +13003,10 @@ var EventRenderer = class {
     }
     this.renderArtifactAndVolumes(event.data);
   }
-  static renderVm0Result(event) {
-    console.log(chalk3.green("[vm0_result]") + " \u2713 Run completed successfully");
+  static renderVm0Result(event, elapsedPrefix, startTimestamp) {
+    console.log(
+      chalk3.green("[vm0_result]") + elapsedPrefix + " \u2713 Run completed successfully"
+    );
     console.log(
       `  Checkpoint: ${chalk3.gray(String(event.data.checkpointId || ""))}`
     );
@@ -12975,6 +13017,10 @@ var EventRenderer = class {
       `  Conversation: ${chalk3.gray(String(event.data.conversationId || ""))}`
     );
     this.renderArtifactAndVolumes(event.data);
+    if (startTimestamp) {
+      const totalTime = this.formatTotalTime(startTimestamp, event.timestamp);
+      console.log(`  Total time: ${chalk3.gray(totalTime)}`);
+    }
   }
   /**
    * Format version ID for display (show short 8-character prefix)
@@ -13005,8 +13051,8 @@ var EventRenderer = class {
       }
     }
   }
-  static renderVm0Error(event) {
-    console.log(chalk3.red("[vm0_error]") + " \u2717 Run failed");
+  static renderVm0Error(event, elapsedPrefix) {
+    console.log(chalk3.red("[vm0_error]") + elapsedPrefix + " \u2717 Run failed");
     let errorMessage = "";
     if (typeof event.data.error === "string") {
       errorMessage = event.data.error;
@@ -13048,12 +13094,15 @@ function isUUID(str) {
   return /^[0-9a-f-]{36}$/i.test(str);
 }
 var DEFAULT_TIMEOUT_SECONDS = 120;
-async function pollEvents(runId, timeoutSeconds) {
+async function pollEvents(runId, timeoutSeconds, options) {
   let nextSequence = -1;
   let complete = false;
   const pollIntervalMs = 500;
   const timeoutMs = timeoutSeconds * 1e3;
   const startTime = Date.now();
+  const startTimestamp = /* @__PURE__ */ new Date();
+  let previousTimestamp = startTimestamp;
+  const verbose = options?.verbose;
   while (!complete) {
     const elapsed = Date.now() - startTime;
     if (elapsed > timeoutMs) {
@@ -13073,7 +13122,12 @@ async function pollEvents(runId, timeoutSeconds) {
         event.eventData
       );
       if (parsed) {
-        EventRenderer.render(parsed);
+        EventRenderer.render(parsed, {
+          verbose,
+          previousTimestamp,
+          startTimestamp
+        });
+        previousTimestamp = parsed.timestamp;
         if (parsed.type === "vm0_result" || parsed.type === "vm0_error") {
           complete = true;
         }
@@ -13085,6 +13139,18 @@ async function pollEvents(runId, timeoutSeconds) {
     }
   }
 }
+function logVerbosePreFlight(action, details) {
+  console.log(chalk4.blue(`
+${action}...`));
+  for (const { label, value } of details) {
+    if (value !== void 0) {
+      console.log(chalk4.gray(`  ${label}: ${value}`));
+    }
+  }
+  console.log();
+  console.log(chalk4.blue("Executing in sandbox..."));
+  console.log();
+}
 var runCmd = new Command2().name("run").description("Execute an agent").argument(
   "<identifier>",
   "Agent name or config ID (e.g., 'my-agent' or 'cfg-abc-123')"
@@ -13108,7 +13174,7 @@ var runCmd = new Command2().name("run").description("Execute an agent").argument
   "-t, --timeout <seconds>",
   "Polling timeout in seconds (default: 120)",
   String(DEFAULT_TIMEOUT_SECONDS)
-).action(
+).option("-v, --verbose", "Show verbose output with timing information").action(
   async (identifier, prompt, options) => {
     const timeoutSeconds = parseInt(options.timeout, 10);
     if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
@@ -13126,17 +13192,24 @@ var runCmd = new Command2().name("run").description("Execute an agent").argument
       );
       process.exit(1);
     }
+    const verbose = options.verbose;
     try {
       let configId;
       if (isUUID(identifier)) {
         configId = identifier;
-        console.log(chalk4.gray(`  Using config ID: ${configId}`));
+        if (verbose) {
+          console.log(chalk4.gray(`  Using config ID: ${configId}`));
+        }
       } else {
-        console.log(chalk4.gray(`  Resolving agent name: ${identifier}`));
+        if (verbose) {
+          console.log(chalk4.gray(`  Resolving agent name: ${identifier}`));
+        }
         try {
           const config2 = await apiClient.getConfigByName(identifier);
           configId = config2.id;
-          console.log(chalk4.gray(`  Resolved to config ID: ${configId}`));
+          if (verbose) {
+            console.log(chalk4.gray(`  Resolved to config ID: ${configId}`));
+          }
         } catch (error43) {
           if (error43 instanceof Error) {
             console.error(chalk4.red(`\u2717 Agent not found: ${identifier}`));
@@ -13149,32 +13222,22 @@ var runCmd = new Command2().name("run").description("Execute an agent").argument
           process.exit(1);
         }
       }
-      console.log(chalk4.blue("\nCreating agent run..."));
-      console.log(chalk4.gray(`  Prompt: ${prompt}`));
-      if (Object.keys(options.vars).length > 0) {
-        console.log(
-          chalk4.gray(`  Variables: ${JSON.stringify(options.vars)}`)
-        );
-      }
-      console.log(chalk4.gray(`  Artifact: ${options.artifactName}`));
-      if (options.artifactVersion) {
-        console.log(
-          chalk4.gray(`  Artifact version: ${options.artifactVersion}`)
-        );
-      }
-      if (Object.keys(options.volumeVersion).length > 0) {
-        console.log(
-          chalk4.gray(
-            `  Volume versions: ${JSON.stringify(options.volumeVersion)}`
-          )
-        );
-      }
-      if (options.conversation) {
-        console.log(chalk4.gray(`  Conversation: ${options.conversation}`));
+      if (verbose) {
+        logVerbosePreFlight("Creating agent run", [
+          { label: "Prompt", value: prompt },
+          {
+            label: "Variables",
+            value: Object.keys(options.vars).length > 0 ? JSON.stringify(options.vars) : void 0
+          },
+          { label: "Artifact", value: options.artifactName },
+          { label: "Artifact version", value: options.artifactVersion },
+          {
+            label: "Volume versions",
+            value: Object.keys(options.volumeVersion).length > 0 ? JSON.stringify(options.volumeVersion) : void 0
+          },
+          { label: "Conversation", value: options.conversation }
+        ]);
       }
-      console.log();
-      console.log(chalk4.blue("Executing in sandbox..."));
-      console.log();
       const response = await apiClient.createRun({
         agentConfigId: configId,
         prompt,
@@ -13184,7 +13247,7 @@ var runCmd = new Command2().name("run").description("Execute an agent").argument
         volumeVersions: Object.keys(options.volumeVersion).length > 0 ? options.volumeVersion : void 0,
         conversationId: options.conversation
       });
-      await pollEvents(response.runId, timeoutSeconds);
+      await pollEvents(response.runId, timeoutSeconds, { verbose });
     } catch (error43) {
       if (error43 instanceof Error) {
         if (error43.message.includes("Not authenticated")) {
@@ -13216,7 +13279,7 @@ runCmd.command("resume").description("Resume an agent run from a checkpoint (use
   "-t, --timeout <seconds>",
   "Polling timeout in seconds (default: 120)",
   String(DEFAULT_TIMEOUT_SECONDS)
-).action(
+).option("-v, --verbose", "Show verbose output with timing information").action(
   async (checkpointId, prompt, options, command) => {
     const allOpts = command.optsWithGlobals();
     const timeoutSeconds = parseInt(options.timeout, 10);
@@ -13226,6 +13289,7 @@ runCmd.command("resume").description("Resume an agent run from a checkpoint (use
       );
       process.exit(1);
     }
+    const verbose = options.verbose || allOpts.verbose;
     try {
       if (!isUUID(checkpointId)) {
         console.error(
@@ -13234,25 +13298,22 @@ runCmd.command("resume").description("Resume an agent run from a checkpoint (use
         console.error(chalk4.gray("  Checkpoint ID must be a valid UUID"));
         process.exit(1);
       }
-      console.log(chalk4.blue("\nResuming agent run from checkpoint..."));
-      console.log(chalk4.gray(`  Checkpoint ID: ${checkpointId}`));
-      console.log(chalk4.gray(`  Prompt: ${prompt}`));
-      if (Object.keys(allOpts.volumeVersion).length > 0) {
-        console.log(
-          chalk4.gray(
-            `  Volume overrides: ${JSON.stringify(allOpts.volumeVersion)}`
-          )
-        );
+      if (verbose) {
+        logVerbosePreFlight("Resuming agent run from checkpoint", [
+          { label: "Checkpoint ID", value: checkpointId },
+          { label: "Prompt", value: prompt },
+          {
+            label: "Volume overrides",
+            value: Object.keys(allOpts.volumeVersion).length > 0 ? JSON.stringify(allOpts.volumeVersion) : void 0
+          }
+        ]);
       }
-      console.log();
-      console.log(chalk4.blue("Executing in sandbox..."));
-      console.log();
       const response = await apiClient.createRun({
         checkpointId,
         prompt,
         volumeVersions: Object.keys(allOpts.volumeVersion).length > 0 ? allOpts.volumeVersion : void 0
       });
-      await pollEvents(response.runId, timeoutSeconds);
+      await pollEvents(response.runId, timeoutSeconds, { verbose });
     } catch (error43) {
       if (error43 instanceof Error) {
         if (error43.message.includes("Not authenticated")) {
@@ -13283,7 +13344,7 @@ runCmd.command("continue").description(
   "-t, --timeout <seconds>",
   "Polling timeout in seconds (default: 120)",
   String(DEFAULT_TIMEOUT_SECONDS)
-).action(
+).option("-v, --verbose", "Show verbose output with timing information").action(
   async (agentSessionId, prompt, options, command) => {
     const allOpts = command.optsWithGlobals();
     const timeoutSeconds = parseInt(options.timeout, 10);
@@ -13293,6 +13354,7 @@ runCmd.command("continue").description(
       );
       process.exit(1);
     }
+    const verbose = options.verbose || allOpts.verbose;
     try {
       if (!isUUID(agentSessionId)) {
         console.error(
@@ -13301,26 +13363,23 @@ runCmd.command("continue").description(
         console.error(chalk4.gray("  Agent session ID must be a valid UUID"));
         process.exit(1);
       }
-      console.log(chalk4.blue("\nContinuing agent run from session..."));
-      console.log(chalk4.gray(`  Session ID: ${agentSessionId}`));
-      console.log(chalk4.gray(`  Prompt: ${prompt}`));
-      console.log(chalk4.gray(`  Note: Using latest artifact version`));
-      if (Object.keys(allOpts.volumeVersion).length > 0) {
-        console.log(
-          chalk4.gray(
-            `  Volume overrides: ${JSON.stringify(allOpts.volumeVersion)}`
-          )
-        );
+      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: "Volume overrides",
+            value: Object.keys(allOpts.volumeVersion).length > 0 ? JSON.stringify(allOpts.volumeVersion) : void 0
+          }
+        ]);
       }
-      console.log();
-      console.log(chalk4.blue("Executing in sandbox..."));
-      console.log();
       const response = await apiClient.createRun({
         sessionId: agentSessionId,
         prompt,
         volumeVersions: Object.keys(allOpts.volumeVersion).length > 0 ? allOpts.volumeVersion : void 0
       });
-      await pollEvents(response.runId, timeoutSeconds);
+      await pollEvents(response.runId, timeoutSeconds, { verbose });
     } catch (error43) {
       if (error43 instanceof Error) {
         if (error43.message.includes("Not authenticated")) {
@@ -14047,7 +14106,7 @@ var artifactCommand = new Command10().name("artifact").description("Manage cloud
 
 // src/index.ts
 var program = new Command11();
-program.name("vm0").description("VM0 CLI - A modern build tool").version("2.0.0");
+program.name("vm0").description("VM0 CLI - A modern build tool").version("3.1.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}`));

package/package.json

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