@proagentstore/cli 0.4.111 → 0.4.113

package/dist/index.js

@@ -1107,7 +1107,7 @@ import { Command as Command7 } from "commander";
 // src/commands/runner/process.ts
 import { spawn as spawn2 } from "child_process";
 import { existsSync as existsSync6 } from "fs";
-import { resolve as resolve4 } from "path";
+import { resolve as resolve4, win32 } from "path";
 import { createServer as createServer2 } from "net";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { createRequire } from "module";
@@ -1156,6 +1156,9 @@ function runsFromSource() {
 function bundledRunnerPath() {
   return fileURLToPath2(new URL("./browser-runner/index.js", import.meta.url));
 }
+function spawnNeedsShell(command, platform = process.platform) {
+  return platform === "win32" && !win32.isAbsolute(command);
+}
 function runnerSpawnSpec(opts) {
   const root = findWorkspaceRoot();
   const localPackage = resolve4(root, "packages", "browser-runner", "src", "index.ts");
@@ -1172,7 +1175,7 @@ function runnerSpawnSpec(opts) {
     command = process.execPath;
     args = [bundledPackage, ...runnerArgs];
   }
-  return { command, args, cwd };
+  return { command, args, cwd, shell: spawnNeedsShell(command) };
 }
 function startRunnerForeground(opts) {
   const spec = runnerSpawnSpec(opts);
@@ -1180,7 +1183,7 @@ function startRunnerForeground(opts) {
     const child = spawn2(spec.command, spec.args, {
       cwd: spec.cwd,
       stdio: "inherit",
-      shell: process.platform === "win32"
+      shell: spec.shell
     });
     child.on("error", reject);
     child.on("exit", (code) => {
@@ -2797,7 +2800,7 @@ function createRunnerCommand() {
     const runner = spawn4(spec.command, spec.args, {
       cwd: spec.cwd,
       stdio: ["ignore", "pipe", "pipe"],
-      shell: process.platform === "win32",
+      shell: spec.shell,
       // #896: the runtime answers `/health` with the lock's identity and stops for a
       // request quoting its nonce — so a contender can prove who is on that port, and a
       // replace is an authorisation rather than a signal aimed at a name pattern.
@@ -2953,7 +2956,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";
@@ -3075,6 +3077,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) {
@@ -3355,16 +3416,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.111",
+  "version": "0.4.113",
   "description": "CLI for creating, publishing, and running ProAgentStore agents",
   "license": "MIT",
   "type": "module",