@algosuite/vo-mcp 0.2.0-beta.10 → 0.2.0-beta.12

package/dist/runner-cli.js

@@ -2125,22 +2125,41 @@ async function resolveBearer(env2) {
 function createControlPlaneClient({
   baseUrl = process.env.VO_CONTROL_PLANE_URL || "",
   env: env2 = process.env,
-  fetchImpl = fetch
+  fetchImpl = fetch,
+  heartbeatTimeoutMs = Math.min(
+    Math.max(Number(env2.VO_CODE_RUNNER_HEARTBEAT_TIMEOUT_MS) || 15e3, 1e3),
+    6e4
+  )
 } = {}) {
   if (!baseUrl) {
     throw new Error("VO_CONTROL_PLANE_URL is required for the code-runner daemon");
   }
   const root = baseUrl.replace(/\/+$/, "");
-  async function req(method, path16, body) {
+  async function req(method, path16, body, { timeoutMs } = {}) {
     const bearer = await resolveBearer(env2);
-    return fetchImpl(`${root}${path16}`, {
+    const controller = timeoutMs ? new AbortController() : null;
+    let timeoutId;
+    const request = Promise.resolve(fetchImpl(`${root}${path16}`, {
       method,
       headers: {
         "content-type": "application/json",
         authorization: `Bearer ${bearer}`
       },
-      body: body === void 0 ? void 0 : JSON.stringify(body)
+      body: body === void 0 ? void 0 : JSON.stringify(body),
+      ...controller ? { signal: controller.signal } : {}
+    }));
+    if (!timeoutMs) return request;
+    const timeout = new Promise((_, reject) => {
+      timeoutId = setTimeout(() => {
+        controller.abort();
+        reject(new Error(`control-plane ${path16} timed out after ${timeoutMs}ms`));
+      }, timeoutMs);
     });
+    try {
+      return await Promise.race([request, timeout]);
+    } finally {
+      clearTimeout(timeoutId);
+    }
   }
   return {
     /**
@@ -2156,6 +2175,10 @@ function createControlPlaneClient({
       if (Array.isArray(operatorIds) && operatorIds.length > 0) body.operator_ids = operatorIds;
       if (session.runnerInstanceId) body.runner_instance_id = session.runnerInstanceId;
       if (session.runnerInstanceId && session.reconcileStale) body.reconcile_stale = true;
+      if (session.defaultAgent) body.default_agent = session.defaultAgent;
+      if (Array.isArray(session.availableAgents)) {
+        body.available_agents = session.availableAgents.filter((entry) => entry?.installed === true && entry?.authenticated === true).map((entry) => entry.agent);
+      }
       const res = await req("POST", "/api/v1/code-task/claim", body);
       if (res.status === 401) {
         cachedFirebaseToken = null;
@@ -2299,13 +2322,20 @@ function createControlPlaneClient({
      * authenticated operator so the web shows a TRUE "runner online" signal.
      * Best-effort caller; throws on 401/non-ok so the daemon can log + retry.
      */
-    async postHeartbeat({ runnerId, operatorId, uptimeSec, activeTasks, version, daemonVersion, servedRepos, servedOperators, availableAgents, accountUsage }) {
+    async postHeartbeat({ runnerId, runnerInstanceId, operatorId, uptimeSec, activeTasks, version, daemonVersion, defaultAgent, supervisorInstanceId, supervisorVersion, supervisorCapabilities, servedRepos, servedOperators, availableAgents, accountUsage }) {
       const body = { runner_id: runnerId };
+      if (runnerInstanceId) body.runner_instance_id = runnerInstanceId;
       if (operatorId) body.operator_id = operatorId;
       if (typeof uptimeSec === "number") body.uptime_sec = uptimeSec;
       if (typeof activeTasks === "number") body.active_tasks = activeTasks;
       if (version) body.version = version;
       if (daemonVersion) body.daemon_version = daemonVersion;
+      if (defaultAgent) body.default_agent = defaultAgent;
+      if (supervisorInstanceId) body.supervisor_instance_id = supervisorInstanceId;
+      if (supervisorVersion) body.supervisor_version = supervisorVersion;
+      if (Array.isArray(supervisorCapabilities) && supervisorCapabilities.length > 0) {
+        body.supervisor_capabilities = supervisorCapabilities;
+      }
       if (Array.isArray(servedRepos) && servedRepos.length > 0) body.served_repos = servedRepos;
       if (Array.isArray(servedOperators) && servedOperators.length > 0) {
         body.served_operator_ids = servedOperators;
@@ -2316,7 +2346,9 @@ function createControlPlaneClient({
       if (Array.isArray(accountUsage) && accountUsage.length > 0) {
         body.account_usage = accountUsage;
       }
-      const res = await req("POST", "/api/v1/runner/heartbeat", body);
+      const res = await req("POST", "/api/v1/runner/heartbeat", body, {
+        timeoutMs: heartbeatTimeoutMs
+      });
       if (res.status === 401) {
         cachedFirebaseToken = null;
         throw new Error("heartbeat unauthorized (401)");
@@ -2324,10 +2356,27 @@ function createControlPlaneClient({
       if (!res.ok) throw new Error(`heartbeat failed: HTTP ${res.status}`);
       return true;
     },
+    /** Read the server-authoritative heartbeat ledger without mutating it. */
+    async getRunnerStatus({ operatorId } = {}) {
+      const query = operatorId ? `?operator_id=${encodeURIComponent(operatorId)}` : "";
+      const res = await req("GET", `/api/v1/runner/status${query}`, void 0, {
+        timeoutMs: heartbeatTimeoutMs
+      });
+      if (res.status === 401) {
+        cachedFirebaseToken = null;
+        throw new Error("runner status unauthorized (401)");
+      }
+      if (!res.ok) throw new Error(`runner status failed: HTTP ${res.status}`);
+      const body = await res.json();
+      return Array.isArray(body?.runners) ? body.runners : [];
+    },
     /** Poll one authenticated runner's durable Mission Control action queue. */
-    async pollRunnerControl({ runnerId, operatorId }) {
+    async pollRunnerControl({ runnerId, operatorId, supervisorInstanceId, supervisorVersion, capabilities }) {
       const body = { runner_id: runnerId };
       if (operatorId) body.operator_id = operatorId;
+      if (supervisorInstanceId) body.supervisor_instance_id = supervisorInstanceId;
+      if (supervisorVersion) body.supervisor_version = supervisorVersion;
+      if (Array.isArray(capabilities) && capabilities.length > 0) body.capabilities = capabilities;
       const res = await req("POST", "/api/v1/runner/control/poll", body);
       if (res.status === 401) {
         cachedFirebaseToken = null;
@@ -2339,9 +2388,12 @@ function createControlPlaneClient({
       return action && typeof action.action_id === "string" && action.action_id ? { ...action, actionId: action.action_id } : null;
     },
     /** Acknowledge a maintenance action after the host has restarted the child. */
-    async completeRunnerControl(actionId, { runnerId, operatorId, status, detail }) {
+    async completeRunnerControl(actionId, { runnerId, operatorId, supervisorInstanceId, supervisorVersion, capabilities, status, detail }) {
       const body = { runner_id: runnerId, status };
       if (operatorId) body.operator_id = operatorId;
+      if (supervisorInstanceId) body.supervisor_instance_id = supervisorInstanceId;
+      if (supervisorVersion) body.supervisor_version = supervisorVersion;
+      if (Array.isArray(capabilities) && capabilities.length > 0) body.capabilities = capabilities;
       if (detail) body.detail = detail;
       const res = await req("POST", `/api/v1/runner/control/${encodeURIComponent(actionId)}/complete`, body);
       if (res.status === 401) {
@@ -2423,17 +2475,55 @@ function cleanPathSegment(value) {
   const trimmed = String(value || "").trim();
   return trimmed.startsWith('"') && trimmed.endsWith('"') ? trimmed.slice(1, -1) : trimmed;
 }
+function envValue(env2, name) {
+  const exact = env2?.[name];
+  if (typeof exact === "string") return exact.trim();
+  const key = Object.keys(env2 || {}).find((candidate) => candidate.toLowerCase() === name.toLowerCase());
+  return typeof env2?.[key] === "string" ? env2[key].trim() : "";
+}
+function userClaudeCandidates(bin, env2) {
+  if (!/^claude(?:\.(?:exe|cmd|ps1))?$/iu.test(bin)) return [];
+  const userProfile = envValue(env2, "USERPROFILE");
+  const appData = envValue(env2, "APPDATA") || (userProfile ? path9.join(userProfile, "AppData", "Roaming") : "");
+  const localAppData = envValue(env2, "LOCALAPPDATA") || (userProfile ? path9.join(userProfile, "AppData", "Local") : "");
+  const candidates = [];
+  if (appData) {
+    const npmBin = path9.join(appData, "npm");
+    candidates.push(
+      path9.join(npmBin, "claude.exe"),
+      path9.join(npmBin, "claude.cmd"),
+      path9.join(npmBin, "claude.ps1"),
+      path9.join(npmBin, "claude"),
+      path9.join(npmBin, ...NATIVE_CLAUDE_PARTS)
+    );
+  }
+  if (userProfile) candidates.push(path9.join(userProfile, ".local", "bin", "claude.exe"));
+  if (localAppData) {
+    candidates.push(
+      path9.join(localAppData, "Microsoft", "WinGet", "Links", "claude.exe"),
+      path9.join(localAppData, "Microsoft", "WindowsApps", "claude.exe")
+    );
+  }
+  return candidates;
+}
 function pathCandidates(bin, env2) {
   if (path9.isAbsolute(bin) || /[\\/]/u.test(bin)) {
     return [path9.resolve(bin)];
   }
   const extension = path9.extname(bin);
-  return pathValue(env2).split(";").map(cleanPathSegment).filter(Boolean).flatMap((directory) => extension ? [path9.join(directory, bin)] : [
+  const fromPath = pathValue(env2).split(";").map(cleanPathSegment).filter(Boolean).flatMap((directory) => extension ? [path9.join(directory, bin)] : [
     path9.join(directory, `${bin}.exe`),
     path9.join(directory, `${bin}.cmd`),
     path9.join(directory, `${bin}.ps1`),
     path9.join(directory, bin)
   ]);
+  const seen = /* @__PURE__ */ new Set();
+  return [...fromPath, ...userClaudeCandidates(bin, env2)].filter((candidate) => {
+    const key = candidate.toLowerCase();
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
 }
 function canonicalExistingPath(candidate, exists, canonicalize) {
   if (!exists(candidate)) return null;
@@ -2462,7 +2552,7 @@ function resolveWindowsClaudeExecutable({
     if (resolvedNative) return resolvedNative;
   }
   const error = new Error(
-    `Could not resolve a native claude.exe for "${requested}". Update Claude Code with npm install -g @anthropic-ai/claude-code; the HQ runner will not execute a shell-only .cmd/.ps1 shim.`
+    `Could not resolve a native claude.exe for "${requested}". Install or update Claude Code with the native Windows installer (recommended) or npm install -g @anthropic-ai/claude-code; the HQ runner will not execute a shell-only .cmd/.ps1 shim.`
   );
   error.code = "ENOENT";
   throw error;
@@ -4779,7 +4869,7 @@ var init_dispatch_onboarding = __esm({
       "docs/current/virtual-office-operating-model.md",
       "docs/current/virtual-office-test-architect.md",
       "docs/current/evidence-grounded-consensus-testing.md",
-      "docs/vo/ADR-001-verification-oracle-not-orchestrator-2026-05-29.md (VO verifies + signs; human approves merges; NO autonomous bot-merge / headless triggers)",
+      "docs/vo/ADR-001-verification-oracle-not-orchestrator-2026-05-29.md (AlgoHQ verifies + signs; human approves merges; NO autonomous bot-merge / headless triggers)",
       "docs/vo/vo-adr-002-two-plane-moat.md (fat secret server / thin dumb client)",
       "docs/vo/vo-roadmap-2026-05-26.md (the live roadmap \u2014 read its Change log tail for current state)",
       "the nearest scoped CLAUDE.md for any directory you edit",
@@ -5240,6 +5330,7 @@ function makeLoopTicks({
   env: env2,
   log: log3,
   getActive,
+  runnerInstanceId,
   // Cached agent-availability provider (agent-availability.mjs); returns null
   // until the first probe completes — the heartbeat simply omits the field.
   getAgentAvailability = () => null,
@@ -5251,9 +5342,49 @@ function makeLoopTicks({
 }) {
   let lastSessionForward = 0;
   let lastHeartbeat = 0;
+  let availabilityWasReady = false;
+  const heartbeatState = /* @__PURE__ */ new Map();
   let lastResumeSchedule = 0;
   let resumeRunning = false;
+  function enqueueHeartbeat(payload) {
+    const key = payload.operatorId || "";
+    let state = heartbeatState.get(key);
+    if (!state) {
+      state = { running: false, pending: null };
+      heartbeatState.set(key, state);
+    }
+    return new Promise((resolve2) => {
+      if (state.running) {
+        if (state.pending) state.pending.waiters.push(resolve2);
+        else state.pending = { payload, waiters: [resolve2] };
+        state.pending.payload = payload;
+        return;
+      }
+      const launch = (nextPayload, waiters) => {
+        state.running = true;
+        let request;
+        try {
+          request = Promise.resolve(client.postHeartbeat(nextPayload));
+        } catch (error) {
+          request = Promise.reject(error);
+        }
+        request.catch((e) => log3(`heartbeat failed: ${e.message}`)).finally(() => {
+          for (const done of waiters) done();
+          if (state.pending) {
+            const pending = state.pending;
+            state.pending = null;
+            launch(pending.payload, pending.waiters);
+          } else {
+            state.running = false;
+            heartbeatState.delete(key);
+          }
+        });
+      };
+      launch(payload, [resolve2]);
+    });
+  }
   return function tick() {
+    const heartbeatCompletions = [];
     const now = nowFn();
     if (cfg.sessionForwardSec > 0 && now - lastSessionForward >= cfg.sessionForwardSec * 1e3) {
       lastSessionForward = now;
@@ -5264,18 +5395,29 @@ function makeLoopTicks({
       }).catch(() => {
       });
     }
-    if (now - lastHeartbeat >= HEARTBEAT_MS) {
+    const availableAgents = getAgentAvailability();
+    const availabilityReady = Array.isArray(availableAgents);
+    const availabilityJustBecameReady = availabilityReady && !availabilityWasReady;
+    availabilityWasReady = availabilityReady;
+    if (now - lastHeartbeat >= HEARTBEAT_MS || availabilityJustBecameReady) {
       lastHeartbeat = now;
       const servedRepos = Array.isArray(cfg.servedRepos) ? cfg.servedRepos.slice(0, 100) : [];
       const servedOperators = Array.isArray(cfg.servedOperators) ? cfg.servedOperators.slice(0, 100) : [];
-      const availableAgents = getAgentAvailability();
       const accountUsage = getAccountUsage();
       const version = String(env2.VO_CODE_RUNNER_VERSION || "").trim().slice(0, 40);
       const daemonVersion = String(env2.VO_CODE_RUNNER_DAEMON_VERSION || "").trim().slice(0, 40);
+      const supervisorInstanceId = String(env2.VO_RUNNER_SUPERVISOR_INSTANCE_ID || "").trim();
+      const supervisorVersion = String(env2.VO_RUNNER_SUPERVISOR_VERSION || "").trim().slice(0, 40);
+      const supervisorCapabilities = String(env2.VO_RUNNER_SUPERVISOR_CAPABILITIES || "").split(",").map((value) => value.trim()).filter(Boolean).slice(0, 8);
       const baseHeartbeat = {
         runnerId: cfg.runnerId,
+        ...runnerInstanceId ? { runnerInstanceId } : {},
         ...version ? { version } : {},
         ...daemonVersion ? { daemonVersion } : {},
+        ...cfg.agent ? { defaultAgent: cfg.agent } : {},
+        ...supervisorInstanceId ? { supervisorInstanceId } : {},
+        ...supervisorVersion ? { supervisorVersion } : {},
+        ...supervisorCapabilities.length > 0 ? { supervisorCapabilities } : {},
         ...servedRepos.length > 0 ? { servedRepos } : {},
         ...servedOperators.length > 0 ? { servedOperators } : {},
         ...Array.isArray(availableAgents) && availableAgents.length > 0 ? { availableAgents } : {},
@@ -5285,7 +5427,10 @@ function makeLoopTicks({
       };
       const operatorIds = servedOperators.length > 0 ? servedOperators : [void 0];
       for (const operatorId of operatorIds) {
-        client.postHeartbeat({ ...baseHeartbeat, ...operatorId ? { operatorId } : {} }).catch((e) => log3(`heartbeat failed: ${e.message}`));
+        heartbeatCompletions.push(enqueueHeartbeat({
+          ...baseHeartbeat,
+          ...operatorId ? { operatorId } : {}
+        }));
       }
     }
     const resumeSec = Number(env2.VO_RESUME_SCHEDULE_SEC) > 0 ? Number(env2.VO_RESUME_SCHEDULE_SEC) : DEFAULT_RESUME_SCHEDULE_SEC;
@@ -5296,6 +5441,7 @@ function makeLoopTicks({
         resumeRunning = false;
       });
     }
+    return Promise.all(heartbeatCompletions).then(() => void 0);
   };
 }
 var HEARTBEAT_MS, DEFAULT_RESUME_SCHEDULE_SEC;
@@ -5310,6 +5456,10 @@ var init_loop_ticks = __esm({
 });
 
 // ../../scripts/virtual-office/code-runner/agent-availability.mjs
+function resolveAgentClaimContext(provider, defaultAgent) {
+  const availableAgents = provider.get();
+  return Array.isArray(availableAgents) ? { availableAgents, defaultAgent } : null;
+}
 async function collectAgentAvailability({
   agents = listAgents(),
   runnerFor = (agent) => resolveRunner({ VO_CODE_RUNNER_AGENT: agent }).runner
@@ -6085,7 +6235,7 @@ function startControlServer({ port, getStatus, requestStop, allowedOrigin, log:
   server.unref?.();
   return server;
 }
-function startDaemonControl({ cfg, requestStop, getActiveCount, isRunning, startedAt, log: log3 = () => {
+function startDaemonControl({ cfg, runnerInstanceId, requestStop, getActiveCount, isRunning, startedAt, log: log3 = () => {
 }, onDuplicate = null }) {
   if (!cfg.controlEnabled) return null;
   return startControlServer({
@@ -6097,6 +6247,7 @@ function startDaemonControl({ cfg, requestStop, getActiveCount, isRunning, start
       running: isRunning(),
       pid: process.pid,
       runnerId: cfg.runnerId,
+      runnerInstanceId,
       servedRepos: cfg.servedRepos,
       servedOperators: cfg.servedOperators,
       watchEnabled: cfg.watchEnabled,
@@ -7626,7 +7777,7 @@ function reportsBlocker(summary) {
   const text = String(summary || "");
   const explicit = explicitTaskOutcome(text);
   if (explicit) return explicit === "BLOCKED" || explicit === "FAILED";
-  return /\btask remains\s+(?:\*\*)?BLOCKED\b/i.test(text) || /(?:^|\n)\s*(?:#{1,6}\s*)?(?:host-recovery\s+)?(?:result|outcome)\s*:\s*(?:\*\*)?BLOCKED\b/im.test(text);
+  return /\btask remains\s+(?:\*\*)?BLOCKED\b/i.test(text) || /(?:^|\n)\s*(?:#{1,6}\s*)?(?:\*\*)?(?:host-recovery\s+)?(?:result|outcome|status)\s*:\s*(?:\*\*)?BLOCKED\b/im.test(text);
 }
 function isMaxTurnExhaustion(run = {}, maxTurns) {
   const summary = String(run.summary || "").trim().toLowerCase();
@@ -7902,6 +8053,7 @@ async function main({ env: env2 = process.env, once: once2 = false } = {}) {
   const startedAt = Date.now();
   const controlServer = startDaemonControl({
     cfg,
+    runnerInstanceId,
     requestStop: () => stop("web-control"),
     getActiveCount: () => active,
     isRunning: () => !stopping,
@@ -7929,18 +8081,24 @@ async function main({ env: env2 = process.env, once: once2 = false } = {}) {
   const watchCoordinator = makeWatchCycleCoordinator({ runWatch, log: log2, intervalMs: cfg.watchIntervalSec * 1e3 });
   const agentAvailability = makeAgentAvailabilityProvider({ onError: (e) => log2(`agent probe failed: ${e.message}`) });
   const accountUsage = makeAccountUsageProvider();
-  const loopTick = makeLoopTicks({ client, cfg, env: env2, log: log2, getActive: () => active, getAgentAvailability: () => agentAvailability.get(), getAccountUsage: () => accountUsage.get() });
+  const loopTick = makeLoopTicks({ client, cfg, env: env2, log: log2, getActive: () => active, runnerInstanceId, getAgentAvailability: () => agentAvailability.get(), getAccountUsage: () => accountUsage.get() });
   const backoff = makeReconnectBackoff({ baseMs: cfg.pollSec * 1e3, log: log2 });
   while (!stopping) {
-    loopTick();
+    const heartbeatCompletion = loopTick();
     if (cfg.watchEnabled) watchCoordinator.start();
     if (active >= cfg.maxConcurrency) {
       await sleep2(cfg.pollSec * 1e3);
       continue;
     }
+    const claimAgents = resolveAgentClaimContext(agentAvailability, cfg.agent);
+    if (!claimAgents) {
+      await sleep2(cfg.pollSec * 1e3);
+      continue;
+    }
+    await heartbeatCompletion;
     let task;
     try {
-      task = await client.claim(cfg.runnerId, cfg.servedRepos, cfg.servedOperators, { runnerInstanceId, reconcileStale });
+      task = await client.claim(cfg.runnerId, cfg.servedRepos, cfg.servedOperators, { runnerInstanceId, reconcileStale, ...claimAgents });
       reconcileStale = false;
       backoff.onSuccess();
     } catch (err) {