@proagentstore/cli 0.4.150 → 0.4.151

package/dist/index.js

@@ -2395,6 +2395,101 @@ function releaseTrial(version2, cell, log, env = process.env, root = payloadRoot
   };
 }
 
+// src/commands/up-restart.ts
+import { spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "child_process";
+var UP_LAUNCHER_ENV = "PAGS_UP_LAUNCHER";
+var UP_LAUNCHER_PID_ENV = "PAGS_UP_LAUNCHER_PID";
+var RUNNER_DIED_EXIT_CODE = 76;
+function upRestartMode(env, parent = { pid: process.ppid, alive: pidAlive }) {
+  if (env[SERVICE_ENV] === "1") return "service";
+  if (env[RESTART_COMMAND_ENV]?.trim()) return "command";
+  const launcher = Number(env[UP_LAUNCHER_PID_ENV]);
+  if (env[UP_LAUNCHER_ENV] === "1" && launcher === parent.pid && parent.alive(launcher)) return "launcher-child";
+  return "launcher";
+}
+function runnerExitAction(code, stopping) {
+  if (code === RUNNER_RESTART_EXIT_CODE) return "restart";
+  if (stopping) return "ignore";
+  return code === 0 ? "stop" : "died";
+}
+function restartOwner(env = process.env, alive = pidAlive) {
+  if (env[SERVICE_ENV] === "1") return "service";
+  return env[UP_LAUNCHER_ENV] === "1" && alive(Number(env[UP_LAUNCHER_PID_ENV])) ? "launcher" : "none";
+}
+function relaunchDelayMs(failures) {
+  return Math.min(5 * 6e4, 1e4 * 2 ** Math.max(0, failures - 1));
+}
+var RAN_MS = 6e4;
+var RESET_MS = 10 * 6e4;
+function processRestartDeps() {
+  return {
+    env: process.env,
+    execPath: process.execPath,
+    execArgv: process.execArgv,
+    script: process.argv[1],
+    spawn: nodeSpawn,
+    spawnSync: nodeSpawnSync,
+    exit: (code) => process.exit(code),
+    log: () => {
+    },
+    sleep: (ms) => Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms),
+    step: (line) => logUpdateStep(line),
+    parent: { pid: process.ppid, alive: pidAlive },
+    pid: process.pid,
+    now: Date.now
+  };
+}
+function restartPagsUp(args, extraEnv, deps, opts = {}) {
+  const env = { ...deps.env, ...extraEnv };
+  const argv = [...deps.execArgv, deps.script, ...args];
+  const exitCode = opts.exitCode ?? RUNNER_RESTART_EXIT_CODE;
+  const mode = upRestartMode(env, deps.parent);
+  deps.step(`${opts.initial ? "start" : "restart"}: pags ${args.join(" ")} \u2014 ${opts.initial ? "as" : "leaving via"} ${mode}${exitCode === RUNNER_DIED_EXIT_CODE ? " (the runner died)" : ""}`);
+  if (mode === "service") {
+    deps.exit(exitCode);
+    return;
+  }
+  if (mode === "command") {
+    leaveForRestart(mode, { spawn: deps.spawn, exit: deps.exit });
+    return;
+  }
+  if (mode === "launcher-child") {
+    deps.exit(exitCode);
+    return;
+  }
+  const childEnv = { ...env, [UP_LAUNCHER_ENV]: "1", [UP_LAUNCHER_PID_ENV]: String(deps.pid) };
+  let failures = 0;
+  for (let first = true; ; first = false) {
+    const unattended = !first || env.PAGS_NO_PROMPT === "1";
+    deps.step(`launcher: starting pags up${unattended ? " (unattended)" : ""}`);
+    const startedAt = deps.now();
+    const r = deps.spawnSync(deps.execPath, argv, { stdio: "inherit", env: first ? childEnv : { ...childEnv, PAGS_NO_PROMPT: "1" } });
+    const ran = deps.now() - startedAt;
+    const how = r.error ? `could not start (${r.error.message})` : r.signal ? `was killed by ${r.signal}` : `exited ${r.status}`;
+    deps.step(`launcher: pags up ${how} after ${Math.round(ran / 1e3)}s`);
+    if (ran >= RESET_MS) failures = 0;
+    if (r.status === RUNNER_RESTART_EXIT_CODE) {
+      failures = 0;
+      continue;
+    }
+    if (!r.error && (r.status === 0 || r.signal === "SIGINT")) {
+      deps.exit(0);
+      return;
+    }
+    if (unattended || r.status === RUNNER_DIED_EXIT_CODE || ran >= RAN_MS) {
+      failures++;
+      const wait = relaunchDelayMs(failures);
+      deps.log(`pags up ${how} \u2014 starting it again in ${Math.round(wait / 1e3)}s (attempt ${failures + 1}).`);
+      deps.step(`launcher: retrying in ${Math.round(wait / 1e3)}s (failure ${failures})`);
+      deps.sleep(wait);
+      continue;
+    }
+    if (!opts.initial) 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;
+  }
+}
+
 // 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, RUNNER_RESTART_PATH]);
@@ -2690,7 +2785,9 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
           // #896: who is heartbeating. Set by `runner connect` from the lock it took.
           ...process.env.PAGS_RUNNER_RSID ? { rsid: process.env.PAGS_RUNNER_RSID } : {},
           pid: process.pid,
-          ...process.env.PAGS_RUNNER_LAUNCH ? { launch: process.env.PAGS_RUNNER_LAUNCH } : {}
+          ...process.env.PAGS_RUNNER_LAUNCH ? { launch: process.env.PAGS_RUNNER_LAUNCH } : {},
+          supervisor: restartOwner()
+          // #1154: what starts it again if it dies
         },
         relayRttMs,
         sessions: sessions ?? void 0
@@ -3257,6 +3354,8 @@ function createRunnerCommand() {
         process.exit(1);
       }
       lockHeld = { path: taken.path, rsid: taken.lock.rsid, nonce: taken.lock.nonce, launch: taken.lock.launch };
+      process.env.PAGS_RUNNER_RSID = taken.lock.rsid;
+      process.env.PAGS_RUNNER_LAUNCH = taken.lock.launch;
       writeLine(`STATUS runner-session=${taken.lock.rsid}`);
     }
     const releaseHeldLock = () => {
@@ -3453,7 +3552,7 @@ import { readFileSync as readFileSync11, statSync as statSync2, watchFile } from
 import { Command as Command9 } from "commander";
 
 // src/background.ts
-import { spawn as nodeSpawn } from "child_process";
+import { spawn as nodeSpawn2 } from "child_process";
 import { closeSync as closeSync3, existsSync as existsSync10, mkdirSync as mkdirSync8, openSync as openSync3, readFileSync as readFileSync10, renameSync as renameSync4, statSync, writeFileSync as writeFileSync6 } from "fs";
 import { dirname as dirname5, join as join11 } from "path";
 var BACKGROUND_ENV = "PAGS_BACKGROUND";
@@ -3492,7 +3591,7 @@ function backgroundRestartCommand(execPath, script, upArgs, platform = process.p
   const argv = [execPath, script, ...upArgs, "--background"].map((a) => shellQuote(a, platform)).join(" ");
   return platform === "win32" ? `set ${BACKGROUND_RESTART_ENV}=1&& ${argv}` : `${BACKGROUND_RESTART_ENV}=1 ${argv}`;
 }
-function spawnDetached(command, args, env, logPath, spawn5 = nodeSpawn) {
+function spawnDetached(command, args, env, logPath, spawn5 = nodeSpawn2) {
   mkdirSync8(dirname5(logPath), { recursive: true });
   rotateLog(logPath);
   const fd = openSync3(logPath, "a", 384);
@@ -3709,75 +3808,6 @@ async function waitForKey(keys, onInterrupt) {
   });
 }
 
-// src/commands/up-restart.ts
-import { spawn as nodeSpawn2, spawnSync as nodeSpawnSync } from "child_process";
-var UP_LAUNCHER_ENV = "PAGS_UP_LAUNCHER";
-function upRestartMode(env) {
-  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 "launcher";
-}
-function relaunchDelayMs(failures) {
-  return Math.min(5 * 6e4, 1e4 * 2 ** Math.max(0, failures - 1));
-}
-function processRestartDeps() {
-  return {
-    env: process.env,
-    execPath: process.execPath,
-    execArgv: process.execArgv,
-    script: process.argv[1],
-    spawn: nodeSpawn2,
-    spawnSync: nodeSpawnSync,
-    exit: (code) => process.exit(code),
-    log: () => {
-    },
-    sleep: (ms) => Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms),
-    step: (line) => logUpdateStep(line)
-  };
-}
-function restartPagsUp(args, extraEnv, deps) {
-  const env = { ...deps.env, ...extraEnv };
-  const argv = [...deps.execArgv, deps.script, ...args];
-  const mode = upRestartMode(env);
-  deps.step(`restart: pags ${args.join(" ")} \u2014 leaving via ${mode}`);
-  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;
-  }
-  let failures = 0;
-  for (let first = true; ; first = false) {
-    const unattended = !first || env.PAGS_NO_PROMPT === "1";
-    deps.step(`launcher: starting pags up${unattended ? " (unattended)" : ""}`);
-    const r = deps.spawnSync(deps.execPath, argv, { stdio: "inherit", env: { ...env, [UP_LAUNCHER_ENV]: "1", ...first ? {} : { PAGS_NO_PROMPT: "1" } } });
-    const how = r.error ? `could not start (${r.error.message})` : r.signal ? `was killed by ${r.signal}` : `exited ${r.status}`;
-    deps.step(`launcher: pags up ${how}`);
-    if (r.status === RUNNER_RESTART_EXIT_CODE) {
-      failures = 0;
-      continue;
-    }
-    if (!r.error && r.status === 0) {
-      deps.exit(0);
-      return;
-    }
-    if (unattended) {
-      failures++;
-      const wait = relaunchDelayMs(failures);
-      deps.log(`pags up ${how} \u2014 starting it again in ${Math.round(wait / 1e3)}s (attempt ${failures + 1}).`);
-      deps.step(`launcher: retrying in ${Math.round(wait / 1e3)}s (failure ${failures})`);
-      deps.sleep(wait);
-      continue;
-    }
-    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;
-  }
-}
-
 // src/runner-replace.ts
 var REPLACE_EXIT_TIMEOUT_MS = 3e4;
 function describeWork(work) {
@@ -3987,6 +4017,15 @@ start();
 var xml = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 var unitWord = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
 var ps = (s) => `'${s.replace(/'/g, "''")}'`;
+function versionManagedNode(nodePath) {
+  if (/[\\/]n[\\/]versions[\\/]/.test(nodePath)) return "n";
+  const m = /[\\/]\.?(nvm|fnm|volta|asdf|nodenv)[\\/]/i.exec(nodePath);
+  return m ? m[1].toLowerCase() : null;
+}
+var pinnedNodeNote = (ctx) => {
+  const manager = versionManagedNode(ctx.nodePath);
+  return manager ? [`It runs Node ${ctx.nodePath}, installed by ${manager}. Removing or switching away from that Node version stops the service; after changing Node, run \`pags up --install-service\` again.`] : [];
+};
 function servicePlan(ctx) {
   const supervisor = supervisorPath(ctx);
   const log = serviceLogPath(ctx);
@@ -4010,6 +4049,7 @@ function servicePlan(ctx) {
 	<key>KeepAlive</key><true/>
 	<key>ThrottleInterval</key><integer>30</integer>
 	<key>ProcessType</key><string>Background</string>
+	<key>WorkingDirectory</key><string>${xml(ctx.home)}</string>
 	<key>StandardOutPath</key><string>${xml(log)}</string>
 	<key>StandardErrorPath</key><string>${xml(log)}</string>
 </dict>
@@ -4025,6 +4065,7 @@ function servicePlan(ctx) {
         { file: "launchctl", args: ["kickstart", "-k", `${domain}/${SERVICE_LABEL}`], why: "start it now" }
       ],
       notes: [
+        ...pinnedNodeNote(ctx),
         `LaunchAgent ${plist} \u2014 runs while this user is logged in. On a machine that must survive a reboot unattended, turn on automatic login for this user.`,
         `Remove it with: pags up --uninstall-service`
       ]
@@ -4039,8 +4080,11 @@ function servicePlan(ctx) {
 $ErrorActionPreference = 'Stop'
 $action    = New-ScheduledTaskAction -Execute ${ps(ctx.nodePath)} -Argument ${ps(`"${supervisor}"`)}
 $trigger   = New-ScheduledTaskTrigger -AtStartup
+# Task Scheduler restarts a task that failed to START; a supervisor killed later just ends. Re-trigger it every five
+# minutes, forever \u2014 MultipleInstances IgnoreNew makes a trigger that finds it running do nothing (#1154).
+$trigger.Repetition = (New-ScheduledTaskTrigger -Once -At (Get-Date) -RepetitionInterval (New-TimeSpan -Minutes 5)).Repetition
 $principal = New-ScheduledTaskPrincipal -UserId ${ps(principal)} -LogonType S4U -RunLevel Limited
-$settings  = New-ScheduledTaskSettingsSet -ExecutionTimeLimit ([TimeSpan]::Zero) -RestartCount 999 -RestartInterval (New-TimeSpan -Minutes 1) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable
+$settings  = New-ScheduledTaskSettingsSet -ExecutionTimeLimit ([TimeSpan]::Zero) -RestartCount 999 -RestartInterval (New-TimeSpan -Minutes 1) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew
 Unregister-ScheduledTask -TaskName ${ps(WINDOWS_TASK)} -Confirm:$false -ErrorAction SilentlyContinue
 Register-ScheduledTask -TaskName ${ps(WINDOWS_TASK)} -Action $action -Trigger $trigger -Principal $principal -Settings $settings | Out-Null
 Start-ScheduledTask -TaskName ${ps(WINDOWS_TASK)}
@@ -4051,6 +4095,7 @@ Start-ScheduledTask -TaskName ${ps(WINDOWS_TASK)}
       files,
       commands: [{ file: "powershell.exe", args: ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", task], why: "register and start the Scheduled Task" }],
       notes: [
+        ...pinnedNodeNote(ctx),
         `Scheduled Task "${WINDOWS_TASK}" \u2014 starts at boot as ${principal || "this user"}, with nobody logged in. Registering it needs an elevated PowerShell: if it was refused, run ${task} from one.`,
         `Remove it with: pags up --uninstall-service`
       ]
@@ -4085,7 +4130,7 @@ WantedBy=default.target
       { file: "systemctl", args: ["--user", "enable", "--now", SYSTEMD_UNIT], why: "enable and start it" },
       { file: "loginctl", args: ["enable-linger", ...ctx.user ? [ctx.user] : []], optional: true, why: "keep it running with nobody logged in" }
     ],
-    notes: [`systemd user unit ${unit}. Logs: ${log} (and journalctl --user -u ${SYSTEMD_UNIT}).`, `Remove it with: pags up --uninstall-service`]
+    notes: [...pinnedNodeNote(ctx), `systemd user unit ${unit}. Logs: ${log} (and journalctl --user -u ${SYSTEMD_UNIT}).`, `Remove it with: pags up --uninstall-service`]
   };
 }
 function serviceRemovalPlan(ctx) {
@@ -4149,6 +4194,10 @@ var upCommand = new Command10("up").description("Start the browser runner for al
     for (const line of uninstallService(serviceContext()).lines) writeLine(line);
     return;
   }
+  if (!opts.background && !opts.installService && upRestartMode(process.env) === "launcher") {
+    restartPagsUp(process.argv.slice(2), {}, { ...processRestartDeps(), log: (line) => writeLine(`  ${line}`) }, { initial: true });
+    return;
+  }
   const session = requireSession();
   if (opts.installService) {
     const result = installService(serviceContext());
@@ -4355,33 +4404,29 @@ var upCommand = new Command10("up").description("Start the browser runner for al
     void deliverCrashReports({ apiBase: API_BASE3, token: session.token, account: session.user.login, paths: crashes }).catch(() => void 0);
   };
   child.on("exit", (code, signal) => {
-    if (code === RUNNER_RESTART_EXIT_CODE) {
+    const action = runnerExitAction(code, stopping);
+    if (action === "restart") {
       logUpdateStep("restart: runner connect asked for a restart (exit 75)");
       restartUp("Runner updated remotely \u2014 restarting pags up on the new version\u2026", { PAGS_NO_PROMPT: "1" });
       return;
     }
     childDead = true;
     logUpdateStep(`runner connect ${signal ? `was killed by ${signal}` : `exited ${code}`}${stopping ? " (stopping)" : ""}`);
-    if (code !== 0 && !stopping) recordConnectExit(code, signal ?? null, logs.slice(-20));
-    if (code === null) {
-      state.runner = "error";
-      state.lastEvent = "Runner stopped by another process (signal) \u2014 it is not connected any more";
-      printStatus(state);
-      return;
-    }
-    if (code !== 0) {
-      state.runner = "error";
-      state.lastEvent = `Runner exited (code ${code})`;
-      const recent = logs.slice(-5);
-      if (recent.length) state.lastEvent += ": " + recent[recent.length - 1].slice(0, 60);
-      printStatus(state);
+    if (action === "ignore") return;
+    if (action === "stop") {
+      clearScreen();
+      writeLine("  Runner stopped (pags down, or replaced by another pags up).");
+      process.exit(0);
     }
+    recordConnectExit(code, signal ?? null, logs.slice(-20));
+    const recent = logs.slice(-5).at(-1);
+    restartUp(`Runner ${signal ? `was killed by ${signal}` : `exited (code ${code})`}${recent ? `: ${recent.slice(0, 60)}` : ""} \u2014 starting it again\u2026`, { PAGS_NO_PROMPT: "1" }, RUNNER_DIED_EXIT_CODE);
   });
-  function restartUp(why, env = {}) {
+  function restartUp(why, env = {}, exitCode) {
     writeLine(`  ${why}`);
     if (process.stdin.isTTY) process.stdin.setRawMode(false);
     process.stdin.pause();
-    restartPagsUp(restartUpArgs(opts), env, { ...processRestartDeps(), log: (line) => writeLine(`  ${line}`) });
+    restartPagsUp(restartUpArgs(opts), env, { ...processRestartDeps(), log: (line) => writeLine(`  ${line}`) }, { exitCode });
     process.exit(1);
   }
   const shutdown = () => {

package/package.json

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