@termhub/agent 0.2.0 → 0.2.2

package/README.md

@@ -35,6 +35,13 @@ starts the agent at login/boot and restarts it on failure. `termhub-agent servic
 `termhub-agent service uninstall` manage it afterwards. On Linux, run
 `loginctl enable-linger $USER` once so the service keeps running after you log out.
 
+The service is deliberately kept apart from the tmux server that holds your terminals: on Linux
+the unit sets `KillMode=process`, so restarting or updating the agent signals only the agent
+itself and leaves tmux — and whatever is running inside it — alone, and the agent reattaches to
+the existing sessions when it comes back (macOS needs nothing: launchd does not follow tmux once
+it daemonises). A unit installed by an older agent is rewritten to the current template the first
+time the new agent starts.
+
 ## Other commands
 
 - `termhub-agent status` — shows the paired server, machine name and whether the agent can reach

package/dist/cli.js

@@ -77,7 +77,9 @@ var RPC = {
     token: z.string().min(1).max(256).regex(/^[A-Za-z0-9_-]+$/),
     claude_dirs: z.array(machinePath).max(16).optional()
   }), z.object({ home: z.string(), claude: z.enum(["installed", "skipped"]), codex: z.enum(["installed", "skipped"]), claude_dirs: z.array(z.string()).optional() }), 15e3),
-  "hooks.uninstall": def(z.object({ claude_dirs: z.array(machinePath).max(16).optional() }), z.object({ removed: z.boolean() }), 15e3)
+  "hooks.uninstall": def(z.object({ claude_dirs: z.array(machinePath).max(16).optional() }), z.object({ removed: z.boolean() }), 15e3),
+  /** Installs `version` of @termhub/agent with npm; when the agent runs as a service it then exits so the service relaunches the new code (since agent 0.2.1). */
+  "agent.update": def(z.object({ version: z.string().regex(/^\d+\.\d+\.\d+$/) }), z.object({ installed_version: z.string(), restart: z.enum(["service", "manual"]) }), 18e4)
 };
 var RPC_METHODS = Object.keys(RPC);
 var rpcMethod = z.enum(RPC_METHODS);
@@ -372,7 +374,7 @@ function deleteConfig() {
 }
 
 // src/run.ts
-import os5 from "os";
+import os6 from "os";
 
 // src/exec.ts
 import { execFile } from "child_process";
@@ -666,10 +668,10 @@ function stripCodexConfig(current) {
 // src/exec.ts
 var DEFAULT_TIMEOUT_MS = 8e3;
 var RpcFailure = class extends Error {
-  constructor(code, message, path10) {
+  constructor(code, message, path11) {
     super(message);
     this.code = code;
-    this.path = path10;
+    this.path = path11;
   }
   code;
   path;
@@ -1119,9 +1121,9 @@ async function pasteFile(params) {
   if (r.timedOut) throw new RpcFailure("timeout", "file.paste timed out");
   if (r.code !== 0) throw new RpcFailure("internal", `file.paste exited with code ${r.code}`);
   const lines = r.stdout.split("\n").map((l) => l.trim()).filter(Boolean);
-  const path10 = lines[lines.length - 1] ?? "";
-  if (!path10.startsWith("/")) throw new RpcFailure("internal", "unexpected paste output");
-  return { path: path10 };
+  const path11 = lines[lines.length - 1] ?? "";
+  if (!path11.startsWith("/")) throw new RpcFailure("internal", "unexpected paste output");
+  return { path: path11 };
 }
 
 // src/rpc/tmux.ts
@@ -1199,28 +1201,35 @@ async function detect(_params) {
   return { os: os9, tools: capabilities };
 }
 
-// src/rpc/index.ts
-var handlers = {
-  "tmux.list": list2,
-  "tmux.kill": kill,
-  "tmux.capture": capture,
-  "tmux.ensure": ensure,
-  "tmux.sendText": sendText,
-  "tmux.sendKey": sendKey,
-  "tools.detect": detect,
-  "hw.probe": probe,
-  "fs.list": list,
-  "fs.mkdir": mkdir,
-  "ai.credential": credential,
-  "file.paste": pasteFile,
-  "hooks.install": install,
-  "hooks.uninstall": uninstall
-};
+// src/rpc/update.ts
+import { existsSync, realpathSync as realpathSync2 } from "fs";
+import { readFile as readFile2 } from "fs/promises";
+import path9 from "path";
+
+// src/paths.ts
+import { realpathSync } from "fs";
+import path5 from "path";
+import { pathToFileURL } from "url";
+function resolveScriptPath(argv1) {
+  if (!argv1) return "";
+  try {
+    return realpathSync(argv1);
+  } catch {
+    return path5.resolve(argv1);
+  }
+}
+function isMainModule(importMetaUrl, argv1) {
+  if (!argv1) return false;
+  return importMetaUrl === pathToFileURL(resolveScriptPath(argv1)).href;
+}
+
+// src/service/index.ts
+import path8 from "path";
 
 // src/service/launchd.ts
 import fs4 from "fs";
 import os4 from "os";
-import path5 from "path";
+import path6 from "path";
 var LABEL = "dev.termhub.agent";
 function renderPlist({ label, node, script, logPath }) {
   const escape = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -1258,17 +1267,17 @@ function renderPlist({ label, node, script, logPath }) {
 </plist>
 `;
 }
-function plistPath() {
-  return path5.join(os4.homedir(), "Library", "LaunchAgents", `${LABEL}.plist`);
+function plistPath(home = os4.homedir()) {
+  return path6.join(home, "Library", "LaunchAgents", `${LABEL}.plist`);
 }
 function gui() {
   return `gui/${process.getuid ? process.getuid() : 0}`;
 }
 async function install2(opts, deps = {}) {
   const runFn = deps.run ?? run;
-  const file = plistPath();
+  const file = plistPath(deps.home);
   const plist = renderPlist({ label: LABEL, node: opts.node, script: opts.script, logPath: opts.logPath });
-  fs4.mkdirSync(path5.dirname(file), { recursive: true });
+  fs4.mkdirSync(path6.dirname(file), { recursive: true });
   fs4.writeFileSync(file, plist, "utf8");
   await runFn("launchctl", ["bootout", gui(), file]);
   const result = await runFn("launchctl", ["bootstrap", gui(), file]);
@@ -1278,7 +1287,7 @@ async function install2(opts, deps = {}) {
 }
 async function uninstall2(deps = {}) {
   const runFn = deps.run ?? run;
-  const file = plistPath();
+  const file = plistPath(deps.home);
   await runFn("launchctl", ["bootout", gui(), file]);
   try {
     fs4.unlinkSync(file);
@@ -1301,8 +1310,200 @@ async function status(deps = {}) {
   return result.code === 0;
 }
 
+// src/service/systemd.ts
+import fs5 from "fs";
+import os5 from "os";
+import path7 from "path";
+var UNIT_NAME = "termhub-agent";
+function renderUnit({ node, script, logPath, pathEnv }) {
+  const lines = [
+    "[Unit]",
+    "Description=termhub agent",
+    "After=network-online.target",
+    "",
+    "[Service]",
+    `ExecStart=${node} ${script} run`,
+    "KillMode=process",
+    "Restart=on-failure",
+    "RestartSec=2",
+    "RestartPreventExitStatus=78",
+    `Environment=PATH=${pathEnv ?? agentEnv().PATH ?? ""}`
+  ];
+  if (logPath) {
+    lines.push(`StandardOutput=append:${logPath}`, `StandardError=append:${logPath}`);
+  }
+  lines.push("", "[Install]", "WantedBy=default.target", "");
+  return lines.join("\n");
+}
+function unitPath(home = os5.homedir()) {
+  return path7.join(home, ".config", "systemd", "user", `${UNIT_NAME}.service`);
+}
+async function install3(opts, deps = {}) {
+  const runFn = deps.run ?? run;
+  const file = unitPath(deps.home);
+  const unit = renderUnit({ node: opts.node, script: opts.script, logPath: opts.logPath });
+  fs5.mkdirSync(path7.dirname(file), { recursive: true });
+  fs5.writeFileSync(file, unit, "utf8");
+  const reload = await runFn("systemctl", ["--user", "daemon-reload"]);
+  if (reload.code !== 0) throw new Error(`systemctl daemon-reload failed (code ${reload.code}): ${reload.stderr.trim()}`);
+  const enable = await runFn("systemctl", ["--user", "enable", "--now", UNIT_NAME]);
+  if (enable.code !== 0) throw new Error(`systemctl enable --now failed (code ${enable.code}): ${enable.stderr.trim()}`);
+  console.log("Para o agente continuar ap\xF3s o logout: loginctl enable-linger $USER");
+}
+function unitPathEnv(unit) {
+  return /^Environment=PATH=(.*)$/m.exec(unit)?.[1];
+}
+async function refreshUnit(opts, deps = {}) {
+  const file = unitPath(deps.home);
+  let current;
+  try {
+    current = fs5.readFileSync(file, "utf8");
+  } catch (err) {
+    if (err.code === "ENOENT") return false;
+    throw err;
+  }
+  const unit = renderUnit({ node: opts.node, script: opts.script, logPath: opts.logPath, pathEnv: unitPathEnv(current) });
+  if (unit === current) return false;
+  fs5.writeFileSync(file, unit, "utf8");
+  const runFn = deps.run ?? run;
+  const reload = await runFn("systemctl", ["--user", "daemon-reload"]);
+  if (reload.code !== 0) throw new Error(`systemctl daemon-reload failed (code ${reload.code}): ${reload.stderr.trim()}`);
+  return true;
+}
+async function uninstall3(deps = {}) {
+  const runFn = deps.run ?? run;
+  await runFn("systemctl", ["--user", "disable", "--now", UNIT_NAME]);
+  try {
+    fs5.unlinkSync(unitPath(deps.home));
+  } catch (err) {
+    if (err.code !== "ENOENT") throw err;
+  }
+  await runFn("systemctl", ["--user", "daemon-reload"]);
+}
+async function status2(deps = {}) {
+  const runFn = deps.run ?? run;
+  const result = await runFn("systemctl", ["--user", "is-active", UNIT_NAME]);
+  return result.code === 0;
+}
+
+// src/service/index.ts
+function serviceFileOptions() {
+  return {
+    node: process.execPath,
+    script: resolveScriptPath(process.argv[1]),
+    logPath: path8.join(agentHome(), "agent.log")
+  };
+}
+function assertSupported(platform) {
+  if (platform !== "darwin" && platform !== "linux") throw new Error("Sistema n\xE3o suportado");
+}
+async function install4() {
+  const platform = process.platform;
+  assertSupported(platform);
+  const opts = serviceFileOptions();
+  if (platform === "darwin") await install2(opts);
+  else await install3(opts);
+}
+async function refresh() {
+  if (process.platform !== "linux") return false;
+  return refreshUnit(serviceFileOptions());
+}
+async function uninstall4() {
+  const platform = process.platform;
+  assertSupported(platform);
+  if (platform === "darwin") await uninstall2();
+  else await uninstall3();
+}
+async function status3() {
+  const platform = process.platform;
+  assertSupported(platform);
+  if (platform === "darwin") return status();
+  return status2();
+}
+
 // src/version.ts
-var AGENT_VERSION = "0.2.0";
+var AGENT_VERSION = "0.2.2";
+
+// src/rpc/update.ts
+var PACKAGE = "@termhub/agent";
+var NPM_TIMEOUT_MS = 15e4;
+var EXIT_DELAY_MS = 750;
+function npmCliBesideNode(execPath = process.execPath) {
+  const dir = path9.dirname(execPath);
+  const symlink = path9.join(dir, "npm");
+  if (existsSync(symlink)) return realpathSync2(symlink);
+  const fallback = path9.join(dir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js");
+  return existsSync(fallback) ? fallback : null;
+}
+async function installedAgentVersion(argv1 = process.argv[1]) {
+  const script = resolveScriptPath(argv1);
+  if (!script) return null;
+  try {
+    const pkg = JSON.parse(await readFile2(path9.join(path9.dirname(script), "..", "package.json"), "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+var defaultDeps = {
+  run,
+  execPath: process.execPath,
+  npmCli: npmCliBesideNode,
+  installedVersion: installedAgentVersion,
+  serviceInstalled: () => status3(),
+  exit: (code) => process.exit(code),
+  log: (msg, meta) => console.error(meta ? `[termhub-agent] ${msg} ${JSON.stringify(meta)}` : `[termhub-agent] ${msg}`)
+};
+var inFlight = null;
+async function updateAgent(params, deps = defaultDeps) {
+  if (inFlight) throw new RpcFailure("failed", "update already running");
+  inFlight = doUpdate(params.version, deps);
+  try {
+    return await inFlight;
+  } finally {
+    inFlight = null;
+  }
+}
+async function doUpdate(version, deps) {
+  deps.log("update starting", { from: AGENT_VERSION, to: version });
+  const npmCli = deps.npmCli();
+  if (!npmCli) throw new RpcFailure("notfound", "npm not found beside node");
+  const r = await deps.run(deps.execPath, [npmCli, "install", "-g", "--no-fund", "--no-audit", `${PACKAGE}@${version}`], { timeoutMs: NPM_TIMEOUT_MS });
+  if (r.error === "enoent") throw new RpcFailure("notfound", "npm not found on this machine");
+  if (r.timedOut) throw new RpcFailure("timeout", "npm install timed out");
+  if (r.code !== 0) {
+    deps.log("update failed", { to: version, code: r.code });
+    throw new RpcFailure("failed", `npm exited with code ${r.code ?? "unknown"}`);
+  }
+  const installed = await deps.installedVersion();
+  if (installed !== version) throw new RpcFailure("failed", `installed version mismatch (${installed ?? "unknown"})`);
+  const restart = await deps.serviceInstalled() ? "service" : "manual";
+  deps.log("update installed", { from: AGENT_VERSION, to: version, restart });
+  if (restart === "service") {
+    setTimeout(() => deps.exit(1), EXIT_DELAY_MS);
+  }
+  return { installed_version: installed, restart };
+}
+var update = (params) => updateAgent(params);
+
+// src/rpc/index.ts
+var handlers = {
+  "tmux.list": list2,
+  "tmux.kill": kill,
+  "tmux.capture": capture,
+  "tmux.ensure": ensure,
+  "tmux.sendText": sendText,
+  "tmux.sendKey": sendKey,
+  "tools.detect": detect,
+  "hw.probe": probe,
+  "fs.list": list,
+  "fs.mkdir": mkdir,
+  "ai.credential": credential,
+  "file.paste": pasteFile,
+  "hooks.install": install,
+  "hooks.uninstall": uninstall,
+  "agent.update": update
+};
 
 // src/run.ts
 function detectOs(platform = process.platform) {
@@ -1322,7 +1523,7 @@ async function buildHello(osName) {
     agent_version: AGENT_VERSION,
     os: osName,
     arch: process.arch,
-    hostname: os5.hostname(),
+    hostname: os6.hostname(),
     tmux: tools.includes("tmux"),
     tools
   };
@@ -1342,7 +1543,7 @@ async function checkServerConnection(config, timeoutMs = 5e3) {
       {
         url: config.url,
         token: config.token,
-        hello: { agent_version: AGENT_VERSION, os: osName, arch: process.arch, hostname: os5.hostname(), tmux: false, tools: [], probe: true },
+        hello: { agent_version: AGENT_VERSION, os: osName, arch: process.arch, hostname: os6.hostname(), tmux: false, tools: [], probe: true },
         onServerMessage: () => {
         },
         onStream: () => {
@@ -1492,17 +1693,17 @@ function disconnectCommand() {
 }
 
 // src/doctor.ts
-import fs5 from "fs";
-import os6 from "os";
-import path6 from "path";
+import fs6 from "fs";
+import os7 from "os";
+import path10 from "path";
 var SERVER_CHECK_TIMEOUT_MS = 5e3;
 function defaultDoctorPaths() {
-  const home = os6.homedir();
-  const paths = [home, path6.join(home, "Documents"), path6.join(home, "Desktop")];
+  const home = os7.homedir();
+  const paths = [home, path10.join(home, "Documents"), path10.join(home, "Desktop")];
   if (process.platform === "darwin") {
     try {
-      for (const entry of fs5.readdirSync("/Volumes", { withFileTypes: true })) {
-        if (entry.isDirectory()) paths.push(path6.join("/Volumes", entry.name));
+      for (const entry of fs6.readdirSync("/Volumes", { withFileTypes: true })) {
+        if (entry.isDirectory()) paths.push(path10.join("/Volumes", entry.name));
       }
     } catch {
     }
@@ -1515,7 +1716,7 @@ function pathErrorCode(err) {
   if (e?.code) return e.code;
   return err instanceof Error ? err.message : String(err);
 }
-function checkPathAccess(p, fsImpl = fs5) {
+function checkPathAccess(p, fsImpl = fs6) {
   try {
     fsImpl.readdirSync(p);
     return { path: p, ok: true };
@@ -1527,7 +1728,7 @@ function fullDiskAccessNote(execPath = process.execPath) {
   return `Conceda Acesso Total ao Disco a ${execPath} em Ajustes \u2192 Privacidade e Seguran\xE7a \u2192 Acesso Total ao Disco`;
 }
 async function runDoctor(paths, deps = {}) {
-  const fsImpl = deps.fs ?? fs5;
+  const fsImpl = deps.fs ?? fs6;
   const connect = deps.connect ?? checkServerConnection;
   const config = readConfig();
   const configReport = { ok: config !== null, path: configPath() };
@@ -1590,119 +1791,16 @@ async function runCommand(log2) {
   if (!config) {
     return exitWithoutRestart("Nenhuma configura\xE7\xE3o. Rode: termhub-agent connect --url <url>");
   }
-  await runForegroundUntilSignal(config, log2);
-}
-
-// src/commands/service.ts
-import os8 from "os";
-
-// src/service/index.ts
-import path9 from "path";
-
-// src/paths.ts
-import { realpathSync } from "fs";
-import path7 from "path";
-import { pathToFileURL } from "url";
-function resolveScriptPath(argv1) {
-  if (!argv1) return "";
   try {
-    return realpathSync(argv1);
-  } catch {
-    return path7.resolve(argv1);
-  }
-}
-function isMainModule(importMetaUrl, argv1) {
-  if (!argv1) return false;
-  return importMetaUrl === pathToFileURL(resolveScriptPath(argv1)).href;
-}
-
-// src/service/systemd.ts
-import fs6 from "fs";
-import os7 from "os";
-import path8 from "path";
-var UNIT_NAME = "termhub-agent";
-function renderUnit({ node, script, logPath }) {
-  const lines = [
-    "[Unit]",
-    "Description=termhub agent",
-    "After=network-online.target",
-    "",
-    "[Service]",
-    `ExecStart=${node} ${script} run`,
-    "Restart=on-failure",
-    "RestartSec=2",
-    "RestartPreventExitStatus=78",
-    `Environment=PATH=${agentEnv().PATH ?? ""}`
-  ];
-  if (logPath) {
-    lines.push(`StandardOutput=append:${logPath}`, `StandardError=append:${logPath}`);
-  }
-  lines.push("", "[Install]", "WantedBy=default.target", "");
-  return lines.join("\n");
-}
-function unitPath() {
-  return path8.join(os7.homedir(), ".config", "systemd", "user", `${UNIT_NAME}.service`);
-}
-async function install3(opts, deps = {}) {
-  const runFn = deps.run ?? run;
-  const file = unitPath();
-  const unit = renderUnit({ node: opts.node, script: opts.script, logPath: opts.logPath });
-  fs6.mkdirSync(path8.dirname(file), { recursive: true });
-  fs6.writeFileSync(file, unit, "utf8");
-  const reload = await runFn("systemctl", ["--user", "daemon-reload"]);
-  if (reload.code !== 0) throw new Error(`systemctl daemon-reload failed (code ${reload.code}): ${reload.stderr.trim()}`);
-  const enable = await runFn("systemctl", ["--user", "enable", "--now", UNIT_NAME]);
-  if (enable.code !== 0) throw new Error(`systemctl enable --now failed (code ${enable.code}): ${enable.stderr.trim()}`);
-  console.log("Para o agente continuar ap\xF3s o logout: loginctl enable-linger $USER");
-}
-async function uninstall3(deps = {}) {
-  const runFn = deps.run ?? run;
-  await runFn("systemctl", ["--user", "disable", "--now", UNIT_NAME]);
-  try {
-    fs6.unlinkSync(unitPath());
+    if (await refresh()) log2("service definition refreshed");
   } catch (err) {
-    if (err.code !== "ENOENT") throw err;
+    log2("service definition could not be refreshed", { error: err instanceof Error ? err.message : String(err) });
   }
-  await runFn("systemctl", ["--user", "daemon-reload"]);
-}
-async function status2(deps = {}) {
-  const runFn = deps.run ?? run;
-  const result = await runFn("systemctl", ["--user", "is-active", UNIT_NAME]);
-  return result.code === 0;
-}
-
-// src/service/index.ts
-function serviceFileOptions() {
-  return {
-    node: process.execPath,
-    script: resolveScriptPath(process.argv[1]),
-    logPath: path9.join(agentHome(), "agent.log")
-  };
-}
-function assertSupported(platform) {
-  if (platform !== "darwin" && platform !== "linux") throw new Error("Sistema n\xE3o suportado");
-}
-async function install4() {
-  const platform = process.platform;
-  assertSupported(platform);
-  const opts = serviceFileOptions();
-  if (platform === "darwin") await install2(opts);
-  else await install3(opts);
-}
-async function uninstall4() {
-  const platform = process.platform;
-  assertSupported(platform);
-  if (platform === "darwin") await uninstall2();
-  else await uninstall3();
-}
-async function status3() {
-  const platform = process.platform;
-  assertSupported(platform);
-  if (platform === "darwin") return status();
-  return status2();
+  await runForegroundUntilSignal(config, log2);
 }
 
 // src/commands/service.ts
+import os8 from "os";
 async function serviceCommand(sub) {
   switch (sub) {
     case "install": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@termhub/agent",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Agente do termhub: conecta esta máquina ao servidor por WebSocket de saída (sem SSH) e expõe os terminais tmux no navegador.",
   "license": "MIT",
   "private": false,