@vm0/runner 3.0.6 → 3.1.0

package/index.js

@@ -192,10 +192,11 @@ async function completeJob(apiUrl, context, exitCode, error) {
 import path4 from "path";
 
 // src/lib/firecracker/vm.ts
-import { execSync as execSync2, spawn } from "child_process";
+import { exec as exec3, spawn } from "child_process";
 import fs3 from "fs";
 import path2 from "path";
 import readline from "readline";
+import { promisify as promisify3 } from "util";
 
 // src/lib/firecracker/client.ts
 import http from "http";
@@ -706,23 +707,24 @@ async function clearStaleIptablesRulesForIP(ip) {
   } catch {
   }
 }
-async function createTapDevice(vmId) {
+async function createTapDevice(vmId, logger) {
+  const log = logger ?? console.log;
   const tapDevice = `tap${vmId.substring(0, 8)}`;
   const guestMac = generateMacAddress(vmId);
   const guestIp = await allocateIP(vmId);
+  log(`[VM ${vmId}] IP allocated: ${guestIp}`);
   await clearStaleIptablesRulesForIP(guestIp);
-  console.log(`Creating TAP device ${tapDevice} for VM ${vmId}...`);
-  await setupBridge();
+  log(`[VM ${vmId}] Stale iptables cleared`);
   if (await tapDeviceExists(tapDevice)) {
-    console.log(`TAP device ${tapDevice} already exists, deleting it first...`);
+    log(`[VM ${vmId}] TAP device ${tapDevice} already exists, deleting...`);
     await deleteTapDevice(tapDevice);
   }
   await execCommand(`ip tuntap add ${tapDevice} mode tap`);
+  log(`[VM ${vmId}] TAP device created`);
   await execCommand(`ip link set ${tapDevice} master ${BRIDGE_NAME2}`);
+  log(`[VM ${vmId}] TAP added to bridge`);
   await execCommand(`ip link set ${tapDevice} up`);
-  console.log(
-    `TAP ${tapDevice} created: guest MAC ${guestMac}, guest IP ${guestIp}`
-  );
+  log(`[VM ${vmId}] TAP created: ${tapDevice}, MAC ${guestMac}, IP ${guestIp}`);
   return {
     tapDevice,
     guestMac,
@@ -959,6 +961,7 @@ async function cleanupOrphanedProxyRules(runnerName) {
 }
 
 // src/lib/firecracker/vm.ts
+var execAsync3 = promisify3(exec3);
 var FirecrackerVM = class {
   config;
   process = null;
@@ -978,6 +981,9 @@ var FirecrackerVM = class {
     this.vmOverlayPath = path2.join(this.workDir, "overlay.ext4");
     this.vsockPath = path2.join(this.workDir, "vsock.sock");
   }
+  log(msg) {
+    (this.config.logger ?? console.log)(msg);
+  }
   /**
    * Get current VM state
    */
@@ -1021,15 +1027,21 @@ var FirecrackerVM = class {
       if (fs3.existsSync(this.socketPath)) {
         fs3.unlinkSync(this.socketPath);
       }
-      console.log(`[VM ${this.config.vmId}] Creating sparse overlay file...`);
-      const overlaySize = 2 * 1024 * 1024 * 1024;
-      const fd = fs3.openSync(this.vmOverlayPath, "w");
-      fs3.ftruncateSync(fd, overlaySize);
-      fs3.closeSync(fd);
-      execSync2(`mkfs.ext4 -F -q "${this.vmOverlayPath}"`, { stdio: "ignore" });
-      console.log(`[VM ${this.config.vmId}] Setting up network...`);
-      this.networkConfig = await createTapDevice(this.config.vmId);
-      console.log(`[VM ${this.config.vmId}] Starting Firecracker...`);
+      this.log(`[VM ${this.config.vmId}] Setting up overlay and network...`);
+      const createOverlay = async () => {
+        const overlaySize = 2 * 1024 * 1024 * 1024;
+        const fd = fs3.openSync(this.vmOverlayPath, "w");
+        fs3.ftruncateSync(fd, overlaySize);
+        fs3.closeSync(fd);
+        await execAsync3(`mkfs.ext4 -F -q "${this.vmOverlayPath}"`);
+        this.log(`[VM ${this.config.vmId}] Overlay created`);
+      };
+      const [, networkConfig] = await Promise.all([
+        createOverlay(),
+        createTapDevice(this.config.vmId, this.log.bind(this))
+      ]);
+      this.networkConfig = networkConfig;
+      this.log(`[VM ${this.config.vmId}] Starting Firecracker...`);
       this.process = spawn(
         this.config.firecrackerBinary,
         ["--api-sock", this.socketPath],
@@ -1040,11 +1052,11 @@ var FirecrackerVM = class {
         }
       );
       this.process.on("error", (err) => {
-        console.error(`[VM ${this.config.vmId}] Firecracker error:`, err);
+        this.log(`[VM ${this.config.vmId}] Firecracker error: ${err}`);
         this.state = "error";
       });
       this.process.on("exit", (code, signal) => {
-        console.log(
+        this.log(
           `[VM ${this.config.vmId}] Firecracker exited: code=${code}, signal=${signal}`
         );
         if (this.state !== "stopped") {
@@ -1057,7 +1069,7 @@ var FirecrackerVM = class {
         });
         stdoutRL.on("line", (line) => {
           if (line.trim()) {
-            console.log(`[VM ${this.config.vmId}] ${line}`);
+            this.log(`[VM ${this.config.vmId}] ${line}`);
           }
         });
       }
@@ -1067,19 +1079,19 @@ var FirecrackerVM = class {
         });
         stderrRL.on("line", (line) => {
           if (line.trim()) {
-            console.error(`[VM ${this.config.vmId}] stderr: ${line}`);
+            this.log(`[VM ${this.config.vmId}] stderr: ${line}`);
           }
         });
       }
       this.client = new FirecrackerClient(this.socketPath);
-      console.log(`[VM ${this.config.vmId}] Waiting for API...`);
+      this.log(`[VM ${this.config.vmId}] Waiting for API...`);
       await this.client.waitUntilReady(1e4, 100);
       this.state = "configuring";
       await this.configure();
-      console.log(`[VM ${this.config.vmId}] Booting...`);
+      this.log(`[VM ${this.config.vmId}] Booting...`);
       await this.client.start();
       this.state = "running";
-      console.log(
+      this.log(
         `[VM ${this.config.vmId}] Running at ${this.networkConfig.guestIp}`
       );
     } catch (error) {
@@ -1095,7 +1107,7 @@ var FirecrackerVM = class {
     if (!this.client || !this.networkConfig) {
       throw new Error("VM not properly initialized");
     }
-    console.log(
+    this.log(
       `[VM ${this.config.vmId}] Configuring: ${this.config.vcpus} vCPUs, ${this.config.memoryMb}MB RAM`
     );
     await this.client.setMachineConfig({
@@ -1104,28 +1116,26 @@ var FirecrackerVM = class {
     });
     const networkBootArgs = generateNetworkBootArgs(this.networkConfig);
     const bootArgs = `console=ttyS0 reboot=k panic=1 pci=off nomodules random.trust_cpu=on quiet loglevel=0 nokaslr audit=0 numa=off mitigations=off noresume init=/sbin/vm-init ${networkBootArgs}`;
-    console.log(`[VM ${this.config.vmId}] Boot args: ${bootArgs}`);
+    this.log(`[VM ${this.config.vmId}] Boot args: ${bootArgs}`);
     await this.client.setBootSource({
       kernel_image_path: this.config.kernelPath,
       boot_args: bootArgs
     });
-    console.log(
-      `[VM ${this.config.vmId}] Base rootfs: ${this.config.rootfsPath}`
-    );
+    this.log(`[VM ${this.config.vmId}] Base rootfs: ${this.config.rootfsPath}`);
     await this.client.setDrive({
       drive_id: "rootfs",
       path_on_host: this.config.rootfsPath,
       is_root_device: true,
       is_read_only: true
     });
-    console.log(`[VM ${this.config.vmId}] Overlay: ${this.vmOverlayPath}`);
+    this.log(`[VM ${this.config.vmId}] Overlay: ${this.vmOverlayPath}`);
     await this.client.setDrive({
       drive_id: "overlay",
       path_on_host: this.vmOverlayPath,
       is_root_device: false,
       is_read_only: false
     });
-    console.log(
+    this.log(
       `[VM ${this.config.vmId}] Network: ${this.networkConfig.tapDevice}`
     );
     await this.client.setNetworkInterface({
@@ -1133,7 +1143,7 @@ var FirecrackerVM = class {
       guest_mac: this.networkConfig.guestMac,
       host_dev_name: this.networkConfig.tapDevice
     });
-    console.log(`[VM ${this.config.vmId}] Vsock: ${this.vsockPath}`);
+    this.log(`[VM ${this.config.vmId}] Vsock: ${this.vsockPath}`);
     await this.client.setVsock({
       vsock_id: "vsock0",
       guest_cid: 3,
@@ -1145,17 +1155,16 @@ var FirecrackerVM = class {
    */
   async stop() {
     if (this.state !== "running") {
-      console.log(`[VM ${this.config.vmId}] Not running, state: ${this.state}`);
+      this.log(`[VM ${this.config.vmId}] Not running, state: ${this.state}`);
       return;
     }
     this.state = "stopping";
-    console.log(`[VM ${this.config.vmId}] Stopping...`);
+    this.log(`[VM ${this.config.vmId}] Stopping...`);
     try {
       if (this.client) {
         await this.client.sendCtrlAltDel().catch((error) => {
-          console.log(
-            `[VM ${this.config.vmId}] Graceful shutdown signal failed (VM may already be stopping):`,
-            error instanceof Error ? error.message : error
+          this.log(
+            `[VM ${this.config.vmId}] Graceful shutdown signal failed (VM may already be stopping): ${error instanceof Error ? error.message : error}`
           );
         });
       }
@@ -1167,7 +1176,7 @@ var FirecrackerVM = class {
    * Force kill the VM
    */
   async kill() {
-    console.log(`[VM ${this.config.vmId}] Force killing...`);
+    this.log(`[VM ${this.config.vmId}] Force killing...`);
     await this.cleanup();
   }
   /**
@@ -1192,7 +1201,7 @@ var FirecrackerVM = class {
     }
     this.client = null;
     this.state = "stopped";
-    console.log(`[VM ${this.config.vmId}] Stopped`);
+    this.log(`[VM ${this.config.vmId}] Stopped`);
   }
   /**
    * Wait for the VM process to exit
@@ -5626,11 +5635,6 @@ var appStringSchema = z6.string().superRefine((val, ctx) => {
 });
 var agentDefinitionSchema = z6.object({
   description: z6.string().optional(),
-  /**
-   * @deprecated Use `apps` field instead for pre-installed tools.
-   * This field will be removed in a future version.
-   */
-  image: z6.string().optional(),
   framework: z6.string().min(1, "Framework is required"),
   /**
    * Array of pre-installed apps/tools for the agent environment.
@@ -5640,8 +5644,6 @@ var agentDefinitionSchema = z6.object({
    */
   apps: z6.array(appStringSchema).optional(),
   volumes: z6.array(z6.string()).optional(),
-  working_dir: z6.string().optional(),
-  // Optional when provider supports auto-config
   environment: z6.record(z6.string(), z6.string()).optional(),
   /**
    * Path to instructions file (e.g., AGENTS.md).
@@ -5668,7 +5670,17 @@ var agentDefinitionSchema = z6.object({
    * Requires experimental_runner to be configured.
    * When enabled, filters outbound traffic by domain/IP rules.
    */
-  experimental_firewall: experimentalFirewallSchema.optional()
+  experimental_firewall: experimentalFirewallSchema.optional(),
+  /**
+   * @deprecated Server-resolved field. User input is ignored.
+   * @internal
+   */
+  image: z6.string().optional(),
+  /**
+   * @deprecated Server-resolved field. User input is ignored.
+   * @internal
+   */
+  working_dir: z6.string().optional()
 });
 var agentComposeContentSchema = z6.object({
   version: z6.string().min(1, "Version is required"),
@@ -6800,13 +6812,11 @@ var scopeResponseSchema = z14.object({
   id: z14.string().uuid(),
   slug: z14.string(),
   type: scopeTypeSchema,
-  displayName: z14.string().nullable(),
   createdAt: z14.string(),
   updatedAt: z14.string()
 });
 var createScopeRequestSchema = z14.object({
-  slug: scopeSlugSchema,
-  displayName: z14.string().max(128).optional()
+  slug: scopeSlugSchema
 });
 var updateScopeRequestSchema = z14.object({
   slug: scopeSlugSchema,
@@ -9299,7 +9309,8 @@ async function executeJob(context, config, options = {}) {
       kernelPath: config.firecracker.kernel,
       rootfsPath: config.firecracker.rootfs,
       firecrackerBinary: config.firecracker.binary,
-      workDir: path4.join(workspacesDir, `vm0-${vmId}`)
+      workDir: path4.join(workspacesDir, `vm0-${vmId}`),
+      logger: log
     };
     log(`[Executor] Creating VM ${vmId}...`);
     vm = new FirecrackerVM(vmConfig);
@@ -10253,14 +10264,14 @@ var Timer = class {
     this.startTime = Date.now();
   }
   /**
-   * Get elapsed time formatted as [MM:SS.s]
+   * Get elapsed time formatted as [MM:SS.ss]
    */
   elapsed() {
     const ms = Date.now() - this.startTime;
     const totalSeconds = ms / 1e3;
     const minutes = Math.floor(totalSeconds / 60);
-    const seconds = (totalSeconds % 60).toFixed(1);
-    return `[${String(minutes).padStart(2, "0")}:${seconds.padStart(4, "0")}]`;
+    const seconds = (totalSeconds % 60).toFixed(2);
+    return `[${String(minutes).padStart(2, "0")}:${seconds.padStart(5, "0")}]`;
   }
   /**
    * Log message with timestamp
@@ -10334,7 +10345,7 @@ var benchmarkCommand = new Command4("benchmark").description(
 });
 
 // src/index.ts
-var version = true ? "3.0.6" : "0.1.0";
+var version = true ? "3.1.0" : "0.1.0";
 program.name("vm0-runner").version(version).description("Self-hosted runner for VM0 agents");
 program.addCommand(startCommand);
 program.addCommand(doctorCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vm0/runner",
-  "version": "3.0.6",
+  "version": "3.1.0",
   "description": "Self-hosted runner for VM0 agents",
   "repository": {
     "type": "git",