@algosuite/vo-mcp 0.2.0-beta.30 → 0.2.0-beta.34

package/dist/runner-supervisor.js

@@ -2060,6 +2060,92 @@ async function finishPendingActivation({
   }
 }
 
+// src/runner/supervisor-child-entry.mjs
+var VERSION_RE2 = /^(?:[\w.-]+\/)?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/u;
+function parseRuntimeVersion(value) {
+  if (typeof value !== "string") return null;
+  const match = VERSION_RE2.exec(value.trim());
+  if (!match) return null;
+  const prerelease = match[4] ? match[4].split(".").map((part) => /^\d+$/u.test(part) ? Number(part) : part) : null;
+  return { release: [Number(match[1]), Number(match[2]), Number(match[3])], prerelease };
+}
+function compareRuntimeVersions(a, b) {
+  for (let i = 0; i < 3; i += 1) {
+    const av = a.release[i] ?? 0;
+    const bv = b.release[i] ?? 0;
+    if (av !== bv) return av < bv ? -1 : 1;
+  }
+  if (!a.prerelease && !b.prerelease) return 0;
+  if (!a.prerelease) return 1;
+  if (!b.prerelease) return -1;
+  const len = Math.max(a.prerelease.length, b.prerelease.length);
+  for (let i = 0; i < len; i += 1) {
+    const av = a.prerelease[i];
+    const bv = b.prerelease[i];
+    if (av === void 0) return -1;
+    if (bv === void 0) return 1;
+    if (av === bv) continue;
+    const aNum = typeof av === "number";
+    const bNum = typeof bv === "number";
+    if (aNum && bNum) return av < bv ? -1 : 1;
+    if (aNum !== bNum) return aNum ? -1 : 1;
+    return String(av) < String(bv) ? -1 : 1;
+  }
+  return 0;
+}
+function resolveSupervisorChildEntry({
+  runtimeRoot,
+  bundledEntry,
+  bundledVersion,
+  readPointer = readActivation,
+  validate = validateSlot
+}) {
+  const bundled = (detail) => ({
+    // The bundled entry is `dist/runner-cli.js`, which IS the daemon and takes
+    // no subcommand. The slot entry is `bin/vo-mcp`, the multiplexed CLI, which
+    // needs the `runner` subcommand — the same argv the proven rollback path
+    // (`launchPreviousChild`) uses.
+    args: [bundledEntry],
+    entry: bundledEntry,
+    source: "bundled",
+    version: String(bundledVersion || "unknown"),
+    descriptor: `bundled ${bundledVersion || "unknown"} ${bundledEntry}`,
+    detail
+  });
+  if (!runtimeRoot) return bundled("no runtime root");
+  let pointer;
+  try {
+    pointer = readPointer(runtimeRoot);
+  } catch (error) {
+    return bundled(`activation pointer unreadable: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  if (!pointer?.active) return bundled("no activated runtime slot");
+  if (pointer.pending) return bundled("runtime activation still pending");
+  const activeVersion = parseRuntimeVersion(pointer.active.version);
+  const currentVersion = parseRuntimeVersion(bundledVersion);
+  if (!activeVersion) return bundled(`active slot version unparseable: ${String(pointer.active.version)}`);
+  if (!currentVersion) return bundled(`bundled version unparseable: ${String(bundledVersion)}`);
+  if (compareRuntimeVersions(activeVersion, currentVersion) <= 0) {
+    return bundled(`active slot ${pointer.active.version} is not newer than bundled ${bundledVersion}`);
+  }
+  let validated;
+  try {
+    validated = validate(runtimeRoot, pointer.active);
+  } catch (error) {
+    return bundled(`slot validation threw: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  if (!validated?.ok) return bundled(`active slot invalid: ${validated?.detail || "unknown"}`);
+  const entry = validated.paths.entry;
+  return {
+    args: [entry, "runner"],
+    entry,
+    source: "active-slot",
+    version: pointer.active.version,
+    descriptor: `active-slot ${pointer.active.version} ${entry}`,
+    detail: `activated slot ${pointer.active.slot_id}`
+  };
+}
+
 // src/runner/supervisor-child-env.mjs
 import { hostname as systemHostname } from "node:os";
 
@@ -2283,7 +2369,8 @@ var CHILD_START_MS = 1500;
 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");
+var bundledChildEntry = join5(dirname4(selfPath), "runner-cli.js");
+var supervisorRuntimeRoot = runtimeRootFromEnv(process.env);
 var sleep = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 var runnerId = resolveSupervisorRunnerId(process.env);
 function packageVersion() {
@@ -2304,8 +2391,18 @@ var supervisorControlIdentity = {
   supervisorVersion,
   capabilities: SUPERVISOR_CAPABILITIES
 };
+var lastResolvedChildDescriptor = null;
 function spawnChild(childEnv) {
-  return spawn(process.execPath, [childEntry], {
+  const resolved = resolveSupervisorChildEntry({
+    runtimeRoot: supervisorRuntimeRoot,
+    bundledEntry: bundledChildEntry,
+    bundledVersion: supervisorVersion
+  });
+  if (resolved.descriptor !== lastResolvedChildDescriptor) {
+    console.error(`[vo-runner supervisor] child entry -> ${resolved.descriptor} (${resolved.detail})`);
+    lastResolvedChildDescriptor = resolved.descriptor;
+  }
+  return spawn(process.execPath, resolved.args, {
     env: childEnv,
     stdio: "inherit",
     windowsHide: true