@proagentstore/cli 0.2.9 → 0.2.11

package/dist/index.js

@@ -7,7 +7,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/index.ts
-import { createRequire as createRequire2 } from "module";
+import { createRequire as createRequire3 } from "module";
 import { Command as Command8 } from "commander";
 
 // src/commands/check.ts
@@ -620,7 +620,15 @@ import { arch, homedir as homedir2, hostname, platform } from "os";
 import { resolve as resolve4 } from "path";
 import { createServer as createServer2 } from "net";
 import { fileURLToPath as fileURLToPath2 } from "url";
+import { createRequire } from "module";
 import { Command as Command6 } from "commander";
+var CLI_VERSION = (() => {
+  try {
+    return createRequire(import.meta.url)("../package.json").version;
+  } catch {
+    return "";
+  }
+})();
 async function findFreePort2(start) {
   for (let p = start; p < start + 25; p++) {
     const free = await new Promise((res) => {
@@ -906,52 +914,61 @@ function responseErrorMessage(data, text, statusText) {
 function collectCapability(value, previous = []) {
   return [...previous, value];
 }
-async function connectViaRelay(instanceIds, localUrl, runnerToken, opts) {
+async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force = false) {
   const apiBase = pagsApiBase(opts.apiBase).replace(/^http/, "ws");
   const pagsToken = clean(opts.pagsToken) || clean(process.env.PAGS_TOKEN) || clean(loadSession()?.token);
   if (!pagsToken) throw new Error("PAGS token required for WebSocket relay");
   const capabilities = await requestRunner("GET", "/capabilities", { url: localUrl, token: runnerToken, instanceId: instanceIds[0] });
   const caps = Array.isArray(capabilities.capabilities) ? capabilities.capabilities.filter((item) => typeof item === "string") : [];
   for (const id of instanceIds) {
-    await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime`, opts, {
-      endpointUrl: localUrl,
-      token: runnerToken,
-      placement: "local",
-      capabilities: caps,
-      runnerVersion: "",
-      runnerNode: hostname()
-    }).catch((e) => writeError(`register ${id.slice(0, 8)}\u2026 failed: ${e instanceof Error ? e.message : String(e)}`));
+    try {
+      await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime`, opts, {
+        endpointUrl: localUrl,
+        token: runnerToken,
+        placement: "local",
+        capabilities: caps,
+        runnerVersion: CLI_VERSION,
+        runnerNode: hostname(),
+        force
+      });
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      if (msg.includes("409") && msg.includes("Another machine")) {
+        writeError(msg);
+        writeLine("");
+        writeLine("  To take over, run:  pags up --tunnel ws --force");
+        writeLine("");
+        throw new Error("Another machine is already connected");
+      }
+      writeError(`register ${id.slice(0, 8)}\u2026 failed: ${msg}`);
+    }
   }
   for (const id of instanceIds) {
-    openRelaySocket(id, apiBase, pagsToken, localUrl, runnerToken);
+    openRelaySocket(id, apiBase, pagsToken, localUrl, runnerToken, force);
   }
   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");
-  writeLine("  \u2705 CONNECTED \u2014 WebSocket relay (no tunnel)");
+  writeLine(`  \u2705 CONNECTED \u2014 WebSocket relay \xB7 ${hostname()}`);
   writeLine(`  Agents:   ${instanceIds.length} instance${instanceIds.length === 1 ? "" : "s"}`);
   writeLine("  No cloudflared needed. Ctrl+C to disconnect.");
   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");
-  let stopped = false;
-  const heartbeatLoop = async () => {
-    while (!stopped) {
-      await new Promise((r) => setTimeout(r, 3e4));
-      if (stopped) break;
+  const heartbeat = () => {
+    const timer = setTimeout(async () => {
       for (const id of instanceIds) {
         await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime/heartbeat`, opts, {}).catch(() => void 0);
       }
-    }
+      heartbeat();
+    }, 3e4);
+    timer.unref();
   };
-  void heartbeatLoop();
-  process.once("beforeExit", () => {
-    stopped = true;
-  });
+  heartbeat();
 }
-function openRelaySocket(instanceId, wsBase, pagsToken, localUrl, runnerToken) {
+function openRelaySocket(instanceId, wsBase, pagsToken, localUrl, runnerToken, force = false) {
   let backoffMs = 1e3;
   let reconnecting = false;
   const connect = () => {
-    const url = `${wsBase}/v1/relay/${encodeURIComponent(instanceId)}/connect?token=${encodeURIComponent(pagsToken)}`;
+    const url = `${wsBase}/v1/relay/${encodeURIComponent(instanceId)}/connect?token=${encodeURIComponent(pagsToken)}${force ? "&force=1" : ""}`;
     const ws = new WebSocket(url);
     ws.onopen = () => {
       backoffMs = 1e3;
@@ -959,6 +976,13 @@ function openRelaySocket(instanceId, wsBase, pagsToken, localUrl, runnerToken) {
     };
     ws.onmessage = async (event) => {
       const text = typeof event.data === "string" ? event.data : String(event.data);
+      if (text === "ping") {
+        try {
+          ws.send("pong");
+        } catch {
+        }
+        return;
+      }
       let cmd;
       try {
         cmd = JSON.parse(text);
@@ -978,16 +1002,29 @@ function openRelaySocket(instanceId, wsBase, pagsToken, localUrl, runnerToken) {
           headers,
           body: hasBody ? JSON.stringify(cmd.body) : void 0
         });
-        const result = await res.json().catch(() => ({}));
-        ws.send(JSON.stringify({ id: cmd.id, status: res.status, result }));
+        const text2 = await res.text().catch(() => "");
+        let result;
+        try {
+          result = text2 ? JSON.parse(text2) : {};
+        } catch {
+          result = { raw: text2.slice(0, 500) };
+        }
+        try {
+          ws.send(JSON.stringify({ id: cmd.id, status: res.status, result }));
+        } catch {
+        }
       } catch (err) {
-        ws.send(JSON.stringify({ id: cmd.id, status: 500, error: err instanceof Error ? err.message : String(err) }));
+        try {
+          ws.send(JSON.stringify({ id: cmd.id, status: 500, error: err instanceof Error ? err.message : String(err) }));
+        } catch {
+        }
       }
     };
-    ws.onclose = () => {
+    ws.onclose = (ev) => {
       if (reconnecting) return;
       reconnecting = true;
-      writeLine(`Relay disconnected: ${instanceId.slice(0, 8)}\u2026 \u2014 reconnecting in ${Math.round(backoffMs / 1e3)}s`);
+      const reason = ev.code === 4401 || ev.code === 1008 ? " (token expired \u2014 run `pags login` then `pags up`)" : "";
+      writeLine(`Relay disconnected: ${instanceId.slice(0, 8)}\u2026${reason} \u2014 reconnecting in ${Math.round(backoffMs / 1e3)}s`);
       setTimeout(() => {
         reconnecting = false;
         connect();
@@ -1006,7 +1043,7 @@ function createRunnerCommand() {
   command.command("start").description("Start the local FAGS browser runtime in the foreground").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>", "Require this bearer token").option("--instance-id <id>", "Bind runner requests to a PAGS instance id").option("--headless", "Run Playwright headless").action(async (opts) => {
     await startRunnerForeground(opts);
   });
-  command.command("connect <instanceIds...>").description("Start ONE local runtime, open a Cloudflare quick tunnel, and register it for every given PAGS instance").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").option("--tunnel <mode>", "Tunnel mode: 'ws' (WebSocket relay), 'named' (production), or 'quick' (default)", "quick").action(async (instanceIds, opts) => {
+  command.command("connect <instanceIds...>").description("Start ONE local runtime, open a Cloudflare quick tunnel, and register it for every given PAGS instance").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").option("--tunnel <mode>", "Tunnel mode: 'ws' (WebSocket relay, default), 'named' (stable hostname), or 'quick' (cloudflared)", "ws").option("--force", "Take over from another connected machine").action(async (instanceIds, 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) || String(await findFreePort2(49171));
@@ -1046,7 +1083,7 @@ function createRunnerCommand() {
       await waitForLocalRunner({ url: localUrl, token: runnerToken, instanceId: primary });
       writeLine(`Local FAGS runtime healthy at ${localUrl}`);
       if (opts.tunnel === "ws") {
-        await connectViaRelay(instanceIds, localUrl, runnerToken, opts);
+        await connectViaRelay(instanceIds, localUrl, runnerToken, opts, Boolean(opts.force));
         await new Promise((resolvePromise) => {
           runner.on("exit", () => resolvePromise());
         });
@@ -1347,7 +1384,7 @@ function createRunnerCommand() {
 }
 
 // src/commands/up.ts
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 import { Command as Command7 } from "commander";
 
 // src/tui.ts
@@ -1454,7 +1491,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 CLI_VERSION2 = createRequire2(import.meta.url)("../package.json").version;
 async function stopRunnerProcesses() {
   if (process.platform === "win32") return false;
   const { execSync } = await import("child_process");
@@ -1474,7 +1511,7 @@ async function stopRunnerProcesses() {
   }
   return stopped;
 }
-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").option("--tunnel <mode>", "Tunnel mode: 'ws' (WebSocket relay, recommended), 'named' (production, stable), or 'quick' (default, trycloudflare.com)", "quick").action(async (opts) => {
+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").option("--tunnel <mode>", "Tunnel mode: 'ws' (WebSocket relay, default), 'named' (stable hostname), or 'quick' (cloudflared)", "ws").option("--force", "Take over from another connected machine").action(async (opts) => {
   const session = requireSession();
   const state = {
     user: session.user.login,
@@ -1486,10 +1523,10 @@ var upCommand = new Command7("up").description("Start the browser runner for all
     registration: "pending",
     lastEvent: "Fetching instances...",
     taskCount: 0,
-    version: CLI_VERSION
+    version: CLI_VERSION2
   };
   clearScreen();
-  printLogo(CLI_VERSION);
+  printLogo(CLI_VERSION2);
   printStep("Signed in as " + session.user.login, "ok");
   printStep("Fetching instances...", "wait");
   const res = await fetch(`${API_BASE2}/v1/instances/my/instances`, {
@@ -1523,6 +1560,7 @@ var upCommand = new Command7("up").description("Start the browser runner for all
   if (opts.headless) args.push("--headless");
   if (opts.tunnel === "named") args.push("--tunnel", "named");
   if (opts.tunnel === "ws") args.push("--tunnel", "ws");
+  if (opts.force) args.push("--force");
   const child = spawn3(process.execPath, args, {
     stdio: ["ignore", "pipe", "pipe"],
     env: { ...process.env, PAGS_TOKEN: session.token }
@@ -1646,7 +1684,7 @@ 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);
+  printLogo(CLI_VERSION2);
   if (process.platform === "win32") {
     writeLine("  On Windows: switch to the 'pags up' window and press Ctrl+C to disconnect.");
     writeLine("");
@@ -1664,7 +1702,7 @@ var downCommand = new Command7("down").description("Stop the browser runner and
 });
 
 // src/index.ts
-var require2 = createRequire2(import.meta.url);
+var require2 = createRequire3(import.meta.url);
 var { version } = require2("../package.json");
 var program = new Command8();
 program.name("pags").description(

package/package.json

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