@vm0/runner 3.16.7 → 3.17.0

package/index.js

@@ -1888,12 +1888,39 @@ function encode(type, seq, payload = Buffer.alloc(0)) {
   header.writeUInt32BE(body.length, 0);
   return Buffer.concat([header, body]);
 }
-function encodeExecPayload(command, timeoutMs) {
+function encodeExecPayload(command, timeoutMs, env) {
   const cmdBuf = Buffer.from(command, "utf-8");
-  const payload = Buffer.alloc(8 + cmdBuf.length);
+  const envEntries = env ? Object.entries(env) : [];
+  let envSize = 0;
+  const encodedEntries = [];
+  if (envEntries.length > 0) {
+    envSize = 4;
+    for (const [key, val] of envEntries) {
+      const keyBuf = Buffer.from(key, "utf-8");
+      const valBuf = Buffer.from(val, "utf-8");
+      envSize += 4 + keyBuf.length + 4 + valBuf.length;
+      encodedEntries.push([keyBuf, valBuf]);
+    }
+  }
+  const payload = Buffer.alloc(8 + cmdBuf.length + envSize);
   payload.writeUInt32BE(timeoutMs, 0);
   payload.writeUInt32BE(cmdBuf.length, 4);
   cmdBuf.copy(payload, 8);
+  if (encodedEntries.length > 0) {
+    let offset = 8 + cmdBuf.length;
+    payload.writeUInt32BE(encodedEntries.length, offset);
+    offset += 4;
+    for (const [keyBuf, valBuf] of encodedEntries) {
+      payload.writeUInt32BE(keyBuf.length, offset);
+      offset += 4;
+      keyBuf.copy(payload, offset);
+      offset += keyBuf.length;
+      payload.writeUInt32BE(valBuf.length, offset);
+      offset += 4;
+      valBuf.copy(payload, offset);
+      offset += valBuf.length;
+    }
+  }
   return payload;
 }
 function encodeWriteFilePayload(path10, content, sudo) {
@@ -2091,10 +2118,10 @@ var VsockClient = class {
   /**
    * Execute a command on the remote VM
    */
-  async exec(command, timeoutMs) {
+  async exec(command, timeoutMs, env) {
     const actualTimeout = timeoutMs ?? DEFAULT_EXEC_TIMEOUT_MS;
     try {
-      const payload = encodeExecPayload(command, actualTimeout);
+      const payload = encodeExecPayload(command, actualTimeout, env);
       const response = await this.request(
         MSG_EXEC,
         payload,
@@ -2325,8 +2352,8 @@ var VsockClient = class {
    * Returns immediately with the PID. Use waitForExit() to wait for completion.
    * When the process exits, the agent sends an unsolicited notification.
    */
-  async spawnAndWatch(command, timeoutMs = 0) {
-    const payload = encodeExecPayload(command, timeoutMs);
+  async spawnAndWatch(command, timeoutMs = 0, env) {
+    const payload = encodeExecPayload(command, timeoutMs, env);
     const response = await this.request(
       MSG_SPAWN_WATCH,
       payload,
@@ -2448,7 +2475,7 @@ var GUEST_BINARY_PATHS = {
   /** Storage download - parallel downloads with streaming extraction */
   guestDownload: "/usr/local/bin/guest-download"
 };
-var ENV_LOADER_PATH = "/usr/local/bin/vm0-agent/env-loader.mjs";
+var RUN_AGENT_PATH = "/usr/local/bin/vm0-agent/run-agent.mjs";
 
 // src/lib/proxy/vm-registry.ts
 import fs6 from "fs";
@@ -2896,7 +2923,6 @@ async function restoreSessionHistory(guest, resumeSession, workingDir, cliAgentT
 }
 
 // src/lib/executor/env.ts
-var ENV_JSON_PATH = "/tmp/vm0-env.json";
 function buildEnvironmentVariables(context, apiUrl) {
   const envVars = {
     VM0_API_URL: apiUrl,
@@ -3074,9 +3100,7 @@ async function executeJob(context, config, options = {}) {
     logger9.log(
       `VM ${vmId} started, guest IP: ${guestIp}, veth NS IP: ${vethNsIp}`
     );
-    const envJson = JSON.stringify(
-      buildEnvironmentVariables(context, config.server.url)
-    );
+    const envVars = buildEnvironmentVariables(context, config.server.url);
     const firewallConfig = context.experimentalFirewall;
     if (firewallConfig?.enabled) {
       const mitmEnabled = firewallConfig.experimental_mitm ?? false;
@@ -3114,10 +3138,6 @@ async function executeJob(context, config, options = {}) {
         )
       );
     }
-    logger9.log(
-      `Writing env JSON (${envJson.length} bytes) to ${ENV_JSON_PATH}`
-    );
-    await guest.writeFile(ENV_JSON_PATH, envJson);
     const systemLogFile = `/tmp/vm0-main-${context.runId}.log`;
     const startTime = Date.now();
     const maxWaitMs = 2 * 60 * 60 * 1e3;
@@ -3126,10 +3146,12 @@ async function executeJob(context, config, options = {}) {
       logger9.log(`Running command directly (benchmark mode)...`);
       command = `${context.prompt} > ${systemLogFile} 2>&1`;
     } else {
-      logger9.log(`Running agent via env-loader...`);
-      command = `node ${ENV_LOADER_PATH} > ${systemLogFile} 2>&1`;
+      logger9.log(
+        `Running agent via vsock with ${Object.keys(envVars).length} env vars...`
+      );
+      command = `node ${RUN_AGENT_PATH} > ${systemLogFile} 2>&1`;
     }
-    const { pid } = await guest.spawnAndWatch(command, maxWaitMs);
+    const { pid } = await guest.spawnAndWatch(command, maxWaitMs, envVars);
     logger9.log(`Process started with pid=${pid}`);
     let exitCode = 1;
     let exitEvent;
@@ -4646,7 +4668,7 @@ var snapshotCommand = new Command5("snapshot").description("Generate a Firecrack
 );
 
 // src/index.ts
-var version = true ? "3.16.7" : "0.1.0";
+var version = true ? "3.17.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.16.7",
+  "version": "3.17.0",
   "description": "Self-hosted runner for VM0 agents",
   "repository": {
     "type": "git",