@claw-link/gateway-host 0.3.7 → 0.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claw-link/gateway-host",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "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

@@ -139,9 +139,9 @@ async function run() {
       onWait: (s) => process.stdout.write(`\r     … still working: ${s.activeJobs} job(s) in flight      `),
     });
     if (live && live.busy) process.stdout.write('\n');
-    console.log(r.restarted
-      ? (r.hadWorker && !r.timedOut ? '  ✓ Finished in-flight work, then refreshed to the latest version.' : '  ✓ Service refreshed to the latest version.')
-      : '  ⚠ Could not refresh the service automatically — run:  clhost restart');
+    if (!r.restarted) console.log('  ⚠ Could not refresh the service automatically — run:  clhost restart');
+    else if (r.confirmed) console.log(`  ✓ Refreshed — now running v${r.version} (pid ${r.pid}).`);
+    else console.log(`  ⚠ Restart triggered but the new worker hasn't come up on v${VERSION} yet — check \`clhost status\` in a few seconds.`);
     reportCli();
     console.log('\n  Commands:  clhost status · clhost agents · clhost add-agent · clhost transport-test\n');
     return;
@@ -190,9 +190,10 @@ async function addAgentCmd() {
   rl.close();
   if (agent) {
     saveAgent(cfg, agent);
-    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');
+    const r = await gracefulServiceRestartCLI();
+    const note = !r.restarted ? ' Run `clhost restart` (or start) to apply.'
+      : r.confirmed ? ' Service restarted.' : ' Restarting — check `clhost status`.';
+    console.log(`\n  ✓ Added agent ${agent.agent_id} (${agent.runtime}).` + note + '\n');
   }
 }
 
@@ -212,8 +213,10 @@ 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 } = await gracefulServiceRestartCLI();
-  console.log(`  ✓ Removed agent '${target}'.` + (restarted ? ' Service restarted.' : ' Run `clhost restart` to apply.'));
+  const r = await gracefulServiceRestartCLI();
+  const note = !r.restarted ? ' Run `clhost restart` to apply.'
+    : r.confirmed ? ' Service restarted.' : ' Restarting — check `clhost status`.';
+  console.log(`  ✓ Removed agent '${target}'.` + note);
 }
 
 function printAgents(cfg) {
@@ -270,9 +273,10 @@ async function retokenCmd() {
     }
     config.save(cfg);
     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');
+    const r = await gracefulServiceRestartCLI();
+    const note = !r.restarted ? ' Run `clhost restart` to apply.'
+      : r.confirmed ? ' Service restarted.' : ' Restarting — check `clhost status`.';
+    console.log(`\n  ✓ Updated token for ${agent.agent_id} (…${token.slice(-4)}).` + note + '\n');
   } finally { rl.close(); }
 }
 
@@ -297,7 +301,17 @@ function serviceControl(action) {
     if (platform === 'win32') {
       if (action === 'stop')    return execSafe('schtasks /End /TN ClawLinkHost') !== null;
       if (action === 'start')   return execSafe('schtasks /Run /TN ClawLinkHost') !== null;
-      if (action === 'restart') { execSafe('schtasks /End /TN ClawLinkHost'); return execSafe('schtasks /Run /TN ClawLinkHost') !== null; }
+      if (action === 'restart') {
+        execSafe('schtasks /End /TN ClawLinkHost');
+        // /End is async, and the task is MultipleInstancesPolicy=IgnoreNew — so an immediate /Run can be
+        // SILENTLY DROPPED while the old instance is still stopping (the Windows analogue of the macOS
+        // bootout→bootstrap race). Give it a brief, LANGUAGE-NEUTRAL pause to stop before /Run: `ping -n
+        // 4 127.0.0.1` ≈ 3s (parsing schtasks' status would depend on the localized word "Running"; and
+        // `timeout` needs an interactive console). If /Run still doesn't take, restartAndConfirm's
+        // confirm-then-reinstall fallback recovers.
+        execSafe('ping -n 4 127.0.0.1');
+        return execSafe('schtasks /Run /TN ClawLinkHost') !== null;
+      }
     }
   } catch { /* fall through */ }
   return false;
@@ -308,8 +322,10 @@ async function serviceControlCmd(action) {
   // `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`).');
+    const r = await gracefulServiceRestartCLI({ force, timeoutMs });
+    if (!r.restarted) console.log('  ⚠ Could not restart the service (is it installed? run `clhost install`).');
+    else if (r.confirmed) console.log(`  ✓ Service restarted — running v${r.version} (pid ${r.pid}).`);
+    else console.log('  ⚠ Restart triggered but the worker hasn’t reported yet — check `clhost status`.');
     return;
   }
   const ok = serviceControl(action);
@@ -547,47 +563,90 @@ async function drainToIdle({ timeoutMs = 15 * 60 * 1000, force = false, onWait }
   if (force) return { hadWorker: true, drained: false, forced: true };
 
   control.requestDrain();
-  // 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.
+  // NOTE: the Ctrl-C cleanup that clears the drain flag on abort lives in withDrainGuard(), which
+  // wraps this call AND the restart — so there's no window (between drain finishing and the restart)
+  // where an interrupt could leave the worker drained. Don't install a handler here.
+  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 };
+}
+
+// Run an async drain+restart sequence under a Ctrl-C guard: if the operator interrupts at ANY point
+// (during the drain wait OR the restart), clear the drain flag FIRST so the still-running worker
+// resumes claiming — never left wedged — then exit. Spanning the whole sequence closes the gap that
+// a per-drainToIdle handler would leave open between draining and restarting.
+async function withDrainGuard(fn) {
   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);
+  try { return await fn(); }
+  finally { process.off('SIGINT', onInt); process.off('SIGTERM', onInt); }
+}
+
+// After triggering a restart, wait until the NEW worker actually publishes status (a different pid
+// than before and — if given — the expected version), so a caller never reports success while the old
+// process is still winding down or a launchd unload/reload is mid-flight. Best-effort: confirmed=false
+// on timeout. This is what makes `clhost update`'s "runs vX" honest instead of premature.
+async function waitForWorkerUp(prevPid, wantVersion, timeoutMs = 25000) {
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < timeoutMs) {
+    await sleep(1000);
+    const s = control.liveStatus();
+    if (s && s.pid !== prevPid && (!wantVersion || String(s.version) === String(wantVersion))) {
+      return { confirmed: true, version: s.version, pid: s.pid };
     }
-    return { hadWorker: true, drained: false, timedOut: true };
-  } finally {
-    process.off('SIGINT', onInt);
-    process.off('SIGTERM', onInt);
   }
+  const s = control.liveStatus();
+  return { confirmed: false, version: s && s.version, pid: s && s.pid };
 }
 
-// Drain the running worker to idle (unless forced), then stage the new code + restart the service.
-// The fresh worker clears the drain flag on boot; if the restart fails we clear it here so the old
-// worker resumes claiming instead of sitting permanently drained.
+// Restart the service and CONFIRM the new worker came up. Prefer an IN-PLACE restart
+// (kickstart -k / systemctl restart / schtasks) — it never unloads the job (no "Service: stopped"
+// window like bootout→bootstrap) and relaunches from the stable app dir. Only if that fails to bring
+// a worker up (service not loaded yet, or a stale Node path in the plist after an nvm/Node upgrade)
+// fall back to a full (re)install, which rewrites the plist. Clears the drain flag unless a fresh
+// worker is confirmed (which clears it on boot) so nothing is ever left drained.
+async function restartAndConfirm({ stageCode = false, wantVersion, onRestart } = {}) {
+  if (stageCode) syncAppDir(); // copy the new code into the stable app dir the service runs from
+  const prevPid = (control.liveStatus() || {}).pid;
+  let notified = false;
+  const notify = () => { if (!notified && typeof onRestart === 'function') { notified = true; onRestart(); } };
+  let restarted = serviceControl('restart');
+  if (restarted) notify();
+  let up = restarted ? await waitForWorkerUp(prevPid, wantVersion) : { confirmed: false };
+  if (!up.confirmed) {
+    const reinstalled = installService(); // rewrites plist/unit (handles a moved Node) + reload
+    if (reinstalled) { restarted = true; notify(); up = await waitForWorkerUp(prevPid, wantVersion); }
+  }
+  if (!up.confirmed) control.clearDrain();
+  return { restarted, ...up };
+}
+
+// `update` path — drain, then stage new code + restart, confirming the new version is actually live.
 async function gracefulRestart(opts = {}) {
-  const drain = await drainToIdle(opts);
-  const restarted = installService();  // syncAppDir (stage new code) + bootstrap/restart the service
-  if (!restarted) control.clearDrain();
-  return { ...drain, restarted };
+  return withDrainGuard(async () => {
+    const drain = await drainToIdle(opts);
+    const r = await restartAndConfirm({ stageCode: true, wantVersion: VERSION, onRestart: opts.onRestart });
+    return { ...drain, ...r };
+  });
 }
 
-// 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.
+// Config-change restart (add/remove/retoken agent, `clhost restart`): drain first, then restart in
+// place (no code re-stage — same version), confirming the worker actually bounced (new pid).
 async function gracefulServiceRestart(opts = {}) {
-  const drain = await drainToIdle(opts);
-  const restarted = serviceControl('restart');
-  if (!restarted) control.clearDrain();
-  return { ...drain, restarted };
+  return withDrainGuard(async () => {
+    const drain = await drainToIdle(opts);
+    const r = await restartAndConfirm({ stageCode: false, onRestart: opts.onRestart });
+    return { ...drain, ...r };
+  });
 }
 
 // Console wrapper around gracefulServiceRestart: prints a one-time "waiting" notice + a live progress
@@ -637,10 +696,15 @@ async function update() {
   if (live && live.busy && !force) process.stdout.write('\n');
 
   if (!r.restarted) { console.log('  ⚠ Could not refresh automatically — run:  clhost restart'); return; }
-  if (r.forced) console.log(`  ✓ Restarted now (--force). Service runs v${VERSION} from ${appDir()}.`);
-  else if (r.timedOut) console.log(`  ⚠ A job was still running after the wait — restarted anyway (it may have been interrupted). Service runs v${VERSION}.`);
-  else if (r.hadWorker) console.log(`  ✓ Finished in-flight work, then refreshed. Service runs v${VERSION} from ${appDir()}.`);
-  else console.log(`  ✓ Service now runs v${VERSION} from ${appDir()}.`);
+  if (r.confirmed) {
+    // The success line now reflects what the new worker ACTUALLY reports (pid + version), not a guess.
+    const drained = r.hadWorker && !r.forced && !r.timedOut;
+    console.log(`  ✓ ${drained ? 'Finished in-flight work, then restarted' : 'Restarted'} — now running v${r.version} (pid ${r.pid}).`);
+    if (r.timedOut) console.log('  ⚠ (A job was still running after the wait — it may have been interrupted.)');
+  } else {
+    console.log(`  ⚠ Restart triggered but the new worker hasn't come up on v${VERSION} yet` +
+      (r.version ? ` (still seeing v${r.version})` : '') + ` — check \`clhost status\` in a few seconds (\`clhost logs\` if it doesn't appear).`);
+  }
   console.log('  (To upgrade the `clhost` CLI you type:  npm i -g @claw-link/gateway-host@latest)\n');
 }
 

package/src/worker.js

@@ -221,18 +221,14 @@ async function startWorker() {
 
   logger.info(`ClawLink Host Gateway v${VERSION} — ${agents.length} agent(s): ${agents.map((a) => `${(a.agent_id || 'pending').slice(0, 8)}…(${a.runtime || 'resolving'})`).join(', ')}`);
 
-  // H2H data plane: bring up the native QUIC transport once per host (shared by all agents). If no
-  // prebuilt native core exists for this platform, every transfer routes through the central relay.
   const p2p = new P2P(logger);
-  const p2pAddr = await p2p.start();
-  logger.info(p2pAddr
-    ? `H2H transport: native P2P active (${p2pAddr})`
-    : 'H2H transport: central relay (no native core for this platform — install acceleration later)');
 
   // Advertise liveness + in-flight count so `clhost update`/`restart` can wait for this host to go
   // idle before restarting, and pick up the CLI's drain flag (stop claiming, finish current work).
-  // Clear any stale flag first; and only ever honor a flag written AFTER this boot, so a leftover
-  // flag from a crashed update (or a clearDrain that failed) can never wedge a fresh worker.
+  // Do this BEFORE the (possibly slow) P2P init, so a restart is CONFIRMED fast — waitForWorkerUp sees
+  // the new pid/version within ~1s even while iroh is still binding. Clear any stale flag first; and
+  // only ever honor a flag written AFTER this boot, so a leftover flag from a crashed update (or a
+  // clearDrain that failed) can never wedge a fresh worker. (pushStatus never touches p2p.)
   control.clearDrain();      // drop any stale flag left by a previous life FIRST…
   const bootAt = Date.now(); // …then anchor "now": only a drain requested after this point is honored.
   const pushStatus = () => {
@@ -248,6 +244,13 @@ async function startWorker() {
   const statusTimer = setInterval(pushStatus, 2000);
   statusTimer.unref();
 
+  // H2H data plane: bring up the native QUIC transport once per host (shared by all agents). If no
+  // prebuilt native core exists for this platform, every transfer routes through the central relay.
+  const p2pAddr = await p2p.start();
+  logger.info(p2pAddr
+    ? `H2H transport: native P2P active (${p2pAddr})`
+    : 'H2H transport: central relay (no native core for this platform — install acceleration later)');
+
   // Graceful shutdown: stop claiming, let in-flight jobs finish (keeping P2P alive for them), then
   // exit. A second signal forces an immediate exit; SHUTDOWN_DRAIN_MS bounds the wait.
   let stopSignals = 0;