@termhub/agent 0.1.4 → 0.1.6

package/dist/cli.js

@@ -63,8 +63,13 @@ var RPC = {
   "ai.credential": def(z.object({ provider: aiProvider, config_dir: machinePath.nullable() }), z.object({ stdout: z.string() }), 1e4),
   "file.paste": def(z.object({ name: pasteName, data_b64: z.string().min(1).max(28 * 1024 * 1024) }), z.object({ path: z.string() }), 6e4),
   /** Monitor hooks (see @termhub/machine-ops hooks.ts): the agent writes the script, env and config entries under its own $HOME. */
-  "hooks.install": def(z.object({ hooks_url: z.string().min(1).max(2048).regex(/^https?:\/\/[^\s'"]+$/), token: z.string().min(1).max(256).regex(/^[A-Za-z0-9_-]+$/) }), z.object({ home: z.string(), claude: z.enum(["installed", "skipped"]), codex: z.enum(["installed", "skipped"]) }), 15e3),
-  "hooks.uninstall": def(z.object({}), z.object({ removed: z.boolean() }), 15e3)
+  /** `claude_dirs`: Claude config dirs besides ~/.claude (accounts with CLAUDE_CONFIG_DIR), hooked when they exist; since agent 0.1.5. */
+  "hooks.install": def(z.object({
+    hooks_url: z.string().min(1).max(2048).regex(/^https?:\/\/[^\s'"]+$/),
+    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)
 };
 var RPC_METHODS = Object.keys(RPC);
 var rpcMethod = z.enum(RPC_METHODS);
@@ -534,6 +539,23 @@ function ptyEnv(base, shell) {
 var HOOK_SCRIPT_REL = ".termhub/bin/termhub-hook";
 var HOOK_ENV_REL = ".termhub/hook.env";
 var HOOK_MARK = "termhub-hook";
+var CLAUDE_DEFAULT_DIR = "~/.claude";
+function claudeConfigDirs(accountDirs) {
+  const out = [CLAUDE_DEFAULT_DIR];
+  for (const raw of accountDirs) {
+    let d = (raw ?? "").trim().replace(/\/+$/, "");
+    if (!d || d === "~" || /[\0\n\r]/.test(d))
+      continue;
+    if (!d.startsWith("~/") && !d.startsWith("/"))
+      d = `~/${d}`;
+    if (!out.includes(d))
+      out.push(d);
+  }
+  return out;
+}
+function expandHome(dir, home) {
+  return dir.startsWith("~/") ? `${home}/${dir.slice(2)}` : dir;
+}
 var CLAUDE_HOOK_EVENTS = ["SessionStart", "UserPromptSubmit", "Notification", "Stop", "SessionEnd"];
 var HOOK_SCRIPT = `#!/bin/sh
 # termhub monitor hook \u2014 installed by termhub; forwards Claude Code / Codex hook events to
@@ -728,25 +750,61 @@ function createDispatcher(deps) {
 }
 
 // src/pty.ts
+import fs3 from "fs";
+import path3 from "path";
+
+// src/pty-health.ts
 import fs2 from "fs";
 import path2 from "path";
-function expandHome(rawCwd, home) {
+import { createRequire } from "module";
+function findSpawnHelper(resolveFrom = import.meta.url) {
+  let pkgJson;
+  try {
+    pkgJson = createRequire(resolveFrom).resolve("node-pty/package.json");
+  } catch {
+    return null;
+  }
+  const root = path2.dirname(pkgJson);
+  const candidates = [
+    path2.join(root, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper"),
+    path2.join(root, "build", "Release", "spawn-helper")
+  ];
+  return candidates.find((p) => fs2.existsSync(p)) ?? null;
+}
+var EXEC_BITS = 73;
+function ensureSpawnHelperExecutable(helper = findSpawnHelper()) {
+  if (!helper) return { path: null, executable: true, repaired: false };
+  try {
+    const mode = fs2.statSync(helper).mode;
+    if (mode & EXEC_BITS) return { path: helper, executable: true, repaired: false };
+    fs2.chmodSync(helper, (mode | 493) & 4095);
+    return { path: helper, executable: true, repaired: true };
+  } catch (err) {
+    return { path: helper, executable: false, repaired: false, error: err instanceof Error ? err.message : String(err) };
+  }
+}
+
+// src/pty.ts
+function expandHome2(rawCwd, home) {
   if (rawCwd === "~") return home;
-  if (rawCwd.startsWith("~/")) return path2.join(home, rawCwd.slice(2));
+  if (rawCwd.startsWith("~/")) return path3.join(home, rawCwd.slice(2));
   return rawCwd;
 }
 function existsDir(p) {
   try {
-    return fs2.statSync(p).isDirectory();
+    return fs3.statSync(p).isDirectory();
   } catch {
     return false;
   }
 }
 function resolveCwd(rawCwd) {
   const home = process.env.HOME || "/";
-  const expanded = expandHome(rawCwd, home);
+  const expanded = expandHome2(rawCwd, home);
   return existsDir(expanded) ? expanded : home;
 }
+function isSpawnHelperFailure(err) {
+  return /posix_spawnp failed/.test(err instanceof Error ? err.message : String(err));
+}
 function isEnoent(err) {
   const e = err;
   if (e?.code === "ENOENT") return true;
@@ -756,6 +814,7 @@ function isEnoent(err) {
 function createPtyManager(deps) {
   const procs = /* @__PURE__ */ new Map();
   const tmux = deps.tmuxPath ?? tmuxPath();
+  const repairSpawnHelper = deps.repairSpawnHelper ?? (() => ensureSpawnHelperExecutable());
   let spawnFn = deps.spawn;
   async function resolveSpawn() {
     if (!spawnFn) {
@@ -782,7 +841,16 @@ function createPtyManager(deps) {
           TERMHUB_SESSION: params.session
         };
         const spawn = await resolveSpawn();
-        proc = spawn(tmux, ["-u", "new-session", "-A", "-s", params.session, "-c", cwd], { name: "xterm-256color", cols, rows, cwd, env });
+        const spawnTmux = () => spawn(tmux, ["-u", "new-session", "-A", "-s", params.session, "-c", cwd], { name: "xterm-256color", cols, rows, cwd, env });
+        try {
+          proc = spawnTmux();
+        } catch (err) {
+          if (!isSpawnHelperFailure(err)) throw err;
+          const helper = repairSpawnHelper();
+          if (!helper.repaired) throw err;
+          deps.log("spawn-helper exec bit repaired on open", { path: helper.path });
+          proc = spawnTmux();
+        }
       } catch (err) {
         deps.log("pty open failed", { ch, session: params.session, tmux, cwd: params.cwd, error: err instanceof Error ? err.message : String(err) });
         socket.sendControl({
@@ -866,37 +934,6 @@ function createPtyManager(deps) {
   };
 }
 
-// src/pty-health.ts
-import fs3 from "fs";
-import path3 from "path";
-import { createRequire } from "module";
-function findSpawnHelper(resolveFrom = import.meta.url) {
-  let pkgJson;
-  try {
-    pkgJson = createRequire(resolveFrom).resolve("node-pty/package.json");
-  } catch {
-    return null;
-  }
-  const root = path3.dirname(pkgJson);
-  const candidates = [
-    path3.join(root, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper"),
-    path3.join(root, "build", "Release", "spawn-helper")
-  ];
-  return candidates.find((p) => fs3.existsSync(p)) ?? null;
-}
-var EXEC_BITS = 73;
-function ensureSpawnHelperExecutable(helper = findSpawnHelper()) {
-  if (!helper) return { path: null, executable: true, repaired: false };
-  try {
-    const mode = fs3.statSync(helper).mode;
-    if (mode & EXEC_BITS) return { path: helper, executable: true, repaired: false };
-    fs3.chmodSync(helper, (mode | 493) & 4095);
-    return { path: helper, executable: true, repaired: true };
-  } catch (err) {
-    return { path: helper, executable: false, repaired: false, error: err instanceof Error ? err.message : String(err) };
-  }
-}
-
 // src/rpc/ai.ts
 async function credential(params) {
   let prefix;
@@ -935,7 +972,6 @@ async function mkdir(params) {
 import { chmod, mkdir as mkdir2, readFile, rename, rm, stat, writeFile } from "fs/promises";
 import os3 from "os";
 import path4 from "path";
-var CLAUDE_SETTINGS_REL = ".claude/settings.json";
 var CODEX_DIR_REL = ".codex";
 var CODEX_CONFIG_REL = ".codex/config.toml";
 var isEnoent2 = (err) => err?.code === "ENOENT";
@@ -960,65 +996,85 @@ async function writeAtomic(file, body, mode) {
   await chmod(tmp, mode);
   await rename(tmp, file);
 }
-function fsFailure(err, rel) {
+var relPath = (shown) => shown.startsWith("~/") ? shown.slice(2) : shown;
+function fsFailure(err, shown) {
   const code = err?.code;
-  if (code === "EACCES" || code === "EPERM") return new RpcFailure("eperm", `sem permiss\xE3o em ~/${rel}`, rel);
-  return new RpcFailure("failed", `n\xE3o foi poss\xEDvel escrever ~/${rel}: ${err instanceof Error ? err.message : String(err)}`, rel);
+  if (code === "EACCES" || code === "EPERM") return new RpcFailure("eperm", `sem permiss\xE3o em ${shown}`, relPath(shown));
+  return new RpcFailure("failed", `n\xE3o foi poss\xEDvel escrever ${shown}: ${err instanceof Error ? err.message : String(err)}`, relPath(shown));
+}
+async function claudeTargets(dirs, home) {
+  const out = [];
+  for (const d of claudeConfigDirs(dirs ?? [])) {
+    const dir = expandHome(d, home);
+    if (d !== CLAUDE_DEFAULT_DIR && !await isDir(dir)) continue;
+    out.push({ dir, file: path4.join(dir, "settings.json"), shown: `${d}/settings.json` });
+  }
+  return out;
 }
 async function install(params, home = os3.homedir()) {
   const scriptPath = path4.join(home, HOOK_SCRIPT_REL);
-  const claudeFile = path4.join(home, CLAUDE_SETTINGS_REL);
   const codexFile = path4.join(home, CODEX_CONFIG_REL);
-  const claudeSettings = await readOrEmpty(claudeFile);
-  let mergedClaude;
-  try {
-    mergedClaude = mergeClaudeSettings(claudeSettings, scriptPath);
-  } catch (err) {
-    throw new RpcFailure("failed", err instanceof SyntaxError ? "~/.claude/settings.json n\xE3o \xE9 JSON v\xE1lido" : err instanceof Error ? err.message : String(err), CLAUDE_SETTINGS_REL);
+  const targets = await claudeTargets(params.claude_dirs, home);
+  const merged = [];
+  for (const target of targets) {
+    try {
+      merged.push({ target, body: mergeClaudeSettings(await readOrEmpty(target.file), scriptPath) });
+    } catch (err) {
+      const message = err instanceof SyntaxError || err instanceof Error && err.message.includes("n\xE3o \xE9 um objeto JSON") ? `${target.shown} n\xE3o \xE9 JSON v\xE1lido` : err instanceof Error ? err.message : String(err);
+      throw new RpcFailure("failed", message, relPath(target.shown));
+    }
   }
   const hasCodex = await isDir(path4.join(home, CODEX_DIR_REL));
   const mergedCodex = hasCodex ? mergeCodexConfig(await readOrEmpty(codexFile), scriptPath) : null;
-  let current = HOOK_SCRIPT_REL;
+  let current = `~/${HOOK_SCRIPT_REL}`;
   try {
     await mkdir2(path4.dirname(scriptPath), { recursive: true });
-    await mkdir2(path4.dirname(claudeFile), { recursive: true });
-    current = HOOK_ENV_REL;
+    current = `~/${HOOK_ENV_REL}`;
     await writeAtomic(path4.join(home, HOOK_ENV_REL), hookEnvFile(params.hooks_url, params.token), 384);
-    current = HOOK_SCRIPT_REL;
+    current = `~/${HOOK_SCRIPT_REL}`;
     await writeAtomic(scriptPath, HOOK_SCRIPT, 493);
-    current = CLAUDE_SETTINGS_REL;
-    await writeAtomic(claudeFile, mergedClaude, 420);
+    for (const { target, body } of merged) {
+      current = target.shown;
+      await mkdir2(target.dir, { recursive: true });
+      await writeAtomic(target.file, body, 420);
+    }
     if (mergedCodex !== null) {
-      current = CODEX_CONFIG_REL;
+      current = `~/${CODEX_CONFIG_REL}`;
       await writeAtomic(codexFile, mergedCodex, 420);
     }
   } catch (err) {
     throw fsFailure(err, current);
   }
-  return { home, claude: "installed", codex: mergedCodex !== null ? "installed" : "skipped" };
+  return {
+    home,
+    claude: "installed",
+    codex: mergedCodex !== null ? "installed" : "skipped",
+    claude_dirs: merged.map(({ target }) => target.shown.replace(/\/settings\.json$/, ""))
+  };
 }
-async function uninstall(_params, home = os3.homedir()) {
-  const claudeFile = path4.join(home, CLAUDE_SETTINGS_REL);
+async function uninstall(params, home = os3.homedir()) {
   const codexFile = path4.join(home, CODEX_CONFIG_REL);
-  const claudeSettings = await readOrEmpty(claudeFile);
-  let stripped = null;
-  try {
-    stripped = claudeSettings.trim() ? stripClaudeSettings(claudeSettings) : null;
-  } catch {
-    stripped = null;
+  const stripped = [];
+  for (const target of await claudeTargets(params.claude_dirs, home)) {
+    const current2 = await readOrEmpty(target.file);
+    try {
+      const body = current2.trim() ? stripClaudeSettings(current2) : current2;
+      if (body !== current2) stripped.push({ target, body });
+    } catch {
+    }
   }
   const codexConfig = await isDir(path4.join(home, CODEX_DIR_REL)) ? await readOrEmpty(codexFile) : "";
-  let current = HOOK_SCRIPT_REL;
+  let current = `~/${HOOK_SCRIPT_REL}`;
   try {
     await rm(path4.join(home, HOOK_SCRIPT_REL), { force: true });
-    current = HOOK_ENV_REL;
+    current = `~/${HOOK_ENV_REL}`;
     await rm(path4.join(home, HOOK_ENV_REL), { force: true });
-    if (stripped !== null && stripped !== claudeSettings) {
-      current = CLAUDE_SETTINGS_REL;
-      await writeAtomic(claudeFile, stripped, 420);
+    for (const { target, body } of stripped) {
+      current = target.shown;
+      await writeAtomic(target.file, body, 420);
     }
     if (codexConfig.includes(HOOK_MARK)) {
-      current = CODEX_CONFIG_REL;
+      current = `~/${CODEX_CONFIG_REL}`;
       await writeAtomic(codexFile, stripCodexConfig(codexConfig), 420);
     }
   } catch (err) {
@@ -1186,7 +1242,7 @@ async function status(deps = {}) {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.1.4";
+var AGENT_VERSION = "0.1.6";
 
 // src/run.ts
 function detectOs(platform = process.platform) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@termhub/agent",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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,