@proagentstore/cli 0.2.10 → 0.3.0

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
@@ -614,13 +614,19 @@ var publishCommand = new Command5("publish").description("Publish an agent to Pr
 import { spawn as spawn2 } from "child_process";
 import { randomUUID } from "crypto";
 import { existsSync as existsSync5 } from "fs";
-import { chmod, mkdir, writeFile } from "fs/promises";
-import { gunzipSync } from "zlib";
-import { arch, homedir as homedir2, hostname, platform } from "os";
+import { hostname } 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) => {
@@ -664,122 +670,6 @@ function buildRunnerArgs(opts) {
   if (opts.headless) args.push("--headless");
   return args;
 }
-function buildCloudflaredArgs(localUrl) {
-  return ["tunnel", "--url", localUrl];
-}
-function cloudflaredAssetForPlatform(os = platform(), cpu = arch()) {
-  if (os === "darwin") {
-    if (cpu === "arm64") {
-      return {
-        asset: "cloudflared-darwin-arm64.tgz",
-        executableName: "cloudflared",
-        archive: true
-      };
-    }
-    if (cpu === "x64") {
-      return {
-        asset: "cloudflared-darwin-amd64.tgz",
-        executableName: "cloudflared",
-        archive: true
-      };
-    }
-  }
-  if (os === "linux") {
-    if (cpu === "x64") {
-      return {
-        asset: "cloudflared-linux-amd64",
-        executableName: "cloudflared",
-        archive: false
-      };
-    }
-    if (cpu === "arm64") {
-      return {
-        asset: "cloudflared-linux-arm64",
-        executableName: "cloudflared",
-        archive: false
-      };
-    }
-  }
-  if (os === "win32" && cpu === "x64") {
-    return {
-      asset: "cloudflared-windows-amd64.exe",
-      executableName: "cloudflared.exe",
-      archive: false
-    };
-  }
-  throw new Error(
-    `Automatic cloudflared download is not supported on ${os}/${cpu}. Install cloudflared and pass --cloudflared <path>.`
-  );
-}
-function cloudflaredDownloadUrl(asset) {
-  return `https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`;
-}
-function extractCloudflaredBinary(asset, bytes) {
-  const buffer = Buffer.from(bytes);
-  if (!asset.archive) return buffer;
-  const tar = gunzipSync(buffer);
-  for (let offset = 0; offset + 512 <= tar.length; ) {
-    const header = tar.subarray(offset, offset + 512);
-    if (header.every((byte) => byte === 0)) break;
-    const rawName = header.subarray(0, 100).toString("utf8");
-    const name = rawName.slice(0, rawName.indexOf("\0") === -1 ? void 0 : rawName.indexOf("\0"));
-    const rawSize = header.subarray(124, 136).toString("utf8").replace(/\0.*$/, "").trim();
-    const size = Number.parseInt(rawSize || "0", 8);
-    const contentStart = offset + 512;
-    const contentEnd = contentStart + size;
-    if (name.split("/").pop() === asset.executableName) {
-      return tar.subarray(contentStart, contentEnd);
-    }
-    offset = contentStart + Math.ceil(size / 512) * 512;
-  }
-  throw new Error(`Downloaded ${asset.asset} did not contain ${asset.executableName}`);
-}
-function cloudflaredCacheDir() {
-  return resolve4(homedir2(), ".config", "proagentstore", "bin");
-}
-function cachedCloudflaredPath(asset) {
-  const suffix = asset.asset.replace(/[^a-zA-Z0-9._-]/g, "-");
-  return resolve4(cloudflaredCacheDir(), `${asset.executableName}-${suffix}`);
-}
-async function commandAvailable(command) {
-  return new Promise((resolvePromise) => {
-    const child = spawn2(command, ["--version"], {
-      stdio: "ignore",
-      shell: process.platform === "win32"
-    });
-    child.on("error", () => resolvePromise(false));
-    child.on("exit", (code) => resolvePromise(code === 0));
-  });
-}
-async function downloadCloudflared(asset) {
-  const target = cachedCloudflaredPath(asset);
-  if (existsSync5(target)) return target;
-  await mkdir(cloudflaredCacheDir(), { recursive: true });
-  const url = cloudflaredDownloadUrl(asset.asset);
-  writeLine(`cloudflared not found; downloading ${asset.asset}...`);
-  const res = await fetch(url);
-  if (!res.ok) {
-    throw new Error(`cloudflared download failed: ${res.status} ${res.statusText}`);
-  }
-  const binary = extractCloudflaredBinary(asset, new Uint8Array(await res.arrayBuffer()));
-  await writeFile(target, binary);
-  if (process.platform !== "win32") await chmod(target, 493);
-  writeLine(`cloudflared cached at ${target}`);
-  return target;
-}
-async function resolveCloudflaredCommand(requested) {
-  const explicit = clean(requested);
-  if (explicit && explicit !== "cloudflared") return explicit;
-  if (await commandAvailable("cloudflared")) return "cloudflared";
-  return downloadCloudflared(cloudflaredAssetForPlatform());
-}
-function parseCloudflaredTunnelUrl(text) {
-  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 {
     endpointUrl: clean(opts.endpointUrl) || opts.endpointUrl,
@@ -906,29 +796,42 @@ 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");
@@ -943,11 +846,11 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts) {
   };
   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;
@@ -1022,18 +925,13 @@ 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, connect via WebSocket relay, 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("--runner-version <version>", "Runner version").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));
     const localUrl = `http://${host}:${port}`;
     const primary = instanceIds[0];
-    const runnerOpts = {
-      ...opts,
-      host,
-      port,
-      token: runnerToken
-    };
+    const runnerOpts = { ...opts, host, port, token: runnerToken };
     const spec = runnerSpawnSpec(runnerOpts);
     const runner = spawn2(spec.command, spec.args, {
       cwd: spec.cwd,
@@ -1045,9 +943,7 @@ function createRunnerCommand() {
     runner.on("exit", (code) => {
       if (code && code !== 0) writeError(`runner exited with code ${code}`);
     });
-    let tunnel = null;
     const shutdown = () => {
-      if (tunnel && !tunnel.killed) tunnel.kill("SIGTERM");
       if (!runner.killed) runner.kill("SIGTERM");
     };
     process.once("SIGINT", () => {
@@ -1061,193 +957,10 @@ function createRunnerCommand() {
     try {
       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 new Promise((resolvePromise) => {
-          runner.on("exit", () => resolvePromise());
-        });
-        return;
-      }
-      if (opts.tunnel === "named") {
-        writeLine("Provisioning named tunnel\u2026");
-        const provRes = await requestPags("POST", "/v1/tunnel/provision", opts, {});
-        const prov = provRes;
-        if (!prov.connectorToken) {
-          writeError(`Named tunnel provisioning failed: ${prov.error || "no token returned"}. Falling back to quick tunnel.`);
-        } else {
-          const tunnelUrl2 = prov.endpointUrl || `https://${prov.hostname}`;
-          writeLine(`Named tunnel: ${tunnelUrl2}`);
-          const cloudflaredPath2 = await resolveCloudflaredCommand(opts.cloudflared);
-          const tunnelProc = spawn2(cloudflaredPath2, ["tunnel", "run", "--token", prov.connectorToken], {
-            stdio: ["ignore", "pipe", "pipe"],
-            shell: process.platform === "win32"
-          });
-          tunnel = tunnelProc;
-          tunnelProc.stdout?.on("data", (d2) => {
-            const t = d2.toString("utf-8");
-            if (/registered/.test(t) || /CONNECTED/.test(t)) writeLine("Named tunnel connected \u2713");
-          });
-          tunnelProc.stderr?.on("data", (d2) => {
-            const t = d2.toString("utf-8");
-            if (/registered/.test(t) || /CONNECTED/.test(t)) writeLine("Named tunnel connected \u2713");
-          });
-          await new Promise((r) => setTimeout(r, 4e3));
-          const capabilities = await requestRunner("GET", "/capabilities", { url: localUrl, token: runnerToken, instanceId: primary });
-          const caps = Array.isArray(capabilities.capabilities) ? capabilities.capabilities.filter((item) => typeof item === "string") : [];
-          for (const id of instanceIds) {
-            try {
-              await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime`, opts, {
-                endpointUrl: tunnelUrl2,
-                token: runnerToken,
-                placement: "local",
-                capabilities: caps,
-                runnerVersion: clean(opts.runnerVersion) || "",
-                runnerNode: hostname()
-              });
-            } catch (error) {
-              writeError(`register ${id.slice(0, 8)}\u2026 failed (${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");
-          writeLine("  \u2705 CONNECTED \u2014 named tunnel (production)");
-          writeLine(`  Agents:   ${instanceIds.length} instance${instanceIds.length === 1 ? "" : "s"}`);
-          writeLine(`  Endpoint: ${tunnelUrl2}`);
-          writeLine("  Stable URL \u2014 no reconnect churn. 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 stopped2 = false;
-          void (async () => {
-            while (!stopped2) {
-              await new Promise((r) => setTimeout(r, 3e4));
-              if (stopped2) break;
-              for (const id of instanceIds) {
-                await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime/heartbeat`, opts, {}).catch(() => void 0);
-              }
-            }
-          })();
-          await new Promise((resolvePromise) => {
-            runner.on("exit", () => resolvePromise());
-          });
-          stopped2 = true;
-          return;
-        }
-      }
-      const cloudflaredPath = await resolveCloudflaredCommand(opts.cloudflared);
-      const openTunnel = () => new Promise((resolveTunnel, reject) => {
-        let output = "";
-        const proc = spawn2(cloudflaredPath, buildCloudflaredArgs(localUrl), {
-          stdio: ["ignore", "pipe", "pipe"],
-          shell: process.platform === "win32"
-        });
-        const onData = (data) => {
-          output += data.toString("utf-8");
-          const parsed = parseCloudflaredTunnelUrl(output);
-          if (parsed) resolveTunnel({ url: parsed, proc });
-        };
-        proc.stdout?.on("data", onData);
-        proc.stderr?.on("data", onData);
-        proc.on("error", reject);
-        setTimeout(() => reject(new Error("timed out waiting for cloudflared tunnel URL")), 45e3).unref();
-      });
-      const registerRuntime = async (url) => {
-        const capabilities = await requestRunner("GET", "/capabilities", { url: localUrl, token: runnerToken, instanceId: primary });
-        const caps = Array.isArray(capabilities.capabilities) ? capabilities.capabilities.filter((item) => typeof item === "string") : [];
-        for (const id of instanceIds) {
-          try {
-            await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime`, opts, {
-              endpointUrl: url,
-              token: runnerToken,
-              placement: "local",
-              capabilities: caps,
-              runnerVersion: clean(opts.runnerVersion) || "",
-              runnerNode: hostname()
-            });
-          } catch (error) {
-            writeError(`register ${id.slice(0, 8)}\u2026 failed (${error instanceof Error ? error.message : String(error)}); will retry`);
-          }
-        }
-      };
-      const first = await openTunnel();
-      tunnel = first.proc;
-      let tunnelUrl = first.url;
-      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");
-      writeLine("  \u2705 CONNECTED \u2014 runner is live");
-      writeLine(`  Agents:   ${instanceIds.length} instance${instanceIds.length === 1 ? "" : "s"} served by this runner`);
-      writeLine(`  Tunnel:   ${tunnelUrl}`);
-      writeLine("  Auto-reconnect is on \u2014 keep this terminal open. 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;
-      let consecutiveFailures = 0;
-      let respawnBackoffMs = 3e4;
-      const PROBE_FAIL_THRESHOLD = 3;
-      const MAX_BACKOFF_MS = 5 * 6e4;
-      const probeTunnel = async (url) => {
-        try {
-          const res = await fetch(`${url.replace(/\/$/, "")}/health`, {
-            headers: { Authorization: `Bearer ${runnerToken}`, "X-PAGS-Instance-Id": primary },
-            signal: AbortSignal.timeout(1e4)
-          });
-          return res.ok;
-        } catch {
-          return false;
-        }
-      };
-      const heartbeatAll = async () => {
-        let allOk = true;
-        for (const id of instanceIds) {
-          const ok = await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime/heartbeat`, opts, {}).then(() => true).catch(() => false);
-          if (!ok) allOk = false;
-        }
-        return allOk;
-      };
-      void (async () => {
-        while (!stopped) {
-          await new Promise((r) => setTimeout(r, 3e4));
-          if (stopped) break;
-          if (await probeTunnel(tunnelUrl)) {
-            consecutiveFailures = 0;
-            respawnBackoffMs = 3e4;
-            const beat = await heartbeatAll();
-            if (!beat) {
-              await registerRuntime(tunnelUrl).then(() => writeLine("\u2705 Re-registered with PAGS")).catch(() => void 0);
-            }
-            continue;
-          }
-          consecutiveFailures++;
-          if (consecutiveFailures < PROBE_FAIL_THRESHOLD) {
-            writeLine(`\u26A0 Tunnel probe failed (${consecutiveFailures}/${PROBE_FAIL_THRESHOLD}) \u2014 will retry`);
-            continue;
-          }
-          writeLine("\u26A0 Tunnel unreachable \u2014 reconnecting\u2026");
-          consecutiveFailures = 0;
-          try {
-            if (tunnel && !tunnel.killed) tunnel.kill("SIGTERM");
-          } catch {
-          }
-          try {
-            const next = await openTunnel();
-            tunnel = next.proc;
-            tunnelUrl = next.url;
-            await registerRuntime(tunnelUrl);
-            respawnBackoffMs = 3e4;
-            writeLine(`\u2705 Reconnected: ${tunnelUrl}`);
-          } catch (error) {
-            writeError(`reconnect failed (${error instanceof Error ? error.message : String(error)}); retrying in ${Math.round(respawnBackoffMs / 1e3)}s`);
-            await new Promise((r) => setTimeout(r, respawnBackoffMs));
-            respawnBackoffMs = Math.min(respawnBackoffMs * 2, MAX_BACKOFF_MS);
-          }
-        }
-      })();
+      await connectViaRelay(instanceIds, localUrl, runnerToken, opts, Boolean(opts.force));
       await new Promise((resolvePromise) => {
         runner.on("exit", () => resolvePromise());
       });
-      stopped = true;
     } catch (error) {
       shutdown();
       throw error;
@@ -1363,7 +1076,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
@@ -1470,15 +1183,14 @@ 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");
   const patterns = [
     "dist/browser-runner/index.js",
     "browser-runner/src/index",
-    "runner connect",
-    "tunnel --url http://127.0.0.1"
+    "runner connect"
   ];
   let stopped = false;
   for (const p of patterns) {
@@ -1490,7 +1202,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("--force", "Take over from another connected machine").action(async (opts) => {
   const session = requireSession();
   const state = {
     user: session.user.login,
@@ -1502,10 +1214,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`, {
@@ -1537,8 +1249,7 @@ var upCommand = new Command7("up").description("Start the browser runner for all
   const cliPath = process.argv[1];
   const args = [cliPath, "runner", "connect", ...instances.map((i) => i.id)];
   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 }
@@ -1551,14 +1262,6 @@ var upCommand = new Command7("up").description("Start the browser runner for all
       if (!trimmed) continue;
       logs.push(trimmed);
       if (logs.length > 200) logs.shift();
-      const tunnelMatch = trimmed.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/i);
-      if (tunnelMatch && !/^https:\/\/api\.trycloudflare\.com/i.test(tunnelMatch[0])) {
-        state.tunnel = "online";
-        state.tunnelUrl = tunnelMatch[0];
-        state.lastEvent = "Tunnel created";
-        printStatus(state);
-        continue;
-      }
       if (trimmed.includes("Relay connected:")) {
         state.tunnel = "online";
         state.tunnelUrl = "WebSocket relay";
@@ -1566,7 +1269,7 @@ var upCommand = new Command7("up").description("Start the browser runner for all
         printStatus(state);
         continue;
       }
-      if (trimmed.includes("WebSocket relay (no tunnel)")) {
+      if (trimmed.includes("WebSocket relay")) {
         state.tunnel = "online";
         state.tunnelUrl = "WebSocket relay";
         state.registration = "registered";
@@ -1586,13 +1289,18 @@ var upCommand = new Command7("up").description("Start the browser runner for all
         printStatus(state);
         continue;
       }
+      if (trimmed.includes("Another machine")) {
+        state.registration = "failed";
+        state.lastEvent = trimmed.slice(0, 80);
+        printStatus(state);
+        continue;
+      }
       if (trimmed.includes("fetch failed")) {
         state.registration = "failed";
-        state.lastEvent = "PAGS registration failed (will retry on next task)";
+        state.lastEvent = "PAGS registration failed";
         printStatus(state);
         continue;
       }
-      if (trimmed.includes("INF ")) continue;
       if (/error|Error|EADDRINUSE|ECONNREFUSED|failed/i.test(trimmed)) {
         state.lastEvent = trimmed.slice(0, 80);
         printStatus(state);
@@ -1607,7 +1315,7 @@ var upCommand = new Command7("up").description("Start the browser runner for all
     if (code && code !== 0) {
       state.runner = "error";
       state.lastEvent = `Runner exited (code ${code})`;
-      const recent = logs.slice(-5).filter((l) => !l.includes("INF "));
+      const recent = logs.slice(-5);
       if (recent.length) state.lastEvent += ": " + recent[recent.length - 1].slice(0, 60);
       printStatus(state);
     }
@@ -1641,14 +1349,9 @@ var upCommand = new Command7("up").description("Start the browser runner for all
     if (key === "r") {
       if (childDead) {
         writeLine("  Restarting runner...");
-        state.runner = "starting";
-        state.tunnel = "offline";
-        state.tunnelUrl = "";
-        state.registration = "pending";
-        state.lastEvent = "Restarting...";
         const { execSync } = await import("child_process");
         try {
-          execSync(`${process.execPath} ${process.argv[1]} up${opts.headless ? " --headless" : ""}`, {
+          execSync(`${process.execPath} ${process.argv[1]} up${opts.headless ? " --headless" : ""}${opts.force ? " --force" : ""}`, {
             stdio: "inherit",
             env: process.env
           });
@@ -1660,9 +1363,9 @@ 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 () => {
+var downCommand = new Command7("down").description("Stop the browser runner and disconnect").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("");
@@ -1680,7 +1383,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.10",
+  "version": "0.3.0",
   "description": "CLI for creating, publishing, and running ProAgentStore agents",
   "license": "MIT",
   "type": "module",