@claw-link/gateway-host 0.2.9 → 0.2.11

package/bin/cli.js

@@ -48,6 +48,24 @@ async function main() {
     case 'status':
       return require('../scripts/install').status();
 
+    case 'version':
+    case '--version':
+    case '-v':
+      return require('../scripts/install').versionCmd();
+
+    case 'doctor':
+    case 'diagnose':
+    case 'check':
+      return require('../scripts/install').doctor();
+
+    case 'logs':
+    case 'log':
+      return require('../scripts/install').logs();
+
+    case 'update':
+    case 'upgrade':
+      return require('../scripts/install').update();
+
     case 'transport-test':
     case 'transport':
       return require('../scripts/transport-test').run();
@@ -76,10 +94,14 @@ async function main() {
         '  retoken     Re-enter a new Host Token for an existing agent (clhost retoken <id>)',
         '  agents      List mapped agents',
         '  status      Show bridge, service state, and mapped agents',
+        '  doctor      Diagnose config, runtime binaries, bridge + token/machine binding',
+        '  version     Show CLI version + the version the service is running',
+        '  logs        Tail the background service log (clhost logs [N])',
         '  transport-test  Verify content-addressed Capsule relay (host ⇄ central sync + integrity)',
         '  start       Start the background service',
         '  stop        Stop the background service',
         '  restart     Restart the background service (apply config changes)',
+        '  update      Refresh the background service to this CLI’s version',
         '  setup       install + add-agent in one flow',
         '  rotate      How to rotate a Host Token / move to a new machine',
         '  uninstall   Stop + remove the background service',

package/package.json

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

@@ -96,12 +96,27 @@ function saveAgent(cfg, agent) {
 
 // `setup` — install the service (if needed) + add one or more agents.
 async function run() {
-  console.log('\n  ClawLink Host Gateway — setup\n  ─────────────────────────────\n');
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   const cfg = config.load() || config.defaultConfig();
   ensureBridgeUrl(cfg);
   config.save(cfg);
 
+  // Backward-compat: a bare `npx @claw-link/gateway-host@latest` on an ALREADY-configured
+  // host is an UPDATE, not first-run setup — don't re-prompt for agents. Refresh the
+  // background service so the new version takes effect, and show status.
+  const existing = (cfg.agents || []).length;
+  if (existing > 0) {
+    console.log(`\n  ClawLink Host Gateway v${VERSION} — already set up (${existing} agent${existing > 1 ? 's' : ''}).`);
+    const installed = installService();
+    console.log(installed
+      ? '  ✓ Service refreshed to the latest version.'
+      : '  ⚠ Could not refresh the service automatically — run:  clhost restart');
+    console.log('\n  Commands:  clhost status · clhost agents · clhost add-agent · clhost transport-test\n');
+    return;
+  }
+
+  console.log('\n  ClawLink Host Gateway — setup\n  ─────────────────────────────\n');
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+
   let added = 0, more = true;
   while (more) {
     console.log('\n  Add an agent:');
@@ -258,11 +273,37 @@ function serviceControlCmd(action) {
 }
 
 function nodeBin() { return process.execPath; }
-function cliEntry() { return path.join(__dirname, '..', 'bin', 'cli.js'); }
+function pkgRoot() { return path.join(__dirname, '..'); }
+function appDir() { return path.join(config.HOME_DIR, 'app'); }
+
+// The background service must run from a STABLE path — not the version-pinned, GC-able npx
+// cache (`__dirname`), which is why republishing never changed the running version. Copy the
+// currently-running package into ~/.clawlink-host/app on every install/update so a newer
+// `npx @claw-link/gateway-host@latest` actually swaps the code the service runs.
+function syncAppDir() {
+  const src = pkgRoot();
+  const dest = appDir();
+  if (path.resolve(src) === path.resolve(dest)) return; // already running from the stable dir
+  try {
+    fs.mkdirSync(dest, { recursive: true });
+    fs.cpSync(src, dest, {
+      recursive: true,
+      filter: (s) => { const b = path.basename(s); return b !== 'node_modules' && b !== '.git'; },
+    });
+    try { fs.chmodSync(path.join(dest, 'bin', 'cli.js'), 0o755); } catch { /* best effort */ }
+  } catch { /* non-fatal — cliEntry() falls back to the current path */ }
+}
+
+function cliEntry() {
+  const stable = path.join(appDir(), 'bin', 'cli.js');
+  try { if (fs.existsSync(stable)) return stable; } catch { /* */ }
+  return path.join(pkgRoot(), 'bin', 'cli.js'); // fallback if the stable copy failed
+}
 
 function installService() {
   const platform = process.platform;
   try {
+    syncAppDir(); // refresh the stable app dir so the service runs the just-updated version
     if (platform === 'darwin') {
       const plistDir = path.join(os.homedir(), 'Library', 'LaunchAgents');
       fs.mkdirSync(plistDir, { recursive: true });
@@ -383,7 +424,76 @@ function status() {
   printAgents(cfg);
 }
 
+// `version` — what the CLI is vs what the background service actually runs (these can
+// differ: `npm i -g` updates the CLI; `npx ...@latest` / `clhost update` updates the service).
+function versionCmd() {
+  console.log(`@claw-link/gateway-host (clhost) v${VERSION}`);
+  console.log(`  CLI runs from: ${pkgRoot()}`);
+  let svcV = '(service not installed)';
+  try { const p = path.join(appDir(), 'package.json'); if (fs.existsSync(p)) svcV = 'v' + require(p).version; } catch { /* */ }
+  console.log(`  Service runs:  ${svcV}  ${serviceRunning() ? '● running' : '○ stopped'}  (${appDir()})`);
+  if (svcV !== '(service not installed)' && svcV !== 'v' + VERSION) {
+    console.log(`  ⚠ Service is on ${svcV} but this CLI is v${VERSION} — run \`clhost update\` to sync the service.`);
+  }
+}
+
+// `doctor` — one-shot health check covering every failure we’ve actually hit:
+// config present, service up, each agent’s runtime binary installed, and the bridge
+// reachable + token/machine-binding valid (via a live heartbeat).
+async function doctor() {
+  const mark = (b) => (b ? '✓' : '✗');
+  console.log('\n  ClawLink Host Gateway — doctor\n  ──────────────────────────────');
+  const cfg = config.load();
+  console.log(`  ${mark(!!cfg)} config        ${cfg ? config.CONFIG_PATH : 'missing — run: clhost setup'}`);
+  if (!cfg) return;
+  versionCmd();
+  console.log(`  ${mark(serviceRunning())} service       ${serviceRunning() ? 'running' : 'stopped — run: clhost start'}`);
+
+  const { which, RUNTIME_BINARIES } = require('../src/detect');
+  const { Bridge } = require('../src/bridge');
+  const agents = cfg.agents || [];
+  if (!agents.length) console.log('  ✗ agents        none mapped — run: clhost add-agent');
+  for (const a of agents) {
+    const id = String(a.agent_id || a.host_token || '????').slice(0, 8);
+    const bins = RUNTIME_BINARIES[a.runtime] || [];
+    const usesLocalGateway = a.runtime === 'openclaw' || !!a.local_gateway_url;
+    const binOk = usesLocalGateway || bins.length === 0 || bins.some((b) => which(b));
+    let beat = false, msg = '';
+    try {
+      const r = await new Bridge(cfg.bridge_url, a, cfg.instance_id).heartbeat();
+      beat = !!(r && r.ok !== false && !r.error);
+      if (!beat) msg = (r && r.error) ? String(r.error) : 'rejected';
+    } catch (e) { msg = e && e.message ? e.message : String(e); }
+    console.log(`  ${mark(binOk && beat)} agent ${id}  runtime=${a.runtime}`
+      + (binOk ? '' : `  ✗ binary not found (${bins.join('/')})`)
+      + (beat ? '  · bridge+token+binding OK' : `  ✗ bridge: ${msg}`));
+  }
+  console.log('\n  Next: `clhost transport-test` (verify the content-addressed relay)\n');
+}
+
+// `logs` — tail the background service log.
+function logs() {
+  const logPath = path.join(config.HOME_DIR, 'host.log');
+  if (!fs.existsSync(logPath)) { console.log(`  No log yet at ${logPath} (start the service first).`); return; }
+  const n = Number(process.argv[3]) || 60;
+  const lines = fs.readFileSync(logPath, 'utf8').split('\n');
+  console.log(lines.slice(-n).join('\n'));
+  console.log(`\n  ── last ${n} lines of ${logPath} ──`);
+}
+
+// `update` — refresh the background service to the version of THIS CLI (syncs the stable
+// app dir + restarts). To update the CLI itself: npm i -g @claw-link/gateway-host@latest.
+function update() {
+  console.log(`  Refreshing the background service to v${VERSION}…`);
+  const ok = installService();
+  console.log(ok
+    ? `  ✓ Service now runs v${VERSION} from ${appDir()}.`
+    : '  ⚠ Could not refresh automatically — run: clhost restart');
+  console.log('  (To upgrade the `clhost` CLI you type:  npm i -g @claw-link/gateway-host@latest)\n');
+}
+
 module.exports = {
   run, installOnly, addAgentCmd, removeAgentCmd, retokenCmd, listAgents, status,
   serviceControl, serviceControlCmd, installService, SERVICE_LABEL,
+  versionCmd, doctor, logs, update,
 };