@claw-link/gateway-host 0.3.6 → 0.3.7

package/bin/cli.js

@@ -104,8 +104,8 @@ async function main() {
         '  transport-test  Verify content-addressed Capsule relay (host ⇄ central sync + integrity)',
         '  p2p-test    Verify the native QUIC P2P transport end-to-end on this machine (loopback)',
         '  start       Start the background service',
-        '  stop        Stop the background service',
-        '  restart     Restart the background service (apply config changes)',
+        '  stop        Stop the background service (finishes the in-flight job first)',
+        '  restart     Restart the service — waits for in-flight jobs ([--force] [--timeout <s>])',
         '  update      Refresh the service to this CLI’s version — waits for in-flight jobs to finish',
         '              (clhost update [--force] [--timeout <seconds>])',
         '  setup       install + add-agent in one flow',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claw-link/gateway-host",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "ClawLink Host Gateway — a secure, outbound-only worker that bridges a local agent CLI (OpenClaw, Hermes, Claude, Codex, Cursor) to your ClawLink agents. No inbound ports; authenticated per-agent by a Host Token.",
   "homepage": "https://claw-link.co",
   "bin": {

package/scripts/install.js

@@ -190,7 +190,7 @@ async function addAgentCmd() {
   rl.close();
   if (agent) {
     saveAgent(cfg, agent);
-    const restarted = serviceControl('restart');
+    const { restarted } = await gracefulServiceRestartCLI();
     console.log(`\n  ✓ Added agent ${agent.agent_id} (${agent.runtime}).` +
       (restarted ? ' Service restarted.' : ' Run `clhost restart` (or start) to apply.') + '\n');
   }
@@ -212,7 +212,7 @@ async function removeAgentCmd() {
   cfg.agents = cfg.agents.filter((a) => !(a.agent_id && (a.agent_id === target || a.agent_id.startsWith(target))));
   if (cfg.agents.length === before) { console.log(`  No agent matched '${target}'.`); return; }
   config.save(cfg);
-  const restarted = serviceControl('restart');
+  const { restarted } = await gracefulServiceRestartCLI();
   console.log(`  ✓ Removed agent '${target}'.` + (restarted ? ' Service restarted.' : ' Run `clhost restart` to apply.'));
 }
 
@@ -269,7 +269,8 @@ async function retokenCmd() {
       agent.runtime = resp.runtime;
     }
     config.save(cfg);
-    const restarted = serviceControl('restart');
+    rl.close(); // release stdin before the (possibly long) graceful drain so Ctrl-C is handled by our cleanup
+    const { restarted } = await gracefulServiceRestartCLI();
     console.log(`\n  ✓ Updated token for ${agent.agent_id} (…${token.slice(-4)}).` +
       (restarted ? ' Service restarted.' : ' Run `clhost restart` to apply.') + '\n');
   } finally { rl.close(); }
@@ -302,7 +303,15 @@ function serviceControl(action) {
   return false;
 }
 
-function serviceControlCmd(action) {
+async function serviceControlCmd(action) {
+  // `restart` is graceful — drain in-flight jobs first (override with --force / --timeout <sec>).
+  // `stop` stays prompt: its SIGTERM already lets the worker finish in-flight work (2nd signal forces).
+  if (action === 'restart') {
+    const { force, timeoutMs } = parseDrainArgs();
+    const { restarted } = await gracefulServiceRestartCLI({ force, timeoutMs });
+    console.log(restarted ? '  ✓ Service restarted.' : '  ⚠ Could not restart the service (is it installed? run `clhost install`).');
+    return;
+  }
   const ok = serviceControl(action);
   console.log(ok ? `  ✓ Service ${action}ed.` : `  ⚠ Could not ${action} the service (is it installed? run \`clhost install\`).`);
 }
@@ -538,17 +547,28 @@ async function drainToIdle({ timeoutMs = 15 * 60 * 1000, force = false, onWait }
   if (force) return { hadWorker: true, drained: false, forced: true };
 
   control.requestDrain();
-  const startedAt = Date.now();
-  let waited = false;
-  while (Date.now() - startedAt < timeoutMs) {
-    const s = control.liveStatus();
-    if (!s) return { hadWorker: true, drained: true, workerGone: true };  // worker exited → safe
-    // Safe to restart only once the worker has ACKED the drain (won't claim more) AND is idle.
-    if (s.drain && !s.busy) return { hadWorker: true, drained: true, waited };
-    if (s.busy && typeof onWait === 'function') { onWait(s); waited = true; }
-    await sleep(1500);
+  // If the operator Ctrl-C's (or the CLI is killed) mid-wait, clear the flag so the still-running
+  // worker resumes claiming instead of sitting drained forever. Without this, an aborted update/
+  // restart would silently wedge the worker.
+  const onInt = () => { try { control.clearDrain(); } catch { /* ignore */ } process.exit(130); };
+  process.on('SIGINT', onInt);
+  process.on('SIGTERM', onInt);
+  try {
+    const startedAt = Date.now();
+    let waited = false;
+    while (Date.now() - startedAt < timeoutMs) {
+      const s = control.liveStatus();
+      if (!s) return { hadWorker: true, drained: true, workerGone: true };  // worker exited → safe
+      // Safe to restart only once the worker has ACKED the drain (won't claim more) AND is idle.
+      if (s.drain && !s.busy) return { hadWorker: true, drained: true, waited };
+      if (s.busy && typeof onWait === 'function') { onWait(s); waited = true; }
+      await sleep(1500);
+    }
+    return { hadWorker: true, drained: false, timedOut: true };
+  } finally {
+    process.off('SIGINT', onInt);
+    process.off('SIGTERM', onInt);
   }
-  return { hadWorker: true, drained: false, timedOut: true };
 }
 
 // Drain the running worker to idle (unless forced), then stage the new code + restart the service.
@@ -561,10 +581,31 @@ async function gracefulRestart(opts = {}) {
   return { ...drain, restarted };
 }
 
-// `update` — refresh the background service to the version of THIS CLI. GRACEFUL: it waits for any
-// in-flight job to finish before restarting (override with `--force`, cap the wait with
-// `--timeout <seconds>`). To update the CLI itself: npm i -g @claw-link/gateway-host@latest.
-async function update() {
+// Config-change restart (add/remove/retoken agent, `clhost restart`): drain in-flight jobs first,
+// then a plain restart. Unlike gracefulRestart it does NOT re-stage code — the version is unchanged.
+async function gracefulServiceRestart(opts = {}) {
+  const drain = await drainToIdle(opts);
+  const restarted = serviceControl('restart');
+  if (!restarted) control.clearDrain();
+  return { ...drain, restarted };
+}
+
+// Console wrapper around gracefulServiceRestart: prints a one-time "waiting" notice + a live progress
+// line while a job finishes, so config commands never silently hang. Returns the restart result.
+async function gracefulServiceRestartCLI(opts = {}) {
+  const live = control.liveStatus();
+  const willWait = live && live.busy && !opts.force;
+  if (willWait) console.log('  ⏳ An agent is mid-job — restarting once it finishes (Ctrl-C to cancel; it stays on the current version)…');
+  const r = await gracefulServiceRestart({
+    ...opts,
+    onWait: (s) => process.stdout.write(`\r     … still working: ${s.activeJobs} job(s) in flight      `),
+  });
+  if (willWait) process.stdout.write('\n');
+  return r;
+}
+
+// Shared `--force` / `--timeout <seconds>` parser for update() and the restart command.
+function parseDrainArgs() {
   const args = process.argv.slice(3);
   const force = args.includes('--force') || args.includes('-f');
   const ti = args.findIndex((a) => a === '--timeout' || a === '-t');
@@ -574,6 +615,14 @@ async function update() {
     if (Number.isFinite(secs) && secs > 0) timeoutMs = secs * 1000;
     else console.log(`  ⚠ Ignoring invalid --timeout '${args[ti + 1]}' (expected seconds) — using the default.`);
   }
+  return { force, timeoutMs };
+}
+
+// `update` — refresh the background service to the version of THIS CLI. GRACEFUL: it waits for any
+// in-flight job to finish before restarting (override with `--force`, cap the wait with
+// `--timeout <seconds>`). To update the CLI itself: npm i -g @claw-link/gateway-host@latest.
+async function update() {
+  const { force, timeoutMs } = parseDrainArgs();
 
   console.log(`  Refreshing the background service to v${VERSION}…`);
   const live = control.liveStatus();

package/src/worker.js

@@ -27,6 +27,8 @@ const TRANSPORT_MIN_BYTES = Number(process.env.CLAWHOST_TRANSPORT_MIN) || 1024;
 // forces immediate exit). The graceful-update path pre-drains to idle, so a restart's signal
 // finds the worker idle and exits at once; this only bounds a direct stop/restart/Ctrl-C.
 const SHUTDOWN_DRAIN_MS = Number(process.env.CLAWHOST_SHUTDOWN_DRAIN_MS) || JOB_MAX_MS;
+// Ceiling for the exponential backoff after consecutive claim() errors (transient Supabase 5xx).
+const CLAIM_BACKOFF_CAP_MS = Number(process.env.CLAWHOST_CLAIM_BACKOFF_CAP_MS) || 30 * 1000;
 
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 let stopping = false;
@@ -156,6 +158,7 @@ async function runAgentLoop(agentCfg, cfg, p2p) {
 
   let inFlight = 0;
   const starts = []; // job start timestamps for the rolling rate-limit window
+  let claimFails = 0; // consecutive claim() errors → exponential backoff w/ jitter (transient 5xx)
 
   while (!stopping) {
     const now = Date.now();
@@ -164,12 +167,13 @@ async function runAgentLoop(agentCfg, cfg, p2p) {
     // Draining (graceful update/shutdown): keep finishing in-flight jobs, but don't claim new ones.
     const draining = stopping || drainFlag;
     const canRun = !draining && inFlight < agentCfg.concurrency && starts.length < agentCfg.rate_limit_per_min;
+    let claimErrored = false;
     if (canRun) {
       let job = null;
       claimsInFlight++; // "busy" for the whole claim round-trip — closes the mid-claim drain race
       try {
-        try { const r = await bridge.claim(); job = r && r.job; }
-        catch (e) { logger.warn(`claim failed (${agentCfg.agent_id}): ${e.message}`); }
+        try { const r = await bridge.claim(); job = r && r.job; claimFails = 0; } // success (job or empty) resets backoff
+        catch (e) { claimErrored = true; claimFails++; logger.warn(`claim failed (${agentCfg.agent_id}) [x${claimFails}]: ${e.message}`); }
         if (job) {
           inFlight++; starts.push(Date.now()); activeJobIds.add(job.id);
           // Watchdog: guarantees the slot is reclaimed and the job is failed back even
@@ -191,7 +195,15 @@ async function runAgentLoop(agentCfg, cfg, p2p) {
       }
       if (job) continue; // filled a slot — try to fill remaining concurrency immediately
     }
-    await sleep(cfg.poll_interval_ms || 1500);
+    // Poll interval — but after repeated claim errors (a Supabase blip), back off exponentially with
+    // full jitter (capped) so N agents don't hammer the bridge in lockstep. Resets on the next success.
+    let waitMs = cfg.poll_interval_ms || 1500;
+    if (claimErrored && claimFails > 1) {
+      const base = cfg.poll_interval_ms || 1500;
+      const ceil = Math.min(base * 2 ** (claimFails - 1), CLAIM_BACKOFF_CAP_MS);
+      waitMs = base + Math.floor(Math.random() * Math.max(0, ceil - base));
+    }
+    await sleep(waitMs);
   }
 
   clearInterval(hb);