@proagentstore/cli 0.1.19 → 0.1.21

package/dist/browser-runner/index.js

@@ -57,3 +57,12 @@ const shutdown = async () => {
 };
 process.on("SIGINT", () => void shutdown());
 process.on("SIGTERM", () => void shutdown());
+// Self-exit if our parent (the `runner connect` CLI) dies — otherwise we'd orphan
+// and keep holding the port, making the NEXT `pags up` fail with EADDRINUSE / a 401
+// against our stale token. When the parent dies we're reparented (ppid changes to
+// launchd/init), so a changed ppid means it's gone.
+const parentPid = process.ppid;
+setInterval(() => {
+    if (process.ppid !== parentPid)
+        void shutdown();
+}, 3000).unref();

package/dist/index.js

@@ -7,7 +7,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/index.ts
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 import { Command as Command8 } from "commander";
 
 // src/commands/check.ts
@@ -618,8 +618,21 @@ import { chmod, mkdir, writeFile } from "fs/promises";
 import { gunzipSync } from "zlib";
 import { arch, homedir as homedir2, platform } from "os";
 import { resolve as resolve4 } from "path";
+import { createServer as createServer2 } from "net";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { Command as Command6 } from "commander";
+async function findFreePort2(start) {
+  for (let p = start; p < start + 25; p++) {
+    const free = await new Promise((res) => {
+      const s = createServer2();
+      s.once("error", () => res(false));
+      s.once("listening", () => s.close(() => res(true)));
+      s.listen(p, "127.0.0.1");
+    });
+    if (free) return p;
+  }
+  return start;
+}
 var runnerCommand = createRunnerCommand();
 function runnerBaseUrl(url) {
   return (clean(url) || clean(process.env.PAGS_RUNNER_URL) || "http://127.0.0.1:49171").replace(/\/$/, "");
@@ -761,7 +774,11 @@ async function resolveCloudflaredCommand(requested) {
   return downloadCloudflared(cloudflaredAssetForPlatform());
 }
 function parseCloudflaredTunnelUrl(text) {
-  return text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/i)?.[0] || null;
+  const matches = text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/gi) || [];
+  for (const m of matches) {
+    if (!/^https:\/\/api\.trycloudflare\.com/i.test(m)) return m;
+  }
+  return null;
 }
 function buildRuntimeRegistrationBody(opts, capabilities = []) {
   return {
@@ -898,7 +915,7 @@ function createRunnerCommand() {
   command.command("connect <instanceId>").description("Start the local FAGS runtime, open a Cloudflare quick tunnel, and register it with PAGS").option("--host <host>", "Host to bind", "127.0.0.1").option("--port <port>", "Port to bind", "49171").option("--data-dir <path>", "Runner data directory").option("--token <token>", "Runner bearer token. Defaults to PAGS_RUNNER_TOKEN or a generated token").option("--headless", "Run Playwright headless").option("--api-base <url>", "PAGS API base URL").option("--pags-token <token>", "PAGS session token. Defaults to PAGS_TOKEN").option("--cloudflared <path>", "cloudflared executable").option("--runner-version <version>", "Runner version").option("--skip-probe", "Skip PAGS FAGS-runtime probe after registration").action(async (instanceId, opts) => {
     const runnerToken = clean(opts.token) || clean(process.env.PAGS_RUNNER_TOKEN) || `pags_runner_${randomUUID()}`;
     const host = clean(opts.host) || "127.0.0.1";
-    const port = clean(opts.port) || "49171";
+    const port = clean(opts.port) || String(await findFreePort2(49171));
     const localUrl = `http://${host}:${port}`;
     const runnerOpts = {
       ...opts,
@@ -964,7 +981,9 @@ function createRunnerCommand() {
       const first = await openTunnel();
       tunnel = first.proc;
       let tunnelUrl = first.url;
-      await registerRuntime(tunnelUrl);
+      await registerRuntime(tunnelUrl).catch((error) => {
+        writeError(`registration will retry (${error instanceof Error ? error.message : String(error)})`);
+      });
       writeLine("Runtime registered with PAGS \u2713");
       writeLine("");
       writeLine("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
@@ -991,7 +1010,10 @@ function createRunnerCommand() {
           await new Promise((r) => setTimeout(r, 3e4));
           if (stopped) break;
           if (await probeTunnel(tunnelUrl)) {
-            await requestPags("POST", heartbeatPath, opts, {}).catch(() => void 0);
+            const beat = await requestPags("POST", heartbeatPath, opts, {}).then(() => true).catch(() => false);
+            if (!beat) {
+              await registerRuntime(tunnelUrl).then(() => writeLine("\u2705 Re-registered with PAGS")).catch(() => void 0);
+            }
             continue;
           }
           writeLine("\u26A0 Tunnel unreachable \u2014 reconnecting\u2026");
@@ -1129,6 +1151,7 @@ function createRunnerCommand() {
 }
 
 // src/commands/up.ts
+import { createRequire } from "module";
 import { Command as Command7 } from "commander";
 
 // src/tui.ts
@@ -1150,43 +1173,56 @@ var LOGO = [
 function clearScreen() {
   console.clear();
 }
-function printLogo() {
+function printLogo(version2) {
   console.log("");
   for (const line of LOGO) {
     console.log(pad + c(line));
   }
+  console.log(pad + d("  Browser runner") + (version2 ? d(`  \xB7  v${version2}`) : ""));
   console.log("");
 }
+function describe(kind, s) {
+  const ok = s === "online" || s === "registered";
+  const busy = s === "starting" || s === "pending";
+  const icon = ok ? chalk.green("\u2713") : busy ? chalk.yellow("\u2026") : chalk.red("\u2717");
+  const map = {
+    runner: { label: "Browser", ok: "running on your computer", busy: "starting up\u2026", bad: "stopped \u2014 press r to retry" },
+    tunnel: { label: "Secure link", ok: "connected to ProAgentStore", busy: "opening\u2026", bad: "offline" },
+    pags: { label: "ProAgentStore", ok: "connected \u2014 ready for jobs", busy: "registering\u2026", bad: "not registered (retries automatically)" }
+  };
+  const m = map[kind];
+  return { icon, label: m.label, note: ok ? m.ok : busy ? m.busy : m.bad };
+}
 function printStatus(state) {
   clearScreen();
-  printLogo();
-  const statusIcon = (s) => {
-    if (s === "online" || s === "registered") return chalk.green("\u25CF");
-    if (s === "starting" || s === "pending") return chalk.yellow("\u25C9");
-    if (s === "error" || s === "failed") return chalk.red("\u25CF");
-    return d("\u25CB");
-  };
-  const statusText = (s) => {
-    if (s === "online" || s === "registered") return chalk.green(s);
-    if (s === "starting" || s === "pending") return chalk.yellow(s);
-    if (s === "error" || s === "failed") return chalk.red(s);
-    return d(s);
+  printLogo(state.version);
+  const connected = state.runner === "online" && state.tunnel === "online" && state.registration === "registered";
+  console.log(pad + d("Signed in as ") + w(state.user) + d("  \xB7  agent: ") + w(state.activeInstance));
+  console.log("");
+  const row = (kind, s) => {
+    const { icon, label, note } = describe(kind, s);
+    console.log(pad + icon + " " + w(label.padEnd(13)) + d(note));
   };
-  console.log(pad + d("User     ") + w(state.user));
-  console.log(pad + d("Instance ") + w(state.activeInstance));
-  console.log(pad + d("Runner   ") + statusIcon(state.runner) + " " + statusText(state.runner));
-  console.log(pad + d("Tunnel   ") + statusIcon(state.tunnel) + " " + statusText(state.tunnel));
-  console.log(pad + d("PAGS     ") + statusIcon(state.registration) + " " + statusText(state.registration));
-  if (state.tunnelUrl) {
-    console.log(pad + d("URL      ") + c(state.tunnelUrl));
-  }
+  row("runner", state.runner);
+  row("tunnel", state.tunnel);
+  row("pags", state.registration);
   console.log("");
-  if (state.lastEvent) {
-    console.log(pad + d("Last: ") + d(state.lastEvent));
+  if (connected) {
+    console.log(pad + chalk.green("\u2713 You're all set!") + d(" Your agent can now act on the web."));
+    console.log("");
+    console.log(pad + w("What to do next:"));
+    console.log(pad + d("  1. Open  ") + c("https://proagentstore.online/console"));
+    console.log(pad + d("  2. Pick your agent and paste a job link to apply"));
+    console.log(pad + d("  3. Keep ") + w("this window open") + d(" while your agent works"));
+    console.log("");
+    console.log(pad + d("The website can take a few seconds to show \u201Conline\u201D \u2014 that's normal."));
+  } else {
+    console.log(pad + d("Setting things up\u2026 this takes a few seconds. Keep this window open."));
+    if (state.lastEvent) console.log(pad + d("Status: ") + d(state.lastEvent));
   }
   console.log("");
   console.log(
-    pad + c("r") + d(" Refresh  ") + c("l") + d(" Logs  ") + c("q") + d(" Quit")
+    pad + c("r") + d(" Reconnect   ") + c("l") + d(" View logs   ") + c("q") + d(" Quit (disconnect)")
   );
   console.log("");
 }
@@ -1221,6 +1257,7 @@ async function waitForKey(keys) {
 
 // src/commands/up.ts
 var API_BASE2 = "https://api.proagentstore.online";
+var CLI_VERSION = createRequire(import.meta.url)("../package.json").version;
 var upCommand = new Command7("up").description("Start the browser runner for all your agent instances").option("--headless", "Run browser in headless mode").option("--instance <id>", "Connect to a specific instance only").action(async (opts) => {
   const session = requireSession();
   const state = {
@@ -1232,10 +1269,11 @@ var upCommand = new Command7("up").description("Start the browser runner for all
     tunnelUrl: "",
     registration: "pending",
     lastEvent: "Fetching instances...",
-    taskCount: 0
+    taskCount: 0,
+    version: CLI_VERSION
   };
   clearScreen();
-  printLogo();
+  printLogo(CLI_VERSION);
   printStep("Signed in as " + session.user.login, "ok");
   printStep("Fetching instances...", "wait");
   const res = await fetch(`${API_BASE2}/v1/instances/my/instances`, {
@@ -1280,7 +1318,7 @@ var upCommand = new Command7("up").description("Start the browser runner for all
       logs.push(trimmed);
       if (logs.length > 200) logs.shift();
       const tunnelMatch = trimmed.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/i);
-      if (tunnelMatch) {
+      if (tunnelMatch && !/^https:\/\/api\.trycloudflare\.com/i.test(tunnelMatch[0])) {
         state.tunnel = "online";
         state.tunnelUrl = tunnelMatch[0];
         state.lastEvent = "Tunnel created";
@@ -1373,9 +1411,41 @@ var upCommand = new Command7("up").description("Start the browser runner for all
     }
   }
 });
+var downCommand = new Command7("down").description("Stop the browser runner and disconnect (cleans up any stuck processes)").action(async () => {
+  clearScreen();
+  printLogo(CLI_VERSION);
+  if (process.platform === "win32") {
+    writeLine("  On Windows: switch to the 'pags up' window and press Ctrl+C to disconnect.");
+    writeLine("");
+    return;
+  }
+  const { execSync } = await import("child_process");
+  const patterns = [
+    "dist/browser-runner/index.js",
+    "browser-runner/src/index",
+    "runner connect",
+    "tunnel --url http://127.0.0.1"
+  ];
+  let stopped = false;
+  for (const p of patterns) {
+    try {
+      execSync(`pkill -f ${JSON.stringify(p)}`, { stdio: "ignore" });
+      stopped = true;
+    } catch {
+    }
+  }
+  if (stopped) {
+    writeLine("  \u2713 Runner stopped \u2014 you're disconnected.");
+    writeLine("");
+    writeLine("  Your agent won't act on the web until you run 'pags up' again.");
+  } else {
+    writeLine("  No runner was running \u2014 nothing to stop.");
+  }
+  writeLine("");
+});
 
 // src/index.ts
-var require2 = createRequire(import.meta.url);
+var require2 = createRequire2(import.meta.url);
 var { version } = require2("../package.json");
 var program = new Command8();
 program.name("pags").description(
@@ -1385,6 +1455,7 @@ program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(whoamiCommand);
 program.addCommand(upCommand);
+program.addCommand(downCommand);
 program.addCommand(initCommand);
 program.addCommand(checkCommand);
 program.addCommand(publishCommand);

package/package.json

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