clawmoney 0.15.60 → 0.15.62

package/dist/commands/relay.js

@@ -120,11 +120,44 @@ export async function relayRegisterCommand(options) {
 // ── relay start ──
 export async function relayStartCommand(options) {
     const config = requireConfig();
-    // Check if already running
+    // If an old daemon is still running, auto-stop and replace it instead
+    // of bailing with "already running, use stop first". Previously re-
+    // running `clawmoney relay setup` (or `relay start`) with a previous
+    // daemon alive produced a confusing error at the last step of an
+    // otherwise-successful flow. SIGTERM → poll for exit (3s) →
+    // SIGKILL on stubborn processes → clean PID file → start fresh.
     const existingPid = readRelayPid();
     if (existingPid && isRelayPidAlive(existingPid)) {
-        console.log(chalk.yellow(`Relay Provider is already running (PID ${existingPid}). Use "clawmoney relay stop" first.`));
-        return;
+        const stopSpin = ora(`Replacing existing daemon (PID ${existingPid})...`).start();
+        try {
+            process.kill(existingPid, "SIGTERM");
+        }
+        catch {
+            // Process may have exited between readPid and kill — ignore.
+        }
+        const deadline = Date.now() + 3000;
+        while (Date.now() < deadline) {
+            if (!isRelayPidAlive(existingPid))
+                break;
+            await new Promise((r) => setTimeout(r, 100));
+        }
+        if (isRelayPidAlive(existingPid)) {
+            try {
+                process.kill(existingPid, "SIGKILL");
+            }
+            catch {
+                // ignore
+            }
+            await new Promise((r) => setTimeout(r, 200));
+            stopSpin.warn(chalk.yellow(`Old daemon (PID ${existingPid}) didn't exit in 3s — forced SIGKILL`));
+        }
+        else {
+            stopSpin.succeed(chalk.dim(`Stopped old daemon (PID ${existingPid})`));
+        }
+        // The graceful-shutdown path in the daemon removes its own PID
+        // file, but SIGKILL leaves a stale one. Make sure we start from
+        // a clean slate either way.
+        removeRelayPid();
     }
     const spinner = ora("Starting Relay Provider...").start();
     try {

package/dist/relay/provider.js

@@ -94,6 +94,11 @@ function loadRelayConfig(cliOverride) {
     const userRelay = (raw.relay ?? {});
     const relay = {
         cli_type: cliOverride ?? userRelay.cli_type ?? DEFAULT_RELAY.cli_type,
+        // Pass rate_guard through verbatim. Per-field merging happens
+        // inside each upstream module's configureRateGuard() which
+        // already knows its own defaults — we don't want to double-
+        // default here.
+        rate_guard: userRelay.rate_guard,
         model: userRelay.model ?? DEFAULT_RELAY.model,
         mode: userRelay.mode ?? DEFAULT_RELAY.mode,
         concurrency: userRelay.concurrency ?? DEFAULT_RELAY.concurrency,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.15.60",
+  "version": "0.15.62",
   "description": "ClawMoney CLI -- Earn rewards with your AI agent",
   "type": "module",
   "bin": {