@claw-link/gateway-host 0.2.10 → 0.2.12

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.10",
+  "version": "0.2.12",
   "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

@@ -22,6 +22,29 @@ function ask(rl, q, def) {
 }
 function execSafe(cmd) { try { return execSync(cmd, { stdio: ['ignore', 'pipe', 'ignore'] }).toString(); } catch { return null; } }
 
+// `npx` runs the package from a cache and NEVER puts the `clhost` bin on PATH — only a
+// global install does. So during setup we make `clhost` available (best-effort, non-fatal):
+// probe PATH, and if it's missing, do a quiet global install of the same version.
+function clhostOnPath() {
+  const probe = process.platform === 'win32' ? 'where clhost' : 'command -v clhost';
+  return execSafe(probe) != null;
+}
+function ensureGlobalCli() {
+  if (clhostOnPath()) return true;
+  try { execSync(`npm install -g @claw-link/gateway-host@${VERSION}`, { stdio: 'ignore', timeout: 120000 }); }
+  catch { /* no permission / offline — reportCli() prints the manual fallback */ }
+  return clhostOnPath();
+}
+function reportCli() {
+  if (ensureGlobalCli()) {
+    console.log('  ✓ The `clhost` command is ready — try:  clhost status');
+  } else {
+    console.log('  ℹ To get the short `clhost` command, install it once (you may need sudo):');
+    console.log('       npm i -g @claw-link/gateway-host');
+    console.log('     Until then, run commands as:  npx @claw-link/gateway-host <command>');
+  }
+}
+
 // The bridge URL is baked in (config.DEFAULT_BRIDGE_URL / CLAWLINK_BRIDGE_URL env)
 // — operators never type it. We just ensure it's populated.
 function ensureBridgeUrl(cfg) {
@@ -110,6 +133,7 @@ async function run() {
     console.log(installed
       ? '  ✓ Service refreshed to the latest version.'
       : '  ⚠ Could not refresh the service automatically — run:  clhost restart');
+    reportCli();
     console.log('\n  Commands:  clhost status · clhost agents · clhost add-agent · clhost transport-test\n');
     return;
   }
@@ -133,6 +157,7 @@ async function run() {
   console.log(installed
     ? '  ✓ Installed + started the background service.'
     : '  ⚠ Could not install a background service automatically.\n    Run it yourself with:  clhost run');
+  reportCli();
   console.log('\n  Check status in ClawLink → Agents → Host Gateway (connection badge).\n');
 }
 
@@ -143,7 +168,8 @@ async function installOnly() {
   config.save(cfg);
   const installed = installService();
   console.log(installed ? '  ✓ Service installed.' : '  ⚠ Could not install the service automatically.');
-  console.log('  Next: npx @claw-link/gateway-host add-agent\n');
+  reportCli();
+  console.log('  Next: clhost add-agent  (or npx @claw-link/gateway-host add-agent)\n');
 }
 
 // `add-agent` — add one agent by token, then restart the service to pick it up.
@@ -424,7 +450,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,
 };