@netmind/arena-cli 0.7.1 → 0.7.3

package/dist/index.js

@@ -177,8 +177,13 @@ function saveConfig(config) {
   const merged = { ...existing, ...config };
   writeFileSync(getConfigFile(), JSON.stringify(merged, null, 2) + "\n");
 }
+function normalizeApiUrl(raw) {
+  const trimmed = raw.trim().replace(/\/+$/, "");
+  return /\/api$/.test(trimmed) ? trimmed : `${trimmed}/api`;
+}
 function getApiUrl() {
-  return process.env.ARENA_API_URL || loadConfig().api_url;
+  const raw = process.env.ARENA_API_URL || loadConfig().api_url;
+  return normalizeApiUrl(raw);
 }
 function requireCredentials(credentialsPath) {
   try {
@@ -2531,10 +2536,10 @@ import { join as join4 } from "path";
 function pidPath(competitionId) {
   return join4(getConfigDir(), `watch-${competitionId}.pid`);
 }
-function writePid(competitionId) {
+function writePid(competitionId, pid) {
   const dir = getConfigDir();
   mkdirSync4(dir, { recursive: true });
-  writeFileSync4(pidPath(competitionId), String(process.pid), "utf-8");
+  writeFileSync4(pidPath(competitionId), String(pid ?? process.pid), "utf-8");
 }
 function deletePid(competitionId) {
   const p = pidPath(competitionId);
@@ -2672,15 +2677,17 @@ It requires the \`openclaw\` CLI to be installed and available in PATH.`).action
   }
   const creds = requireCredentials(opts.credentials);
   const existingPid = readPid(competitionId);
-  if (existingPid !== null && checkPidAlive(existingPid)) {
+  if (existingPid !== null && existingPid !== process.pid && checkPidAlive(existingPid)) {
     console.log(`Already watching competition ${competitionId} (PID: ${existingPid})`);
     process.exit(0);
   }
   const MAX_WATCHERS = 3;
-  const aliveCount = countAliveWatchers();
-  if (aliveCount >= MAX_WATCHERS) {
-    printError(`Maximum of ${MAX_WATCHERS} concurrent watchers reached (${aliveCount} running). Stop an existing watcher before starting a new one.`);
-    process.exit(1);
+  if (existingPid !== process.pid) {
+    const aliveCount = countAliveWatchers();
+    if (aliveCount >= MAX_WATCHERS) {
+      printError(`Maximum of ${MAX_WATCHERS} concurrent watchers reached (${aliveCount} running). Stop an existing watcher before starting a new one.`);
+      process.exit(1);
+    }
   }
   if (opts.detach) {
     const childArgs = [process.argv[1], "watch", "start", competitionId, "--interval", opts.interval];
@@ -2695,22 +2702,15 @@ It requires the \`openclaw\` CLI to be installed and available in PATH.`).action
       stdio: "ignore"
     });
     child.unref();
+    if (typeof child.pid !== "number") {
+      printError("Failed to start background watcher: unable to determine child PID");
+      process.exit(1);
+    }
+    writePid(competitionId, child.pid);
     console.log(`Watcher started in background (PID: ${child.pid})`);
     console.log(`Stop with: kill ${child.pid}`);
     return;
   }
-  try {
-    dispatchBootstrapToOpenclaw(competitionId, creds);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    printError(`bootstrap dispatch failed: ${msg}`);
-    process.exit(1);
-  }
-  try {
-    StateManager.getInstance().trackGame(competitionId, competitionId, "unknown");
-  } catch (e) {
-    console.warn(`[watch] warning: failed to persist game tracking: ${e instanceof Error ? e.message : e}`);
-  }
   writePid(competitionId);
   const handleSigterm = () => {
     cleanup();
@@ -2727,6 +2727,19 @@ It requires the \`openclaw\` CLI to be installed and available in PATH.`).action
   };
   process.on("SIGTERM", handleSigterm);
   process.on("SIGINT", handleSigint);
+  try {
+    dispatchBootstrapToOpenclaw(competitionId, creds);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    printError(`bootstrap dispatch failed: ${msg}`);
+    cleanup();
+    process.exit(1);
+  }
+  try {
+    StateManager.getInstance().trackGame(competitionId, competitionId, "unknown");
+  } catch (e) {
+    console.warn(`[watch] warning: failed to persist game tracking: ${e instanceof Error ? e.message : e}`);
+  }
   const apiUrl = getApiUrl();
   const intervalMs = Math.min(Math.max(parseInt(opts.interval, 10), 2), 60) * 1e3;
   console.log(`Watching competition ${competitionId} (interval: ${intervalMs / 1e3}s)`);