@kmmao/happy-agent 0.3.1 → 0.3.2

package/dist/index.cjs

@@ -18,7 +18,7 @@ var path = require('path');
 var fs = require('fs');
 var os = require('os');
 
-var version = "0.3.1";
+var version = "0.3.2";
 
 function loadConfig() {
   const serverUrl = (process.env.HAPPY_SERVER_URL ?? "https://happyserve.xycloud.info").replace(/\/+$/, "");
@@ -1351,11 +1351,114 @@ class SessionClient extends node_events.EventEmitter {
   }
 }
 
+const NOT_INSTALLED = Object.freeze({ status: "not-installed" });
+const DISCONNECTED = Object.freeze({ status: "disconnected" });
+const DETECT_TIMEOUT_MS = 3e3;
+async function detectTailscale() {
+  try {
+    const raw = await execTailscale(["status", "--json"]);
+    return parseTailscaleStatus(raw);
+  } catch (err) {
+    if (isNotFound(err)) {
+      logger.debug("[TAILSCALE] tailscale binary not found");
+      return NOT_INSTALLED;
+    }
+    logger.debug(`[TAILSCALE] detection failed: ${String(err)}`);
+    return DISCONNECTED;
+  }
+}
+async function detectTailscaleServe() {
+  try {
+    const raw = await execTailscale(["serve", "status", "--json"]);
+    return parseTailscaleServeStatus(raw);
+  } catch (err) {
+    logger.debug(`[TAILSCALE] serve detection failed: ${String(err)}`);
+    return [];
+  }
+}
+function execTailscale(args) {
+  return new Promise((resolve, reject) => {
+    child_process.execFile("tailscale", args, { timeout: DETECT_TIMEOUT_MS }, (err, stdout) => {
+      if (err) return reject(err);
+      resolve(stdout);
+    });
+  });
+}
+function parseTailscaleStatus(raw) {
+  let json;
+  try {
+    json = JSON.parse(raw);
+  } catch {
+    logger.debug("[TAILSCALE] failed to parse status JSON");
+    return DISCONNECTED;
+  }
+  const backendState = json.BackendState;
+  if (backendState && backendState !== "Running") {
+    logger.debug(`[TAILSCALE] backend state: ${backendState}`);
+    return DISCONNECTED;
+  }
+  const self = json.Self;
+  if (!self) {
+    logger.debug("[TAILSCALE] no Self node in status output");
+    return DISCONNECTED;
+  }
+  const ips = self.TailscaleIPs ?? [];
+  const ipv4 = ips.find((ip) => ip.includes("."));
+  const ipv6 = ips.find((ip) => ip.includes(":"));
+  const dnsName = self.DNSName;
+  const hostname = dnsName?.replace(/\.$/, "").split(".")[0];
+  const tailnetName = dnsName ? dnsName.replace(/\.$/, "").split(".").slice(1).join(".") : void 0;
+  const version = json.Version;
+  logger.debug(
+    `[TAILSCALE] detected: ipv4=${ipv4 ?? "none"}, hostname=${hostname ?? "none"}`
+  );
+  return {
+    status: "connected",
+    ipv4,
+    ipv6,
+    hostname,
+    tailnetName,
+    version
+  };
+}
+function parseTailscaleServeStatus(raw) {
+  let json;
+  try {
+    json = JSON.parse(raw);
+  } catch {
+    logger.debug("[TAILSCALE] failed to parse serve status JSON");
+    return [];
+  }
+  const web = json.Web ?? {};
+  const allowFunnel = json.AllowFunnel ?? {};
+  const entries = [];
+  for (const [hostPort, config] of Object.entries(web)) {
+    const colonIdx = hostPort.lastIndexOf(":");
+    if (colonIdx === -1) continue;
+    const hostname = hostPort.slice(0, colonIdx);
+    const port = parseInt(hostPort.slice(colonIdx + 1), 10);
+    if (!Number.isFinite(port)) continue;
+    const handlers = config.Handlers ?? {};
+    const rootHandler = handlers["/"];
+    const target = rootHandler?.Proxy ?? "unknown";
+    const funnel = allowFunnel[hostPort] === true;
+    entries.push({ port, protocol: "HTTPS", target, funnel, hostname });
+  }
+  logger.debug(`[TAILSCALE] detected ${entries.length} serve entries`);
+  return entries;
+}
+function isNotFound(err) {
+  return typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT";
+}
+
+const TAILSCALE_REFRESH_MS = 5 * 60 * 1e3;
 class MachineClient {
   machine;
   rpcHandlerManager;
   socket;
   keepAliveInterval = null;
+  tailscaleRefreshInterval = null;
+  lastTailscaleInfo = null;
   token;
   serverUrl;
   onEphemeral;
@@ -1393,12 +1496,21 @@ class MachineClient {
     this.socket.on("connect", () => {
       logger.debug("[MACHINE] Connected to server");
       this.rpcHandlerManager.onSocketConnect(this.socket);
+      this.updateDaemonState((state) => ({
+        ...state,
+        status: "running",
+        pid: process.pid,
+        startedAt: Date.now(),
+        tailscale: this.lastTailscaleInfo ?? state?.tailscale
+      }));
       this.startKeepAlive();
+      this.startTailscaleRefresh();
     });
     this.socket.on("disconnect", () => {
       logger.debug("[MACHINE] Disconnected from server");
       this.rpcHandlerManager.onSocketDisconnect();
       this.stopKeepAlive();
+      this.stopTailscaleRefresh();
     });
     this.socket.on(
       "rpc-request",
@@ -1512,9 +1624,14 @@ class MachineClient {
   // -----------------------------------------------------------------------
   // Lifecycle
   // -----------------------------------------------------------------------
+  /** Seed initial Tailscale info detected before connect. */
+  setTailscaleInfo(info) {
+    this.lastTailscaleInfo = info;
+  }
   shutdown() {
     logger.debug("[MACHINE] Shutting down");
     this.stopKeepAlive();
+    this.stopTailscaleRefresh();
     this.rpcHandlerManager.onSocketDisconnect();
     this.socket?.close();
   }
@@ -1536,6 +1653,35 @@ class MachineClient {
       this.keepAliveInterval = null;
     }
   }
+  startTailscaleRefresh() {
+    this.stopTailscaleRefresh();
+    this.tailscaleRefreshInterval = setInterval(async () => {
+      const info = await detectTailscale();
+      const serves = info.status === "connected" ? await detectTailscaleServe() : [];
+      const fullInfo = { ...info, serves };
+      if (tailscaleChanged(this.lastTailscaleInfo, fullInfo)) {
+        logger.debug(
+          `[MACHINE] Tailscale changed: ${this.lastTailscaleInfo?.status} \u2192 ${fullInfo.status}, serves: ${serves.length}`
+        );
+        this.lastTailscaleInfo = fullInfo;
+        this.updateDaemonState((state) => {
+          if (!state) return { status: "running", tailscale: fullInfo };
+          return { ...state, tailscale: fullInfo };
+        });
+      }
+    }, TAILSCALE_REFRESH_MS);
+    logger.debug("[MACHINE] Tailscale refresh started (5m interval)");
+  }
+  stopTailscaleRefresh() {
+    if (this.tailscaleRefreshInterval) {
+      clearInterval(this.tailscaleRefreshInterval);
+      this.tailscaleRefreshInterval = null;
+    }
+  }
+}
+function tailscaleChanged(prev, next) {
+  if (!prev) return true;
+  return prev.status !== next.status || prev.ipv4 !== next.ipv4 || prev.ipv6 !== next.ipv6 || prev.hostname !== next.hostname || JSON.stringify(prev.serves) !== JSON.stringify(next.serves);
 }
 
 function formatTime(ts) {

package/dist/index.d.cts

@@ -298,6 +298,29 @@ declare class SessionClient extends EventEmitter {
     private setupSocketListeners;
 }
 
+/**
+ * Tailscale detection utility for happy-agent.
+ *
+ * Adapted from happy-cli/src/utils/tailscale.ts — keep in sync.
+ */
+type TailscaleStatus = "connected" | "disconnected" | "not-installed";
+type TailscaleServeEntry = {
+    port: number;
+    protocol: string;
+    target: string;
+    funnel: boolean;
+    hostname: string;
+};
+type TailscaleInfo = {
+    status: TailscaleStatus;
+    ipv4?: string;
+    ipv6?: string;
+    hostname?: string;
+    tailnetName?: string;
+    version?: string;
+    serves?: TailscaleServeEntry[];
+};
+
 /**
  * Machine WebSocket client — trimmed from CLI's ApiMachineClient.
  *
@@ -331,6 +354,8 @@ declare class MachineClient {
     readonly rpcHandlerManager: RpcHandlerManager;
     private socket;
     private keepAliveInterval;
+    private tailscaleRefreshInterval;
+    private lastTailscaleInfo;
     private readonly token;
     private readonly serverUrl;
     private readonly onEphemeral?;
@@ -338,9 +363,13 @@ declare class MachineClient {
     connect(): void;
     updateMachineMetadata(handler: (metadata: MachineMetadata | null) => MachineMetadata): Promise<void>;
     updateDaemonState(handler: (state: DaemonState | null) => DaemonState): Promise<void>;
+    /** Seed initial Tailscale info detected before connect. */
+    setTailscaleInfo(info: TailscaleInfo): void;
     shutdown(): void;
     private startKeepAlive;
     private stopKeepAlive;
+    private startTailscaleRefresh;
+    private stopTailscaleRefresh;
 }
 
 export { MachineClient, RpcHandlerManager, SessionClient, authLogin, authLogout, authStatus, createRpcHandlerManager, createSession, deleteSession, fetchMessagesAfterSeq, getOrCreateMachine, getSessionMessages, listActiveSessions, listMachines, listSessions, loadConfig, readCredentials, requireCredentials, resolveSessionEncryption, sendMessagesBatch };

package/dist/index.d.mts

@@ -298,6 +298,29 @@ declare class SessionClient extends EventEmitter {
     private setupSocketListeners;
 }
 
+/**
+ * Tailscale detection utility for happy-agent.
+ *
+ * Adapted from happy-cli/src/utils/tailscale.ts — keep in sync.
+ */
+type TailscaleStatus = "connected" | "disconnected" | "not-installed";
+type TailscaleServeEntry = {
+    port: number;
+    protocol: string;
+    target: string;
+    funnel: boolean;
+    hostname: string;
+};
+type TailscaleInfo = {
+    status: TailscaleStatus;
+    ipv4?: string;
+    ipv6?: string;
+    hostname?: string;
+    tailnetName?: string;
+    version?: string;
+    serves?: TailscaleServeEntry[];
+};
+
 /**
  * Machine WebSocket client — trimmed from CLI's ApiMachineClient.
  *
@@ -331,6 +354,8 @@ declare class MachineClient {
     readonly rpcHandlerManager: RpcHandlerManager;
     private socket;
     private keepAliveInterval;
+    private tailscaleRefreshInterval;
+    private lastTailscaleInfo;
     private readonly token;
     private readonly serverUrl;
     private readonly onEphemeral?;
@@ -338,9 +363,13 @@ declare class MachineClient {
     connect(): void;
     updateMachineMetadata(handler: (metadata: MachineMetadata | null) => MachineMetadata): Promise<void>;
     updateDaemonState(handler: (state: DaemonState | null) => DaemonState): Promise<void>;
+    /** Seed initial Tailscale info detected before connect. */
+    setTailscaleInfo(info: TailscaleInfo): void;
     shutdown(): void;
     private startKeepAlive;
     private stopKeepAlive;
+    private startTailscaleRefresh;
+    private stopTailscaleRefresh;
 }
 
 export { MachineClient, RpcHandlerManager, SessionClient, authLogin, authLogout, authStatus, createRpcHandlerManager, createSession, deleteSession, fetchMessagesAfterSeq, getOrCreateMachine, getSessionMessages, listActiveSessions, listMachines, listSessions, loadConfig, readCredentials, requireCredentials, resolveSessionEncryption, sendMessagesBatch };

package/dist/index.mjs

@@ -8,7 +8,7 @@ import axios, { AxiosError } from 'axios';
 import qrcode from 'qrcode-terminal';
 import { EventEmitter } from 'node:events';
 import { io } from 'socket.io-client';
-import { exec } from 'child_process';
+import { exec, execFile } from 'child_process';
 import { promisify } from 'util';
 import { readFile, mkdir, writeFile, readdir, stat } from 'fs/promises';
 import { createHash as createHash$1 } from 'crypto';
@@ -16,7 +16,7 @@ import { join as join$1, resolve } from 'path';
 import { realpathSync } from 'fs';
 import { tmpdir } from 'os';
 
-var version = "0.3.1";
+var version = "0.3.2";
 
 function loadConfig() {
   const serverUrl = (process.env.HAPPY_SERVER_URL ?? "https://happyserve.xycloud.info").replace(/\/+$/, "");
@@ -1349,11 +1349,114 @@ class SessionClient extends EventEmitter {
   }
 }
 
+const NOT_INSTALLED = Object.freeze({ status: "not-installed" });
+const DISCONNECTED = Object.freeze({ status: "disconnected" });
+const DETECT_TIMEOUT_MS = 3e3;
+async function detectTailscale() {
+  try {
+    const raw = await execTailscale(["status", "--json"]);
+    return parseTailscaleStatus(raw);
+  } catch (err) {
+    if (isNotFound(err)) {
+      logger.debug("[TAILSCALE] tailscale binary not found");
+      return NOT_INSTALLED;
+    }
+    logger.debug(`[TAILSCALE] detection failed: ${String(err)}`);
+    return DISCONNECTED;
+  }
+}
+async function detectTailscaleServe() {
+  try {
+    const raw = await execTailscale(["serve", "status", "--json"]);
+    return parseTailscaleServeStatus(raw);
+  } catch (err) {
+    logger.debug(`[TAILSCALE] serve detection failed: ${String(err)}`);
+    return [];
+  }
+}
+function execTailscale(args) {
+  return new Promise((resolve, reject) => {
+    execFile("tailscale", args, { timeout: DETECT_TIMEOUT_MS }, (err, stdout) => {
+      if (err) return reject(err);
+      resolve(stdout);
+    });
+  });
+}
+function parseTailscaleStatus(raw) {
+  let json;
+  try {
+    json = JSON.parse(raw);
+  } catch {
+    logger.debug("[TAILSCALE] failed to parse status JSON");
+    return DISCONNECTED;
+  }
+  const backendState = json.BackendState;
+  if (backendState && backendState !== "Running") {
+    logger.debug(`[TAILSCALE] backend state: ${backendState}`);
+    return DISCONNECTED;
+  }
+  const self = json.Self;
+  if (!self) {
+    logger.debug("[TAILSCALE] no Self node in status output");
+    return DISCONNECTED;
+  }
+  const ips = self.TailscaleIPs ?? [];
+  const ipv4 = ips.find((ip) => ip.includes("."));
+  const ipv6 = ips.find((ip) => ip.includes(":"));
+  const dnsName = self.DNSName;
+  const hostname = dnsName?.replace(/\.$/, "").split(".")[0];
+  const tailnetName = dnsName ? dnsName.replace(/\.$/, "").split(".").slice(1).join(".") : void 0;
+  const version = json.Version;
+  logger.debug(
+    `[TAILSCALE] detected: ipv4=${ipv4 ?? "none"}, hostname=${hostname ?? "none"}`
+  );
+  return {
+    status: "connected",
+    ipv4,
+    ipv6,
+    hostname,
+    tailnetName,
+    version
+  };
+}
+function parseTailscaleServeStatus(raw) {
+  let json;
+  try {
+    json = JSON.parse(raw);
+  } catch {
+    logger.debug("[TAILSCALE] failed to parse serve status JSON");
+    return [];
+  }
+  const web = json.Web ?? {};
+  const allowFunnel = json.AllowFunnel ?? {};
+  const entries = [];
+  for (const [hostPort, config] of Object.entries(web)) {
+    const colonIdx = hostPort.lastIndexOf(":");
+    if (colonIdx === -1) continue;
+    const hostname = hostPort.slice(0, colonIdx);
+    const port = parseInt(hostPort.slice(colonIdx + 1), 10);
+    if (!Number.isFinite(port)) continue;
+    const handlers = config.Handlers ?? {};
+    const rootHandler = handlers["/"];
+    const target = rootHandler?.Proxy ?? "unknown";
+    const funnel = allowFunnel[hostPort] === true;
+    entries.push({ port, protocol: "HTTPS", target, funnel, hostname });
+  }
+  logger.debug(`[TAILSCALE] detected ${entries.length} serve entries`);
+  return entries;
+}
+function isNotFound(err) {
+  return typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT";
+}
+
+const TAILSCALE_REFRESH_MS = 5 * 60 * 1e3;
 class MachineClient {
   machine;
   rpcHandlerManager;
   socket;
   keepAliveInterval = null;
+  tailscaleRefreshInterval = null;
+  lastTailscaleInfo = null;
   token;
   serverUrl;
   onEphemeral;
@@ -1391,12 +1494,21 @@ class MachineClient {
     this.socket.on("connect", () => {
       logger.debug("[MACHINE] Connected to server");
       this.rpcHandlerManager.onSocketConnect(this.socket);
+      this.updateDaemonState((state) => ({
+        ...state,
+        status: "running",
+        pid: process.pid,
+        startedAt: Date.now(),
+        tailscale: this.lastTailscaleInfo ?? state?.tailscale
+      }));
       this.startKeepAlive();
+      this.startTailscaleRefresh();
     });
     this.socket.on("disconnect", () => {
       logger.debug("[MACHINE] Disconnected from server");
       this.rpcHandlerManager.onSocketDisconnect();
       this.stopKeepAlive();
+      this.stopTailscaleRefresh();
     });
     this.socket.on(
       "rpc-request",
@@ -1510,9 +1622,14 @@ class MachineClient {
   // -----------------------------------------------------------------------
   // Lifecycle
   // -----------------------------------------------------------------------
+  /** Seed initial Tailscale info detected before connect. */
+  setTailscaleInfo(info) {
+    this.lastTailscaleInfo = info;
+  }
   shutdown() {
     logger.debug("[MACHINE] Shutting down");
     this.stopKeepAlive();
+    this.stopTailscaleRefresh();
     this.rpcHandlerManager.onSocketDisconnect();
     this.socket?.close();
   }
@@ -1534,6 +1651,35 @@ class MachineClient {
       this.keepAliveInterval = null;
     }
   }
+  startTailscaleRefresh() {
+    this.stopTailscaleRefresh();
+    this.tailscaleRefreshInterval = setInterval(async () => {
+      const info = await detectTailscale();
+      const serves = info.status === "connected" ? await detectTailscaleServe() : [];
+      const fullInfo = { ...info, serves };
+      if (tailscaleChanged(this.lastTailscaleInfo, fullInfo)) {
+        logger.debug(
+          `[MACHINE] Tailscale changed: ${this.lastTailscaleInfo?.status} \u2192 ${fullInfo.status}, serves: ${serves.length}`
+        );
+        this.lastTailscaleInfo = fullInfo;
+        this.updateDaemonState((state) => {
+          if (!state) return { status: "running", tailscale: fullInfo };
+          return { ...state, tailscale: fullInfo };
+        });
+      }
+    }, TAILSCALE_REFRESH_MS);
+    logger.debug("[MACHINE] Tailscale refresh started (5m interval)");
+  }
+  stopTailscaleRefresh() {
+    if (this.tailscaleRefreshInterval) {
+      clearInterval(this.tailscaleRefreshInterval);
+      this.tailscaleRefreshInterval = null;
+    }
+  }
+}
+function tailscaleChanged(prev, next) {
+  if (!prev) return true;
+  return prev.status !== next.status || prev.ipv4 !== next.ipv4 || prev.ipv6 !== next.ipv6 || prev.hostname !== next.hostname || JSON.stringify(prev.serves) !== JSON.stringify(next.serves);
 }
 
 function formatTime(ts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmmao/happy-agent",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "CLI client for controlling Happy Coder agents remotely",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",