@algosuite/vo-mcp 0.2.0-beta.16 → 0.2.0-beta.17

package/dist/runner-supervisor.js

@@ -66,11 +66,11 @@ function createControlPlaneClient({
     throw new Error("VO_CONTROL_PLANE_URL is required for the code-runner daemon");
   }
   const root = resolvedBaseUrl.replace(/\/+$/, "");
-  async function req(method, path, body, { timeoutMs } = {}) {
+  async function req(method, path2, body, { timeoutMs } = {}) {
     const bearer = await resolveBearer(env);
     const controller = timeoutMs ? new AbortController() : null;
     let timeoutId;
-    const request = Promise.resolve(fetchImpl(`${root}${path}`, {
+    const request = Promise.resolve(fetchImpl(`${root}${path2}`, {
       method,
       headers: {
         "content-type": "application/json",
@@ -83,7 +83,7 @@ function createControlPlaneClient({
     const timeout = new Promise((_, reject) => {
       timeoutId = setTimeout(() => {
         controller.abort();
-        reject(new Error(`control-plane ${path} timed out after ${timeoutMs}ms`));
+        reject(new Error(`control-plane ${path2} timed out after ${timeoutMs}ms`));
       }, timeoutMs);
     });
     try {
@@ -202,8 +202,8 @@ function createControlPlaneClient({
       return json ? json.task : null;
     },
     async downloadTaskAttachment(taskId, attachmentId) {
-      const path = `/api/v1/code-task/${encodeURIComponent(taskId)}/attachment/${encodeURIComponent(attachmentId)}`;
-      const res = await req("GET", path);
+      const path2 = `/api/v1/code-task/${encodeURIComponent(taskId)}/attachment/${encodeURIComponent(attachmentId)}`;
+      const res = await req("GET", path2);
       if (res.status === 401) cachedFirebaseToken = null;
       if (!res.ok) throw new Error(`attachment download failed: HTTP ${res.status}`);
       return Buffer.from(await res.arrayBuffer());
@@ -511,7 +511,7 @@ import {
   rmSync as rmSync2,
   writeFileSync as writeFileSync2
 } from "node:fs";
-import { basename, isAbsolute as isAbsolute3, join as join3, resolve as resolve4 } from "node:path";
+import { basename, isAbsolute as isAbsolute3, join as join3, relative as relative3, resolve as resolve4, sep as sep2 } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
 
 // ../../scripts/virtual-office/runner-bootstrap/runtime-authorization.mjs
@@ -647,10 +647,10 @@ function validateLock(lock, authorization) {
   }
   return { actual, expected };
 }
-function checkPathKind(path, expectedKind, fsOps, label) {
-  if (!fsOps.exists(path)) throw new Error(`staged runtime ${label} missing`);
-  const stats = fsOps.lstat(path);
-  if (isReparseStat(stats) || fsOps.isReparsePoint(path, stats)) {
+function checkPathKind(path2, expectedKind, fsOps, label) {
+  if (!fsOps.exists(path2)) throw new Error(`staged runtime ${label} missing`);
+  const stats = fsOps.lstat(path2);
+  if (isReparseStat(stats) || fsOps.isReparsePoint(path2, stats)) {
     throw new Error(`staged runtime ${label} is a reparse point`);
   }
   if (expectedKind === "directory" && !stats.isDirectory()) {
@@ -668,30 +668,30 @@ function verifyInstalledPackages(payloadRoot, packageRecords, platform, fsOps) {
   const omitted = [];
   let installed = 0;
   for (const [key, entry] of Object.entries(packageRecords)) {
-    const path = resolve(payloadRoot, key);
-    assertContained(payloadRoot, path, "package path");
+    const path2 = resolve(payloadRoot, key);
+    assertContained(payloadRoot, path2, "package path");
     const shouldOmit = isOmittedOptionalPackage(entry, platform);
     if (shouldOmit) {
       omitted.push(key);
-      if (fsOps.exists(path)) throw new Error(`staged runtime optional package should be omitted: ${key}`);
+      if (fsOps.exists(path2)) throw new Error(`staged runtime optional package should be omitted: ${key}`);
       continue;
     }
-    checkPathKind(path, "directory", fsOps, `installed package ${key}`);
+    checkPathKind(path2, "directory", fsOps, `installed package ${key}`);
     installed += 1;
   }
   return { installed, omitted: omitted.sort() };
 }
-function treeRecord(kind, path, stats, fileHash = "") {
-  if (kind === "d") return `d	${path}\r
+function treeRecord(kind, path2, stats, fileHash = "") {
+  if (kind === "d") return `d	${path2}\r
 `;
-  return `f	${path}	${stats.size}	${fileHash}\r
+  return `f	${path2}	${stats.size}	${fileHash}\r
 `;
 }
 function computeInstalledTree(nodeModulesRoot, fsOps = {}) {
   const ops = {
     exists: existsSync2,
     lstat: lstatSync,
-    readdir: (path) => readdirSync(path, { withFileTypes: true }),
+    readdir: (path2) => readdirSync(path2, { withFileTypes: true }),
     readFile: readFileSync,
     isReparsePoint: () => false,
     listReparsePoints: listWindowsReparsePoints,
@@ -1328,6 +1328,39 @@ function validateDependencyLock(payloadRoot, expected) {
   }
   if (!foundPackage) throw new Error("installed runner package does not match registry integrity");
 }
+function writeAuthorizedInstallSeed(payloadRoot, tarball, runtimeAuthorization) {
+  const authorization = validateRuntimeAuthorization(runtimeAuthorization);
+  const stagingRoot = resolve4(payloadRoot, "..", "..");
+  const tarballFromStaging = relative3(stagingRoot, resolve4(tarball));
+  if (!tarballFromStaging || tarballFromStaging === ".." || tarballFromStaging.startsWith(`..${sep2}`) || isAbsolute3(tarballFromStaging)) {
+    throw new Error("authorized runtime tarball escaped staging root");
+  }
+  const relativeTarball = relative3(payloadRoot, resolve4(tarball)).replaceAll("\\", "/");
+  if (!relativeTarball || isAbsolute3(relativeTarball) || relativeTarball.includes("\n") || relativeTarball.includes("\r")) {
+    throw new Error("authorized runtime tarball path invalid");
+  }
+  const fileSpec = `file:${relativeTarball}`;
+  const packageRecord = {
+    name: "algohq-runner-runtime",
+    version: "0.0.0",
+    private: true,
+    dependencies: { [PACKAGE_NAME]: fileSpec }
+  };
+  const packages = structuredClone(authorization.dependency_lock.packages);
+  packages[`node_modules/${PACKAGE_NAME}`].resolved = fileSpec;
+  const lock = {
+    name: packageRecord.name,
+    version: packageRecord.version,
+    lockfileVersion: authorization.dependency_lock.source_lockfile_version,
+    requires: true,
+    packages: { "": packageRecord, ...packages }
+  };
+  writeFileSync2(join3(payloadRoot, "package.json"), `${JSON.stringify(packageRecord)}
+`, { mode: 384 });
+  writeFileSync2(join3(payloadRoot, "package-lock.json"), `${JSON.stringify(lock)}
+`, { mode: 384 });
+  return { fileSpec, lock };
+}
 function buildActive(slotId, metadata, paths) {
   return {
     slot_id: slotId,
@@ -1371,19 +1404,40 @@ function installSlot({
   let installedSlot = false;
   try {
     mkdirSync2(payload, { recursive: true });
-    writeFileSync2(join3(payload, "package.json"), `${JSON.stringify({ name: "algohq-runner-runtime", version: "0.0.0", private: true })}
+    let installArgs;
+    if (runtimeAuthorization) {
+      writeAuthorizedInstallSeed(payload, tarball, runtimeAuthorization);
+      installArgs = [
+        "ci",
+        "--ignore-scripts",
+        "--no-bin-links",
+        "--no-audit",
+        "--no-fund",
+        `--registry=${PUBLIC_REGISTRY}`
+      ];
+    } else {
+      writeFileSync2(join3(payload, "package.json"), `${JSON.stringify({
+        name: "algohq-runner-runtime",
+        version: "0.0.0",
+        private: true
+      })}
 `);
-    const install = runner.npm([
-      "install",
-      "--ignore-scripts",
-      "--no-bin-links",
-      "--no-audit",
-      "--no-fund",
-      "--package-lock=true",
-      "--save-exact",
-      `--registry=${PUBLIC_REGISTRY}`,
-      tarball
-    ], { ...runOptions, cwd: payload, env: npmEnv, timeout: 18e4 });
+      installArgs = [
+        "install",
+        "--ignore-scripts",
+        "--no-bin-links",
+        "--no-audit",
+        "--no-fund",
+        "--package-lock=true",
+        "--save-exact",
+        `--registry=${PUBLIC_REGISTRY}`,
+        tarball
+      ];
+    }
+    const install = runner.npm(
+      installArgs,
+      { ...runOptions, cwd: payload, env: npmEnv, timeout: 18e4 }
+    );
     if (install.status !== 0) throw new Error(`npm install failed: ${install.stderr || install.error?.message || install.status}`);
     assertNoLinks(payload);
     validateDependencyLock(payload, metadata);
@@ -1504,6 +1558,151 @@ function stageAndActivateBundledUpdate(options) {
   }
 }
 
+// ../../scripts/virtual-office/code-runner/legacy-orphan-sweep.mjs
+import { spawnSync as spawnSync4 } from "node:child_process";
+
+// ../../scripts/virtual-office/code-runner/orphan-agent-reaper.mjs
+import { spawnSync as spawnSync3 } from "node:child_process";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, readdirSync as readdirSync4, readFileSync as readFileSync5, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+function killProcessTree(pid, { platform = process.platform, spawn: spawn2 = spawnSync3 } = {}) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  if (platform === "win32") {
+    const r = spawn2("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true, stdio: "ignore", timeout: 15e3 });
+    return !r.error && r.status === 0;
+  }
+  try {
+    process.kill(-pid, "SIGKILL");
+    return true;
+  } catch {
+    try {
+      process.kill(pid, "SIGKILL");
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+// ../../scripts/virtual-office/code-runner/legacy-orphan-sweep.mjs
+var MAX_LEGACY_KILLS = 50;
+var SWEEP_RECENCY_BUFFER_MS = 5e3;
+var SIGNATURES = [
+  {
+    signature: "claude-headless",
+    // claude-args.mjs always emits `-p --output-format stream-json --verbose`.
+    test: (cl) => /(?:^|[\\/"\s])claude(?:\.exe|\.cmd|\.ps1)?(?:"|\s)/iu.test(cl) && /--output-format[\s"=]+stream-json/iu.test(cl)
+  },
+  {
+    signature: "codex-headless",
+    // openai-compatible-runner always emits `exec --json`.
+    test: (cl) => /(?:^|[\\/"\s])codex(?:\.exe|\.cmd|\.ps1)?(?:"|\s)/iu.test(cl) && /\bexec\b/u.test(cl) && /--json\b/u.test(cl)
+  }
+];
+function matchAgentSignature(commandLine) {
+  if (typeof commandLine !== "string" || !commandLine) return null;
+  for (const { signature, test } of SIGNATURES) {
+    if (test(commandLine)) return signature;
+  }
+  return null;
+}
+function selectLegacyOrphans({ processes, cutoffMs, protectedPids = /* @__PURE__ */ new Set() }) {
+  const byPid = /* @__PURE__ */ new Map();
+  for (const proc of processes) {
+    if (Number.isInteger(proc?.pid) && proc.pid > 0) byPid.set(proc.pid, proc);
+  }
+  const kills = [];
+  for (const proc of byPid.values()) {
+    if (protectedPids.has(proc.pid)) continue;
+    if (!(Number.isFinite(proc.creationMs) && proc.creationMs < cutoffMs)) continue;
+    const signature = matchAgentSignature(proc.commandLine);
+    if (!signature) continue;
+    const parent = Number.isInteger(proc.ppid) && proc.ppid > 0 ? byPid.get(proc.ppid) : void 0;
+    const parentDead = !parent || Number.isFinite(parent.creationMs) && parent.creationMs > proc.creationMs;
+    if (!parentDead) continue;
+    kills.push({ pid: proc.pid, creationMs: proc.creationMs, signature, commandLine: proc.commandLine });
+  }
+  kills.sort((a, b) => a.creationMs - b.creationMs);
+  return { kills: kills.slice(0, MAX_LEGACY_KILLS) };
+}
+function parsePosixSweepLine(line, nowMs) {
+  const match = /^\s*(\d+)\s+(\d+)\s+(\d+)\s+(.+)$/u.exec(line ?? "");
+  if (!match) return null;
+  const pid = Number(match[1]);
+  if (!Number.isInteger(pid) || pid <= 0) return null;
+  return {
+    pid,
+    ppid: Number(match[2]),
+    creationMs: nowMs - Number(match[3]) * 1e3,
+    commandLine: match[4]
+  };
+}
+function listProcessesForSweep({ platform = process.platform, spawn: spawn2 = spawnSync4, nowMs = Date.now() } = {}) {
+  const rows = [];
+  if (platform === "win32") {
+    const ps = "Get-CimInstance Win32_Process | Where-Object { $_.CreationDate } | ForEach-Object { @{ p = $_.ProcessId; pp = $_.ParentProcessId; c = (([DateTimeOffset]$_.CreationDate.ToUniversalTime()).ToUnixTimeMilliseconds()); cl = [string]$_.CommandLine } | ConvertTo-Json -Compress }";
+    const result2 = spawn2("powershell", ["-NoProfile", "-NonInteractive", "-Command", ps], {
+      windowsHide: true,
+      encoding: "utf8",
+      timeout: 3e4,
+      maxBuffer: 64 * 1024 * 1024
+    });
+    if (result2.error || result2.status !== 0) return rows;
+    for (const line of String(result2.stdout ?? "").split(/\r?\n/u)) {
+      if (!line.trim()) continue;
+      try {
+        const parsed = JSON.parse(line);
+        const pid = Number(parsed?.p);
+        if (!Number.isInteger(pid) || pid <= 0) continue;
+        rows.push({
+          pid,
+          ppid: Number(parsed.pp),
+          creationMs: Number(parsed.c),
+          commandLine: typeof parsed.cl === "string" ? parsed.cl : ""
+        });
+      } catch {
+      }
+    }
+    return rows;
+  }
+  const result = spawn2("ps", ["-eo", "pid=,ppid=,etimes=,args="], { encoding: "utf8", timeout: 3e4, maxBuffer: 64 * 1024 * 1024 });
+  if (result.error || result.status !== 0) return rows;
+  for (const line of String(result.stdout ?? "").split("\n")) {
+    const row = parsePosixSweepLine(line, nowMs);
+    if (row) rows.push(row);
+  }
+  return rows;
+}
+function runLegacyOrphanSweep({
+  nowMs = Date.now(),
+  protectedPids = [process.pid],
+  listProcesses = listProcessesForSweep,
+  killTree = killProcessTree,
+  log = () => {
+  }
+} = {}) {
+  try {
+    const processes = listProcesses({ nowMs });
+    const { kills } = selectLegacyOrphans({
+      processes,
+      cutoffMs: nowMs - SWEEP_RECENCY_BUFFER_MS,
+      protectedPids: new Set(protectedPids)
+    });
+    const killed = [];
+    for (const kill of kills) {
+      const done = killTree(kill.pid);
+      log(`legacy-orphan-sweep ${done ? "killed" : "FAILED to kill"} pid=${kill.pid} sig=${kill.signature} cmd=${String(kill.commandLine).slice(0, 200)}`);
+      if (done) killed.push({ pid: kill.pid, signature: kill.signature });
+    }
+    const failed2 = kills.length - killed.length;
+    const detail = kills.length === 0 ? `no orphaned agent processes matched the sweep criteria (${processes.length} scanned)` : `purged ${killed.length} of ${kills.length} orphaned agent process tree(s)${failed2 > 0 ? ` (${failed2} kill(s) failed)` : ""}: ${killed.map((k) => `${k.pid}:${k.signature}`).join(", ").slice(0, 700)}`;
+    return { ok: true, status: 0, detail, killed };
+  } catch (error) {
+    return { ok: false, status: 1, detail: `legacy sweep error: ${error instanceof Error ? error.message : String(error)}`.slice(0, 500), killed: [] };
+  }
+}
+
 // src/runner/supervisor-activation.mjs
 var MAX_ACK_ATTEMPTS = 3;
 var delay = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
@@ -1859,18 +2058,18 @@ async function prepareSupervisorAuth({
 }
 
 // src/runner/supervisor-credential-reader.mjs
-import { spawnSync as spawnSync3 } from "node:child_process";
-import { existsSync as existsSync5 } from "node:fs";
+import { spawnSync as spawnSync5 } from "node:child_process";
+import { existsSync as existsSync6 } from "node:fs";
 import { dirname as dirname3, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function defaultCredentialHelperPath(metaUrl = import.meta.url) {
   const moduleDir = dirname3(fileURLToPath2(metaUrl));
   const bundled = join4(moduleDir, "supervisor-credential-helper.js");
   const source = join4(moduleDir, "..", "supervisor-credential-helper.mjs");
-  return existsSync5(source) ? source : bundled;
+  return existsSync6(source) ? source : bundled;
 }
 function readStoredCredentialIsolated({
-  spawn: spawn2 = spawnSync3,
+  spawn: spawn2 = spawnSync5,
   execPath = process.execPath,
   helperPath = defaultCredentialHelperPath(),
   helperArgs = [],
@@ -1899,7 +2098,7 @@ function readStoredCredentialIsolated({
 var DEFAULT_CONTROL_PLANE_URL = "https://vo-control-plane-bzjphrajaq-uc.a.run.app";
 var POLL_MS = 5e3;
 var CHILD_START_MS = 1500;
-var SUPERVISOR_CAPABILITIES = ["bundled-runtime-slots-v1"];
+var SUPERVISOR_CAPABILITIES = ["bundled-runtime-slots-v1", "legacy-orphan-purge-v1"];
 var UUID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
 var selfPath = fileURLToPath3(import.meta.url);
 var childEntry = join5(dirname4(selfPath), "runner-cli.js");
@@ -2062,6 +2261,9 @@ async function main() {
         },
         env: process.env,
         force: action.kind === "reinstall"
+      }) : action.kind === "purge-orphans" ? runLegacyOrphanSweep({
+        protectedPids: [process.pid],
+        log: (message) => console.warn(`[vo-runner supervisor] ${message}`)
       }) : runHostMaintenance(action.kind, {
         env: clientEnv,
         log: (message) => console.warn(`[vo-runner supervisor] ${message}`)
@@ -2078,7 +2280,7 @@ async function main() {
         ...operatorId ? { operatorId } : {},
         ...supervisorControlIdentity,
         status: result.ok ? "succeeded" : "failed",
-        detail: result.ok ? `runner ${packageVersion()} reconnected` : `maintenance exited ${result.status}${result.detail ? `: ${result.detail}` : ""}`
+        detail: result.ok ? result.detail ? `${result.detail}; runner ${packageVersion()} reconnected`.slice(0, 1e3) : `runner ${packageVersion()} reconnected` : `maintenance exited ${result.status}${result.detail ? `: ${result.detail}` : ""}`
       });
       handling = false;
     } catch (error) {