@vm0/runner 3.7.2 → 3.7.3

package/index.js

@@ -5,12 +5,41 @@ import { program } from "commander";
 
 // src/commands/start.ts
 import { Command } from "commander";
-import { dirname, join as join2 } from "path";
+import { dirname, join } from "path";
 
 // src/lib/config.ts
 import { z } from "zod";
 import fs from "fs";
 import yaml from "yaml";
+
+// src/lib/paths.ts
+import path from "path";
+var VM0_RUN_DIR = "/var/run/vm0";
+var VM0_TMP_PREFIX = "/tmp/vm0";
+var paths = {
+  /** Runner PID file for single-instance lock */
+  runnerPid: path.join(VM0_RUN_DIR, "runner.pid"),
+  /** IP pool lock file */
+  ipPoolLock: path.join(VM0_RUN_DIR, "ip-pool.lock.active"),
+  /** IP allocation registry */
+  ipRegistry: path.join(VM0_RUN_DIR, "ip-registry.json")
+};
+var dataPaths = {
+  /** Overlay pool directory for pre-warmed VM overlays */
+  overlayPool: (dataDir) => path.join(dataDir, "overlay-pool")
+};
+var tempPaths = {
+  /** Default proxy CA directory */
+  proxyDir: `${VM0_TMP_PREFIX}-proxy`,
+  /** VM registry for proxy */
+  vmRegistry: `${VM0_TMP_PREFIX}-vm-registry.json`,
+  /** VM work directory (fallback when not using workspaces) */
+  vmWorkDir: (vmId) => `${VM0_TMP_PREFIX}-vm-${vmId}`,
+  /** Network log file for a run */
+  networkLog: (runId) => `${VM0_TMP_PREFIX}-network-${runId}.jsonl`
+};
+
+// src/lib/config.ts
 var SANDBOX_DEFAULTS = {
   max_concurrent: 1,
   vcpu: 2,
@@ -27,8 +56,9 @@ var runnerConfigSchema = z.object({
     /^[a-z0-9-]+\/[a-z0-9-]+$/,
     "Group must be in format 'scope/name' (lowercase, hyphens allowed)"
   ),
+  data_dir: z.string().min(1, "Data directory is required"),
   server: z.object({
-    url: z.string().url("Server URL must be a valid URL"),
+    url: z.url({ message: "Server URL must be a valid URL" }),
     token: z.string().min(1, "Server token is required")
   }),
   sandbox: z.object({
@@ -54,8 +84,9 @@ var DEBUG_SERVER_DEFAULTS = {
 var debugConfigSchema = z.object({
   name: z.string().default("debug-runner"),
   group: z.string().default("debug/local"),
+  data_dir: z.string().min(1, "Data directory is required"),
   server: z.object({
-    url: z.string().url().default(DEBUG_SERVER_DEFAULTS.url),
+    url: z.url().default(DEBUG_SERVER_DEFAULTS.url),
     token: z.string().default(DEBUG_SERVER_DEFAULTS.token)
   }).default(DEBUG_SERVER_DEFAULTS),
   sandbox: z.object({
@@ -71,8 +102,8 @@ var debugConfigSchema = z.object({
   }),
   proxy: z.object({
     port: z.number().int().min(1024).max(65535).default(PROXY_DEFAULTS.port),
-    ca_dir: z.string().default("/tmp/vm0-proxy")
-  }).default({ ...PROXY_DEFAULTS, ca_dir: "/tmp/vm0-proxy" })
+    ca_dir: z.string().default(tempPaths.proxyDir)
+  }).default({ ...PROXY_DEFAULTS, ca_dir: tempPaths.proxyDir })
 });
 function loadDebugConfig(configPath) {
   if (!fs.existsSync(configPath)) {
@@ -448,7 +479,6 @@ import { promisify as promisify2 } from "util";
 import { exec } from "child_process";
 import { promisify } from "util";
 import * as fs2 from "fs";
-import * as path from "path";
 
 // src/lib/logger.ts
 var _log = null;
@@ -473,8 +503,7 @@ function createLogger(prefix) {
 // src/lib/firecracker/ip-pool.ts
 var execAsync = promisify(exec);
 var logger = createLogger("IP Pool");
-var VM0_RUN_DIR = "/var/run/vm0";
-var REGISTRY_FILE_PATH = path.join(VM0_RUN_DIR, "ip-registry.json");
+var REGISTRY_FILE_PATH = paths.ipRegistry;
 var BRIDGE_NAME = "vm0br0";
 var IP_PREFIX = "172.16.0.";
 var IP_START = 2;
@@ -490,7 +519,7 @@ async function ensureRunDir() {
 }
 async function withLock(fn) {
   await ensureRunDir();
-  const lockMarker = path.join(VM0_RUN_DIR, "ip-pool.lock.active");
+  const lockMarker = paths.ipPoolLock;
   const startTime = Date.now();
   let lockAcquired = false;
   while (Date.now() - startTime < LOCK_TIMEOUT_MS) {
@@ -1071,8 +1100,6 @@ import path2 from "path";
 import { promisify as promisify3 } from "util";
 var execAsync3 = promisify3(exec3);
 var logger3 = createLogger("OverlayPool");
-var VM0_RUN_DIR2 = "/var/run/vm0";
-var DEFAULT_POOL_DIR = path2.join(VM0_RUN_DIR2, "overlay-pool");
 var OVERLAY_SIZE = 2 * 1024 * 1024 * 1024;
 async function defaultCreateFile(filePath) {
   const fd = fs3.openSync(filePath, "w");
@@ -1089,7 +1116,7 @@ var OverlayPool = class {
     this.config = {
       size: config.size,
       replenishThreshold: config.replenishThreshold,
-      poolDir: config.poolDir ?? DEFAULT_POOL_DIR,
+      poolDir: config.poolDir,
       createFile: config.createFile ?? defaultCreateFile
     };
   }
@@ -1276,7 +1303,7 @@ var FirecrackerVM = class {
   // Vsock UDS path for host-guest communication
   constructor(config) {
     this.config = config;
-    this.workDir = config.workDir || `/tmp/vm0-vm-${config.vmId}`;
+    this.workDir = config.workDir || tempPaths.vmWorkDir(config.vmId);
     this.socketPath = path3.join(this.workDir, "firecracker.sock");
     this.vsockPath = path3.join(this.workDir, "vsock.sock");
   }
@@ -8694,10 +8721,6 @@ var FEATURE_SWITCHES = {
   ["platformApiKeys" /* PlatformApiKeys */]: {
     maintainer: "ethan@vm0.ai",
     enabled: false
-  },
-  ["platformLogs" /* PlatformLogs */]: {
-    maintainer: "ethan@vm0.ai",
-    enabled: false
   }
 };
 
@@ -8707,7 +8730,7 @@ var ENV_LOADER_PATH = "/usr/local/bin/vm0-agent/env-loader.mjs";
 // src/lib/proxy/vm-registry.ts
 import fs6 from "fs";
 var logger5 = createLogger("VMRegistry");
-var DEFAULT_REGISTRY_PATH = "/tmp/vm0-vm-registry.json";
+var DEFAULT_REGISTRY_PATH = tempPaths.vmRegistry;
 var VMRegistry = class {
   registryPath;
   data;
@@ -9299,8 +9322,7 @@ addons = [tls_clienthello, request, response]
 var logger6 = createLogger("ProxyManager");
 var DEFAULT_PROXY_OPTIONS = {
   port: 8080,
-  registryPath: DEFAULT_REGISTRY_PATH,
-  apiUrl: process.env.VM0_API_URL || "https://www.vm0.ai"
+  registryPath: DEFAULT_REGISTRY_PATH
 };
 var ProxyManager = class {
   config;
@@ -9699,7 +9721,7 @@ function buildEnvironmentVariables(context, apiUrl) {
 import fs8 from "fs";
 var logger8 = createLogger("NetworkLogs");
 function getNetworkLogPath(runId) {
-  return `/tmp/vm0-network-${runId}.jsonl`;
+  return tempPaths.networkLog(runId);
 }
 function readNetworkLogs(runId) {
   const logPath = getNetworkLogPath(runId);
@@ -9992,8 +10014,7 @@ import path6 from "path";
 import { promisify as promisify4 } from "util";
 var execAsync4 = promisify4(exec4);
 var logger11 = createLogger("RunnerLock");
-var DEFAULT_RUN_DIR = "/var/run/vm0";
-var DEFAULT_PID_FILE = `${DEFAULT_RUN_DIR}/runner.pid`;
+var DEFAULT_PID_FILE = paths.runnerPid;
 var currentPidFile = null;
 async function ensureRunDir2(dirPath, skipSudo) {
   if (!fs9.existsSync(dirPath)) {
@@ -10073,7 +10094,8 @@ async function setupEnvironment(options) {
   logger12.log("Initializing overlay pool...");
   await initOverlayPool({
     size: config.sandbox.max_concurrent + 2,
-    replenishThreshold: config.sandbox.max_concurrent
+    replenishThreshold: config.sandbox.max_concurrent,
+    poolDir: dataPaths.overlayPool(config.data_dir)
   });
   logger12.log("Initializing network proxy...");
   initVMRegistry();
@@ -10380,7 +10402,7 @@ var startCommand = new Command("start").description("Start the runner").option("
     const config = loadConfig(options.config);
     validateFirecrackerPaths(config.firecracker);
     console.log("Config valid");
-    const statusFilePath = join2(dirname(options.config), "status.json");
+    const statusFilePath = join(dirname(options.config), "status.json");
     const runner = new Runner(config, statusFilePath);
     await runner.start();
   } catch (error) {
@@ -10396,7 +10418,7 @@ var startCommand = new Command("start").description("Start the runner").option("
 // src/commands/doctor.ts
 import { Command as Command2 } from "commander";
 import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync2 } from "fs";
-import { dirname as dirname2, join as join3 } from "path";
+import { dirname as dirname2, join as join2 } from "path";
 
 // src/lib/firecracker/process.ts
 import { readdirSync, readFileSync as readFileSync2, existsSync as existsSync3 } from "fs";
@@ -10512,8 +10534,8 @@ var doctorCommand = new Command2("doctor").description("Diagnose runner health,
     try {
       const config = loadConfig(options.config);
       const configDir = dirname2(options.config);
-      const statusFilePath = join3(configDir, "status.json");
-      const workspacesDir = join3(configDir, "workspaces");
+      const statusFilePath = join2(configDir, "status.json");
+      const workspacesDir = join2(configDir, "workspaces");
       console.log(`Runner: ${config.name}`);
       let status = null;
       if (existsSync4(statusFilePath)) {
@@ -10711,7 +10733,7 @@ function formatUptime(ms) {
 // src/commands/kill.ts
 import { Command as Command3 } from "commander";
 import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync3, rmSync } from "fs";
-import { dirname as dirname3, join as join4 } from "path";
+import { dirname as dirname3, join as join3 } from "path";
 import * as readline2 from "readline";
 var killCommand = new Command3("kill").description("Force terminate a run and clean up all resources").argument("<run-id>", "Run ID (full UUID or short 8-char vmId)").option("--config <path>", "Config file path", "./runner.yaml").option("--force", "Skip confirmation prompt").action(
   // eslint-disable-next-line complexity -- TODO: refactor complex function
@@ -10719,13 +10741,13 @@ var killCommand = new Command3("kill").description("Force terminate a run and cl
     try {
       loadConfig(options.config);
       const configDir = dirname3(options.config);
-      const statusFilePath = join4(configDir, "status.json");
-      const workspacesDir = join4(configDir, "workspaces");
+      const statusFilePath = join3(configDir, "status.json");
+      const workspacesDir = join3(configDir, "workspaces");
       const { vmId, runId } = resolveRunId(runIdArg, statusFilePath);
       console.log(`Killing run ${vmId}...`);
       const proc = findProcessByVmId(vmId);
       const tapDevice = `tap${vmId}`;
-      const workspaceDir = join4(workspacesDir, `vm0-${vmId}`);
+      const workspaceDir = join3(workspacesDir, `vm0-${vmId}`);
       console.log("");
       console.log("Resources to clean up:");
       if (proc) {
@@ -10966,7 +10988,7 @@ var benchmarkCommand = new Command4("benchmark").description(
     await initOverlayPool({
       size: 2,
       replenishThreshold: 1,
-      poolDir: "/var/run/vm0/overlay-pool-benchmark"
+      poolDir: dataPaths.overlayPool(config.data_dir)
     });
     timer.log(`Executing command: ${prompt}`);
     const context = createBenchmarkContext(prompt, options);
@@ -10988,7 +11010,7 @@ var benchmarkCommand = new Command4("benchmark").description(
 });
 
 // src/index.ts
-var version = true ? "3.7.2" : "0.1.0";
+var version = true ? "3.7.3" : "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.7.2",
+  "version": "3.7.3",
   "description": "Self-hosted runner for VM0 agents",
   "repository": {
     "type": "git",