@proagentstore/cli 0.4.63 → 0.4.65

package/dist/index.js

@@ -1097,7 +1097,7 @@ var publishCommand = new Command6("publish").description("Publish an agent to Pr
 });
 
 // src/commands/runner/command.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
 import { Command as Command7 } from "commander";
 
@@ -1205,25 +1205,53 @@ async function waitForLocalRunner(opts, timeoutMs = 15e3) {
 import { hostname as hostname3 } from "os";
 
 // src/commands/runner/self-update.ts
-import { execFile } from "child_process";
+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_EXIT_CODE = 75;
 var SUPERVISED_ENV = "PAGS_UP_SUPERVISED";
+var SUPERVISOR_RESTARTS = "2";
+var SERVICE_ENV = "PAGS_SERVICE";
+var RESTART_COMMAND_ENV = "PAGS_RESTART_COMMAND";
+function restarterFrom(env) {
+  if (env[SUPERVISED_ENV] === SUPERVISOR_RESTARTS) return "pags-up";
+  if (env[SUPERVISED_ENV] === "1") return "pags-up-child-only";
+  if (env[SERVICE_ENV] === "1") return "service";
+  if (env[RESTART_COMMAND_ENV]?.trim()) return "command";
+  return null;
+}
+function supervisorNote(restarter) {
+  return restarter === "pags-up-child-only" ? "The `pags up` on this machine predates supervisor restarts (#860): the runner comes back on the new release, but the `pags up` window keeps running its own older code until it is restarted there once." : null;
+}
+function leaveForRestart(restarter, deps = { spawn: spawn3, exit: (code) => process.exit(code) }) {
+  if (restarter === "command") {
+    deps.spawn(process.env[RESTART_COMMAND_ENV], { shell: true, detached: true, stdio: "ignore", env: process.env }).unref();
+    deps.exit(0);
+    return;
+  }
+  deps.exit(RUNNER_RESTART_EXIT_CODE);
+}
+function restartUpArgs(opts) {
+  const args = ["up"];
+  if (opts.headless) args.push("--headless");
+  if (opts.force) args.push("--force");
+  if (opts.instance) args.push("--instance", opts.instance);
+  return args;
+}
 function planRunnerUpdate(f) {
   if (f.fromSource) return { action: "refused", current: f.current, reason: "This runner runs from a source checkout \u2014 update it with `git pull` there, not npm." };
   if (!f.latest) return { action: "refused", current: f.current, reason: `npm could not be asked for the latest ${CLI_PACKAGE} from this machine.` };
   if (!olderThan(f.current, f.latest)) return { action: "up-to-date", current: f.current };
-  if (!f.supervised) {
+  if (!f.restarter) {
     return {
       action: "refused",
       current: f.current,
-      reason: `This runner was not started by a \`pags up\` that can restart it (\`pags runner connect\` directly, or a \`pags up\` older than the respawn). Update once at the machine: \`npm i -g ${CLI_PACKAGE}\` and restart \`pags up\` \u2014 later updates can then be done remotely.`
+      reason: `Nothing would start this runner again after an update: it was not started by \`pags up\`, and neither ${SERVICE_ENV}=1 (a launchd/systemd unit that restarts it on a non-zero exit) nor ${RESTART_COMMAND_ENV} (a command that starts it again) is set. Run it under \`pags up\`, or set one of the two where it is started \u2014 later updates can then be done remotely. (A \`pags up\` older than 0.4.62 cannot restart it either: update once at the machine with \`npm i -g ${CLI_PACKAGE}\`.)`
     };
   }
   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 };
+  return { action: "update", current: f.current, latest: f.latest, restarter: f.restarter };
 }
 async function installVersion(version2) {
   if (process.env[BOOTSTRAP_ENV]) {
@@ -1270,6 +1298,13 @@ function partitionByPin(instances, thisNode, alsoKnownAs = []) {
   for (const inst of instances) (isEligible(inst, thisNode, alsoKnownAs) ? here : elsewhere).push(inst);
   return { here, elsewhere };
 }
+function pinnedAway(held, instances, thisNode, alsoKnownAs = []) {
+  const pins = new Map(instances.map((i) => [i.id, i.config?.runnerNode]));
+  return [...held].filter((id) => {
+    const pin = pins.get(id);
+    return !!pin && pin !== thisNode && !alsoKnownAs.includes(pin);
+  });
+}
 function registrationStatus(attached, registered) {
   const ids = [...attached];
   const have = ids.filter((id) => registered.has(id)).length;
@@ -1283,6 +1318,7 @@ function instanceLabel(inst) {
 function reattachPlan(request, state) {
   const target = typeof request?.attach === "string" && request.attach ? request.attach : null;
   const force = target !== null && request?.force === true;
+  if (!state.watching && !target) return { target, unblock: false, detach: false, force: false, release: true };
   if (!state.watching && !(target && state.scope.includes(target))) {
     return {
       target,
@@ -1380,7 +1416,7 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
       current: CLI_VERSION,
       latest: await latestPublishedVersion(),
       fromSource: runsFromSource(),
-      supervised: process.env[SUPERVISED_ENV] === "1",
+      restarter: restarterFrom(process.env),
       busy: (sessions.sessions ?? []).filter((s) => s.alive && s.runState && s.runState !== "idle").map((s) => s.sessionId)
     };
   };
@@ -1390,7 +1426,7 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     writeLine(`Installed ${plan.latest} \u2014 restarting; every agent re-attaches on the way back up.`);
     setTimeout(() => {
       for (const id of [...attached.keys()]) detach(id);
-      process.exit(RUNNER_RESTART_EXIT_CODE);
+      leaveForRestart(plan.restarter);
     }, 500).unref();
   };
   let updateWaiting = false;
@@ -1421,7 +1457,8 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     } catch (e) {
       return { status: 500, result: { error: `npm could not install ${plan.latest}: ${e instanceof Error ? e.message : String(e)}` } };
     }
-    return { status: 200, result: { action: "restarting", current: plan.current, latest: plan.latest } };
+    const supervisor = supervisorNote(plan.restarter);
+    return { status: 200, result: { action: "restarting", current: plan.current, latest: plan.latest, restartedBy: plan.restarter, ...supervisor ? { supervisor } : {} } };
   };
   const answerControl = async (path, body) => {
     if (path === RUNNER_UPDATE_PATH) return answerUpdate(body);
@@ -1430,6 +1467,13 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     const named = typeof request?.attach === "string" ? request.attach : "";
     const plan = reattachPlan(request, { held: attached.has(named), blocked: blocked.has(named), watching: watchInstances, scope: instanceIds });
     if (plan.refuse) return { status: 409, result: { error: plan.refuse } };
+    if (plan.release) {
+      const res = await requestPags("GET", "/v1/instances/my/instances", { ...opts, pagsToken });
+      const released = pinnedAway(attached.keys(), res.instances ?? [], runnerNode, machine.names);
+      for (const id of released) detach(id, `${id.slice(0, 8)}\u2026 (pinned to another machine now)`);
+      if (released.length && attached.size === 0) writeLine("This `pags up --instance` holds no agent now \u2014 close it, or restart it without --instance.");
+      return { status: 200, result: { attached: [...attached.keys()], released } };
+    }
     if (plan.target) {
       if (plan.unblock) blocked.delete(plan.target);
       if (plan.detach) detach(plan.target);
@@ -1728,7 +1772,7 @@ function createRunnerCommand() {
     const primary = instanceIds[0];
     const runnerOpts = { ...opts, host, port, token: runnerToken };
     const spec = runnerSpawnSpec(runnerOpts);
-    const runner = spawn3(spec.command, spec.args, {
+    const runner = spawn4(spec.command, spec.args, {
       cwd: spec.cwd,
       stdio: ["ignore", "pipe", "pipe"],
       shell: process.platform === "win32"
@@ -1879,6 +1923,7 @@ function createRunnerCommand() {
 var runnerCommand = createRunnerCommand();
 
 // src/commands/up.ts
+import { execFileSync as execFileSync2 } from "child_process";
 import { createRequire as createRequire2 } from "module";
 import { Command as Command8 } from "commander";
 import { hostname as hostname5 } from "os";
@@ -2005,7 +2050,7 @@ var API_BASE3 = "https://api.proagentstore.online";
 var CLI_VERSION2 = createRequire2(import.meta.url)("../package.json").version;
 async function stopRunnerProcesses() {
   if (process.platform === "win32") return false;
-  const { execFileSync: execFileSync2 } = await import("child_process");
+  const { execFileSync: execFileSync3 } = await import("child_process");
   const patterns = [
     "dist/browser-runner/index.js",
     "browser-runner/src/index",
@@ -2014,7 +2059,7 @@ async function stopRunnerProcesses() {
   let stopped = false;
   for (const p of patterns) {
     try {
-      execFileSync2("pkill", ["-f", p], { stdio: "ignore" });
+      execFileSync3("pkill", ["-f", p], { stdio: "ignore" });
       stopped = true;
     } catch {
     }
@@ -2098,17 +2143,16 @@ var upCommand = new Command8("up").description("Start the browser runner for all
   state.activeInstance = instances.length === 1 ? instances[0].name || instances[0].slug || instances[0].id.slice(0, 8) : `${instances.length} agents`;
   printStep(`Connecting ${state.activeInstance}\u2026`, "wait");
   await stopRunnerProcesses();
-  const { spawn: spawn4 } = await import("child_process");
+  const { spawn: spawn5 } = await import("child_process");
   const cliPath = process.argv[1];
   const args = [cliPath, "runner", "connect", ...instances.map((i) => i.id)];
   if (opts.headless) args.push("--headless");
   if (opts.force) args.push("--force");
   if (!opts.instance) args.push("--watch-instances");
-  const spawnChild = () => spawn4(process.execPath, args, {
+  const child = spawn5(process.execPath, args, {
     stdio: ["ignore", "pipe", "pipe"],
-    env: { ...process.env, PAGS_TOKEN: session.token, [SUPERVISED_ENV]: "1" }
+    env: { ...process.env, PAGS_TOKEN: session.token, [SUPERVISED_ENV]: SUPERVISOR_RESTARTS }
   });
-  let child = spawnChild();
   const logs = [];
   const handleOutput = (data2) => {
     const text = data2.toString("utf-8");
@@ -2167,17 +2211,11 @@ var upCommand = new Command8("up").description("Start the browser runner for all
     }
   };
   let childDead = false;
-  const wire = () => {
-    child.stdout?.on("data", handleOutput);
-    child.stderr?.on("data", handleOutput);
-    child.on("exit", onChildExit);
-  };
-  function onChildExit(code) {
+  child.stdout?.on("data", handleOutput);
+  child.stderr?.on("data", handleOutput);
+  child.on("exit", (code) => {
     if (code === RUNNER_RESTART_EXIT_CODE) {
-      state.lastEvent = "Runner updated remotely \u2014 restarting on the new version";
-      printStatus(state);
-      child = spawnChild();
-      wire();
+      restartUp("Runner updated remotely \u2014 restarting pags up on the new version\u2026", { PAGS_NO_PROMPT: "1" });
       return;
     }
     childDead = true;
@@ -2188,8 +2226,20 @@ var upCommand = new Command8("up").description("Start the browser runner for all
       if (recent.length) state.lastEvent += ": " + recent[recent.length - 1].slice(0, 60);
       printStatus(state);
     }
+  });
+  function restartUp(why, env = {}) {
+    writeLine(`  ${why}`);
+    try {
+      if (process.stdin.isTTY) process.stdin.setRawMode(false);
+      process.stdin.pause();
+      execFileSync2(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);
   }
-  wire();
   const shutdown = () => {
     child.kill();
     clearScreen();
@@ -2217,25 +2267,7 @@ var upCommand = new Command8("up").description("Start the browser runner for all
       printStatus(state);
     }
     if (key === "r") {
-      if (childDead) {
-        writeLine("  Restarting runner...");
-        const { execFileSync: execFileSync2 } = await import("child_process");
-        const restartArgs = [process.argv[1], "up"];
-        if (opts.headless) restartArgs.push("--headless");
-        if (opts.force) restartArgs.push("--force");
-        if (opts.instance) restartArgs.push("--instance", opts.instance);
-        try {
-          execFileSync2(process.execPath, restartArgs, {
-            stdio: "inherit",
-            env: process.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 (childDead) restartUp("Restarting runner...");
       printStatus(state);
     }
   }

package/package.json

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