@vm0/runner 2.0.3 → 2.1.0

package/index.js

@@ -5,6 +5,8 @@ import { program } from "commander";
 
 // src/commands/start.ts
 import { Command } from "commander";
+import { writeFileSync } from "fs";
+import { dirname, join } from "path";
 
 // src/lib/config.ts
 import { z } from "zod";
@@ -4766,6 +4768,13 @@ var apiErrorSchema = z3.object({
 // ../../packages/core/src/contracts/composes.ts
 import { z as z4 } from "zod";
 var c = initContract();
+var composeVersionQuerySchema = z4.preprocess(
+  (val) => val === void 0 || val === null ? void 0 : String(val),
+  z4.string().min(1, "Missing version query parameter").regex(
+    /^[a-f0-9]{8,64}$|^latest$/i,
+    "Version must be 8-64 hex characters or 'latest'"
+  )
+);
 var agentNameSchema = z4.string().min(3, "Agent name must be at least 3 characters").max(64, "Agent name must be 64 characters or less").regex(
   /^[a-zA-Z0-9][a-zA-Z0-9-]{1,62}[a-zA-Z0-9]$/,
   "Agent name must start and end with letter or number, and contain only letters, numbers, and hyphens"
@@ -4902,7 +4911,7 @@ var composesVersionsContract = c.router({
     path: "/api/agent/composes/versions",
     query: z4.object({
       composeId: z4.string().min(1, "Missing composeId query parameter"),
-      version: z4.string().min(1, "Missing version query parameter")
+      version: composeVersionQuerySchema
     }),
     responses: {
       200: z4.object({
@@ -5213,6 +5222,10 @@ var runNetworkLogsContract = c2.router({
 import { z as z6 } from "zod";
 var c3 = initContract();
 var storageTypeSchema = z6.enum(["volume", "artifact"]);
+var versionQuerySchema = z6.preprocess(
+  (val) => val === void 0 || val === null ? void 0 : String(val),
+  z6.string().regex(/^[a-f0-9]{8,64}$/i, "Version must be 8-64 hex characters").optional()
+);
 var uploadStorageResponseSchema = z6.object({
   name: z6.string(),
   versionId: z6.string(),
@@ -5261,7 +5274,7 @@ var storagesContract = c3.router({
     path: "/api/storages",
     query: z6.object({
       name: z6.string().min(1, "Storage name is required"),
-      version: z6.string().optional()
+      version: versionQuerySchema
     }),
     responses: {
       // Binary response - actual handling done at route level
@@ -5361,7 +5374,7 @@ var storagesDownloadContract = c3.router({
     query: z6.object({
       name: z6.string().min(1, "Storage name is required"),
       type: storageTypeSchema,
-      version: z6.string().optional()
+      version: versionQuerySchema
     }),
     responses: {
       // Normal response with presigned URL
@@ -9235,6 +9248,22 @@ async function executeJob(context, config) {
 
 // src/commands/start.ts
 var activeJobs = /* @__PURE__ */ new Set();
+function writeStatusFile(statusFilePath, mode, startedAt) {
+  const status = {
+    mode,
+    active_jobs: activeJobs.size,
+    active_job_ids: Array.from(activeJobs),
+    started_at: startedAt.toISOString(),
+    updated_at: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  try {
+    writeFileSync(statusFilePath, JSON.stringify(status, null, 2));
+  } catch (err) {
+    console.error(
+      `Failed to write status file: ${err instanceof Error ? err.message : "Unknown error"}`
+    );
+  }
+}
 async function executeJob2(context, config) {
   console.log(`  Executing job ${context.runId}...`);
   console.log(`  Prompt: ${context.prompt.substring(0, 100)}...`);
@@ -9269,26 +9298,61 @@ var startCommand = new Command("start").description("Start the runner").option("
     }
     console.log("Setting up network bridge...");
     await setupBridge();
+    const statusFilePath = join(dirname(options.config), "status.json");
+    const startedAt = /* @__PURE__ */ new Date();
+    const state = { mode: "running" };
+    const updateStatus = () => {
+      writeStatusFile(statusFilePath, state.mode, startedAt);
+    };
     console.log(
       `Starting runner '${config.name}' for group '${config.group}'...`
     );
     console.log(`Max concurrent jobs: ${config.sandbox.max_concurrent}`);
+    console.log(`Status file: ${statusFilePath}`);
     console.log("Press Ctrl+C to stop");
     console.log("");
+    updateStatus();
     let running = true;
     process.on("SIGINT", () => {
       console.log("\nShutting down...");
       running = false;
+      state.mode = "stopped";
+      updateStatus();
     });
     process.on("SIGTERM", () => {
       console.log("\nShutting down...");
       running = false;
+      state.mode = "stopped";
+      updateStatus();
+    });
+    process.on("SIGUSR1", () => {
+      if (state.mode === "running") {
+        console.log("\n[Maintenance] Entering drain mode...");
+        console.log(
+          `[Maintenance] Active jobs: ${activeJobs.size} (will wait for completion)`
+        );
+        state.mode = "draining";
+        updateStatus();
+      }
     });
     const jobPromises = /* @__PURE__ */ new Set();
     while (running) {
+      if (state.mode === "draining") {
+        if (activeJobs.size === 0) {
+          console.log("[Maintenance] All jobs completed, exiting drain mode");
+          running = false;
+          break;
+        }
+        if (jobPromises.size > 0) {
+          await Promise.race(jobPromises);
+          updateStatus();
+        }
+        continue;
+      }
       if (activeJobs.size >= config.sandbox.max_concurrent) {
         if (jobPromises.size > 0) {
           await Promise.race(jobPromises);
+          updateStatus();
         }
         continue;
       }
@@ -9305,6 +9369,7 @@ var startCommand = new Command("start").description("Start the runner").option("
           const context = await claimJob(config.server, job.runId);
           console.log(`Claimed job: ${context.runId}`);
           activeJobs.add(context.runId);
+          updateStatus();
           const jobPromise = executeJob2(context, config).catch((error) => {
             console.error(
               `Job ${context.runId} failed:`,
@@ -9313,6 +9378,7 @@ var startCommand = new Command("start").description("Start the runner").option("
           }).finally(() => {
             activeJobs.delete(context.runId);
             jobPromises.delete(jobPromise);
+            updateStatus();
           });
           jobPromises.add(jobPromise);
         } catch (error) {
@@ -9335,6 +9401,8 @@ var startCommand = new Command("start").description("Start the runner").option("
       );
       await Promise.all(jobPromises);
     }
+    state.mode = "stopped";
+    updateStatus();
     console.log("Runner stopped");
     process.exit(0);
   } catch (error) {
@@ -9355,7 +9423,7 @@ var statusCommand = new Command2("status").description("Show runner status").act
 });
 
 // src/index.ts
-var version = true ? "2.0.3" : "0.1.0";
+var version = true ? "2.1.0" : "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.3",
+  "version": "2.1.0",
   "description": "Self-hosted runner for VM0 agents",
   "repository": {
     "type": "git",