@vm0/runner 2.0.0 → 2.0.2

package/index.js

@@ -105,7 +105,7 @@ async function claimJob(server, runId) {
   }
   return response.json();
 }
-async function completeJob(context, exitCode, error) {
+async function completeJob(apiUrl, context, exitCode, error) {
   const headers = {
     Authorization: `Bearer ${context.sandboxToken}`,
     "Content-Type": "application/json"
@@ -114,18 +114,15 @@ async function completeJob(context, exitCode, error) {
   if (bypassSecret) {
     headers["x-vercel-protection-bypass"] = bypassSecret;
   }
-  const response = await fetch(
-    `${context.apiUrl}/api/webhooks/agent/complete`,
-    {
-      method: "POST",
-      headers,
-      body: JSON.stringify({
-        runId: context.runId,
-        exitCode,
-        error
-      })
-    }
-  );
+  const response = await fetch(`${apiUrl}/api/webhooks/agent/complete`, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({
+      runId: context.runId,
+      exitCode,
+      error
+    })
+  });
   if (!response.ok) {
     const errorData = await response.json();
     throw new Error(
@@ -654,10 +651,12 @@ var FirecrackerVM = class {
     console.log(`[VM ${this.config.vmId}] Stopping...`);
     try {
       if (this.client) {
-        try {
-          await this.client.sendCtrlAltDel();
-        } catch {
-        }
+        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
+          );
+        });
       }
     } finally {
       await this.cleanup();
@@ -851,14 +850,9 @@ var SSHClient = class {
    */
   async waitUntilReachable(timeoutMs = 12e4, intervalMs = 2e3) {
     const start = Date.now();
-    let lastError = null;
     while (Date.now() - start < timeoutMs) {
-      try {
-        if (await this.isReachable()) {
-          return;
-        }
-      } catch (err) {
-        lastError = err instanceof Error ? err : new Error(String(err));
+      if (await this.isReachable()) {
+        return;
       }
       await new Promise((resolve) => {
         const remaining = timeoutMs - (Date.now() - start);
@@ -870,7 +864,7 @@ var SSHClient = class {
       });
     }
     throw new Error(
-      `SSH not reachable after ${timeoutMs}ms at ${this.config.host}: ${lastError?.message || "timeout"}`
+      `SSH not reachable after ${timeoutMs}ms at ${this.config.host}`
     );
   }
   /**
@@ -6172,7 +6166,6 @@ var executionContextSchema = z15.object({
   secretNames: z15.array(z15.string()).nullable(),
   checkpointId: z15.string().uuid().nullable(),
   sandboxToken: z15.string(),
-  apiUrl: z15.string(),
   // New fields for E2B parity:
   workingDir: z15.string(),
   storageManifest: storageManifestSchema.nullable(),
@@ -9013,9 +9006,9 @@ function getAllScripts() {
 function getVmIdFromRunId(runId) {
   return runId.split("-")[0] || runId.substring(0, 8);
 }
-function buildEnvironmentVariables(context) {
+function buildEnvironmentVariables(context, apiUrl) {
   const envVars = {
-    VM0_API_URL: context.apiUrl,
+    VM0_API_URL: apiUrl,
     VM0_RUN_ID: context.runId,
     VM0_API_TOKEN: context.sandboxToken,
     VM0_PROMPT: context.prompt,
@@ -9155,23 +9148,41 @@ async function executeJob(context, config) {
         context.cliAgentType || "claude-code"
       );
     }
-    const envVars = buildEnvironmentVariables(context);
+    const envVars = buildEnvironmentVariables(context, config.server.url);
     const envJson = JSON.stringify(envVars);
     console.log(
       `[Executor] Writing env JSON (${envJson.length} bytes) to ${ENV_JSON_PATH}`
     );
     await ssh.writeFile(ENV_JSON_PATH, envJson);
     const systemLogFile = `/tmp/vm0-main-${context.runId}.log`;
-    console.log(`[Executor] Running agent via env-loader...`);
+    const exitCodeFile = `/tmp/vm0-exit-${context.runId}`;
+    console.log(`[Executor] Running agent via env-loader (background)...`);
     const startTime = Date.now();
-    const result = await ssh.exec(
-      `{ python3 -u ${ENV_LOADER_PATH}; } > ${systemLogFile} 2>&1; echo "EXIT_CODE:$?"`
+    await ssh.exec(
+      `nohup sh -c 'python3 -u ${ENV_LOADER_PATH}; echo $? > ${exitCodeFile}' > ${systemLogFile} 2>&1 &`
     );
-    const lines = result.stdout.trim().split("\n");
-    const exitCodeLine = lines[lines.length - 1] ?? "";
-    const exitCodeMatch = exitCodeLine.match(/EXIT_CODE:(\d+)/);
-    const exitCode = exitCodeMatch && exitCodeMatch[1] ? parseInt(exitCodeMatch[1], 10) : 1;
+    console.log(`[Executor] Agent started in background`);
+    const pollIntervalMs = 2e3;
+    const maxWaitMs = 24 * 60 * 60 * 1e3;
+    let exitCode = 1;
+    let completed = false;
+    while (Date.now() - startTime < maxWaitMs) {
+      await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+      const checkResult = await ssh.exec(`cat ${exitCodeFile} 2>/dev/null`);
+      if (checkResult.exitCode === 0 && checkResult.stdout.trim()) {
+        exitCode = parseInt(checkResult.stdout.trim(), 10) || 1;
+        completed = true;
+        break;
+      }
+    }
     const duration = Math.round((Date.now() - startTime) / 1e3);
+    if (!completed) {
+      console.log(`[Executor] Agent timed out after ${duration}s`);
+      return {
+        exitCode: 1,
+        error: `Agent execution timed out after ${duration}s`
+      };
+    }
     console.log(
       `[Executor] Agent finished in ${duration}s with exit code ${exitCode}`
     );
@@ -9195,14 +9206,7 @@ async function executeJob(context, config) {
   } finally {
     if (vm) {
       console.log(`[Executor] Cleaning up VM ${vmId}...`);
-      try {
-        await vm.kill();
-      } catch (error) {
-        console.error(
-          `[Executor] Failed to cleanup VM ${vmId}:`,
-          error instanceof Error ? error.message : error
-        );
-      }
+      await vm.kill();
     }
   }
 }
@@ -9224,15 +9228,8 @@ async function executeJob2(context, config) {
   } catch (err) {
     const error = err instanceof Error ? err.message : "Unknown execution error";
     console.error(`  Job ${context.runId} execution failed: ${error}`);
-    try {
-      const result = await completeJob(context, 1, error);
-      console.log(`  Job ${context.runId} reported as ${result.status}`);
-    } catch (reportErr) {
-      console.error(
-        `  Failed to report job ${context.runId} completion:`,
-        reportErr instanceof Error ? reportErr.message : "Unknown error"
-      );
-    }
+    const result = await completeJob(config.server.url, context, 1, error);
+    console.log(`  Job ${context.runId} reported as ${result.status}`);
   }
 }
 var startCommand = new Command("start").description("Start the runner").option("--config <path>", "Config file path", "./runner.yaml").action(async (options) => {
@@ -9336,7 +9333,7 @@ var statusCommand = new Command2("status").description("Show runner status").act
 });
 
 // src/index.ts
-var version = true ? "2.0.0" : "0.1.0";
+var version = true ? "2.0.2" : "0.1.0";
 program.name("vm0-runner").version(version).description("Self-hosted runner for VM0 agents");
 program.addCommand(startCommand);
 program.addCommand(statusCommand);

package/package.json

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