@proagentstore/cli 0.4.112 → 0.4.114

package/dist/index.js

@@ -1260,6 +1260,7 @@ import { execFile, spawn as spawn3 } from "child_process";
 import { promisify } from "util";
 var run = promisify(execFile);
 var RUNNER_UPDATE_PATH = "/pags/runner/update";
+var RUNNER_RESTART_PATH = "/pags/runner/restart";
 var RUNNER_RESTART_EXIT_CODE = 75;
 var SUPERVISED_ENV = "PAGS_UP_SUPERVISED";
 var SUPERVISOR_RESTARTS = "2";
@@ -1317,6 +1318,28 @@ function planRunnerUpdate(f) {
   if (f.busy.length > 0) return { action: "wait", current: f.current, latest: f.latest, waitingFor: f.busy };
   return { action: "update", current: f.current, latest: f.latest, restarter: f.restarter };
 }
+function planRunnerRestart(f) {
+  if (!f.restarter) {
+    return {
+      action: "refused",
+      current: f.current,
+      reason: `Nothing would start this runner again after a restart: it was not started by \`pags up\`, and neither ${SERVICE_ENV}=1 nor ${RESTART_COMMAND_ENV} is set. Restart it at the machine.`
+    };
+  }
+  if (!f.force) {
+    if (f.busy === null || f.busy.includes("runner-work-observation-unavailable")) {
+      return {
+        action: "refused",
+        current: f.current,
+        reason: "The local runtime did not answer the work check, so this machine cannot be shown idle \u2014 it may be the part that is wedged. Restart with force to restart anyway; any run in progress on this machine is lost."
+      };
+    }
+    if (f.busy.length > 0) {
+      return { action: "refused", current: f.current, waitingFor: f.busy, reason: `${f.busy.length} piece(s) of work are running here. Restart when they finish, or with force (that work is lost).` };
+    }
+  }
+  return { action: "restart", current: f.current, restarter: f.restarter };
+}
 async function installVersion(version2) {
   if (process.env[BOOTSTRAP_ENV]) {
     await installPayload(version2);
@@ -2222,7 +2245,7 @@ function createInstallBridge(deps) {
 
 // src/commands/runner/relay.ts
 var MEMBERSHIP_SYNC_PATH = "/pags/membership/sync";
-var CLI_CONTROL_PATHS = /* @__PURE__ */ new Set([MEMBERSHIP_SYNC_PATH, RUNNER_UPDATE_PATH]);
+var CLI_CONTROL_PATHS = /* @__PURE__ */ new Set([MEMBERSHIP_SYNC_PATH, RUNNER_UPDATE_PATH, RUNNER_RESTART_PATH]);
 async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force = false, watchInstances = false) {
   const apiBase = pagsApiBase(opts.apiBase).replace(/^http/, "ws");
   const pagsToken = clean(opts.pagsToken) || clean(process.env.PAGS_TOKEN) || clean(loadSession()?.token);
@@ -2279,7 +2302,7 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     writeLine(formatStatusLine({ registration: state, agents, reason: state === "ok" ? void 0 : lastRegisterError }));
   };
   for (const id of instanceIds) await registerRuntime(id);
-  const updateFacts = async (signal) => {
+  const workLook = async (signal) => {
     const [sessionsResult, healthResult] = await Promise.allSettled([
       requestRunner("GET", "/coding/sessions", {
         url: localUrl,
@@ -2288,7 +2311,10 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
       }, void 0, signal),
       requestRunner("GET", "/health", { url: localUrl, token: runnerToken, instanceId: instanceIds[0] }, void 0, signal)
     ]);
-    const { busy, observations } = readWorkLook(sessionsResult, healthResult, Date.now());
+    return readWorkLook(sessionsResult, healthResult, Date.now());
+  };
+  const updateFacts = async (signal) => {
+    const { busy, observations } = await workLook(signal);
     return {
       observations,
       current: CLI_VERSION,
@@ -2389,8 +2415,21 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     setTimeout(() => leaveForRestart(plan.restarter), 25).unref();
     return { status: 200, result: { action: "restarting", current: plan.current, latest: plan.latest, restartedBy: plan.restarter, ...supervisor ? { supervisor } : {} } };
   };
+  const answerRestart = async (body) => {
+    const request = body;
+    const dryRun = request?.dryRun === true;
+    const force2 = request?.force === true;
+    if (bridge.inFlight()) return { status: 409, result: { error: "A runner update is installing or restarting; nothing else restarted." } };
+    const look = force2 ? null : await boundedWork((signal) => workLook(signal));
+    const plan = planRunnerRestart({ current: CLI_VERSION, restarter: restarterFrom(process.env), busy: force2 ? [] : look?.busy ?? null, force: force2 });
+    if (dryRun || plan.action === "refused") return { status: 200, result: { ...plan, dryRun } };
+    setTimeout(() => leaveForRestart(plan.restarter), 25).unref();
+    const supervisor = supervisorNote(plan.restarter);
+    return { status: 200, result: { action: "restarting", current: plan.current, latest: plan.current, restartedBy: plan.restarter, forced: force2, ...supervisor ? { supervisor } : {} } };
+  };
   const answerControl = async (path, body) => {
     if (path === RUNNER_UPDATE_PATH) return answerUpdate(body);
+    if (path === RUNNER_RESTART_PATH) return answerRestart(body);
     if (path !== MEMBERSHIP_SYNC_PATH) return { status: 404, result: { error: `Unknown runner control ${path}` } };
     const request = body;
     const named = typeof request?.attach === "string" ? request.attach : "";
@@ -2956,7 +2995,6 @@ function createRunnerCommand() {
 var runnerCommand = createRunnerCommand();
 
 // src/commands/up.ts
-import { execFileSync as execFileSync3 } from "child_process";
 import { createRequire as createRequire2 } from "module";
 import { Command as Command8 } from "commander";
 import { hostname as hostname6 } from "os";
@@ -3078,6 +3116,65 @@ async function waitForKey(keys, onInterrupt) {
   });
 }
 
+// src/commands/up-restart.ts
+import { spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "child_process";
+var UP_LAUNCHER_ENV = "PAGS_UP_LAUNCHER";
+function upRestartMode(env, platform, canExecve) {
+  if (env[SERVICE_ENV] === "1") return "service";
+  if (env[RESTART_COMMAND_ENV]?.trim()) return "command";
+  if (env[UP_LAUNCHER_ENV] === "1") return "launcher-child";
+  return platform !== "win32" && canExecve ? "exec" : "launcher";
+}
+function processRestartDeps() {
+  const execve = process.execve;
+  return {
+    env: process.env,
+    platform: process.platform,
+    execPath: process.execPath,
+    execArgv: process.execArgv,
+    script: process.argv[1],
+    execve: typeof execve === "function" ? execve.bind(process) : void 0,
+    spawn: nodeSpawn,
+    spawnSync: nodeSpawnSync,
+    exit: (code) => process.exit(code),
+    log: () => {
+    }
+  };
+}
+function restartPagsUp(args, extraEnv, deps) {
+  const env = { ...deps.env, ...extraEnv };
+  const argv = [...deps.execArgv, deps.script, ...args];
+  const mode = upRestartMode(env, deps.platform, !!deps.execve);
+  if (mode === "service" || mode === "command") {
+    leaveForRestart(mode, { spawn: deps.spawn, exit: deps.exit });
+    return;
+  }
+  if (mode === "launcher-child") {
+    deps.exit(RUNNER_RESTART_EXIT_CODE);
+    return;
+  }
+  if (mode === "exec") {
+    try {
+      deps.execve(deps.execPath, [deps.execPath, ...argv], env);
+    } catch (e) {
+      deps.log(`Restart failed (${e instanceof Error ? e.message : String(e)}) \u2014 the runner is NOT running. Run 'pags up' again.`);
+      deps.exit(1);
+    }
+    return;
+  }
+  for (let first = true; ; first = false) {
+    const r = deps.spawnSync(deps.execPath, argv, { stdio: "inherit", env: { ...env, [UP_LAUNCHER_ENV]: "1", ...first ? {} : { PAGS_NO_PROMPT: "1" } } });
+    if (r.status === RUNNER_RESTART_EXIT_CODE) continue;
+    if (r.error || r.status !== 0) {
+      deps.log(`Restart failed${typeof r.status === "number" ? ` (exit ${r.status})` : ""} \u2014 the runner is NOT running. Run 'pags up' again.`);
+      deps.exit(typeof r.status === "number" && r.status !== 0 ? r.status : 1);
+      return;
+    }
+    deps.exit(0);
+    return;
+  }
+}
+
 // src/runner-replace.ts
 var REPLACE_EXIT_TIMEOUT_MS = 3e4;
 function describeWork(work) {
@@ -3358,16 +3455,10 @@ var upCommand = new Command8("up").description("Start the browser runner for all
   });
   function restartUp(why, env = {}) {
     writeLine(`  ${why}`);
-    try {
-      if (process.stdin.isTTY) process.stdin.setRawMode(false);
-      process.stdin.pause();
-      execFileSync3(process.execPath, [process.argv[1], ...restartUpArgs(opts)], { stdio: "inherit", env: { ...process.env, ...env } });
-    } catch (e) {
-      const status = e.status;
-      writeLine(`  Restart failed${typeof status === "number" ? ` (exit ${status})` : ""} \u2014 the runner is NOT running. Run 'pags up' again.`);
-      process.exit(typeof status === "number" && status !== 0 ? status : 1);
-    }
-    process.exit(0);
+    if (process.stdin.isTTY) process.stdin.setRawMode(false);
+    process.stdin.pause();
+    restartPagsUp(restartUpArgs(opts), env, { ...processRestartDeps(), log: (line) => writeLine(`  ${line}`) });
+    process.exit(1);
   }
   const shutdown = () => {
     child.kill();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proagentstore/cli",
-  "version": "0.4.112",
+  "version": "0.4.114",
   "description": "CLI for creating, publishing, and running ProAgentStore agents",
   "license": "MIT",
   "type": "module",