@termhub/agent 0.1.5 → 0.1.7

package/dist/cli.js

@@ -490,14 +490,26 @@ function buildPasteScript(name) {
 }
 
 // ../../packages/machine-ops/dist/ai-credentials.js
+var CREDENTIAL_SEPARATOR = "---termhub-credential---";
 function credentialScript(provider) {
   switch (provider) {
     case "claude":
       return [
-        `if [ -f "$D/.credentials.json" ]; then cat "$D/.credentials.json"`,
-        `elif [ "$(uname -s)" = Darwin ]; then security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null || true`,
+        `SEP=${shellQuote(CREDENTIAL_SEPARATOR)}`,
+        // 1. the on-disk copy (Linux, and macOS when the keychain entry is missing/disabled)
+        `if [ -f "$D/.credentials.json" ]; then cat "$D/.credentials.json" 2>/dev/null || true; fi`,
+        `printf '\\n%s\\n' "$SEP"`,
+        `if [ "$(uname -s 2>/dev/null)" = Darwin ]; then`,
+        `  D=\${D%/}`,
+        // 2a. the per-config-dir keychain item (CLAUDE_CONFIG_DIR accounts)
+        `  H=$(printf %s "$D" | shasum -a 256 2>/dev/null | cut -c1-8) || true`,
+        `  if [ -n "$H" ]; then security find-generic-password -s "Claude Code-credentials-$H" -w 2>/dev/null || true; fi`,
+        `  printf '\\n%s\\n' "$SEP"`,
+        // 2b. the unsuffixed item, only for the default dir (it belongs to a different account otherwise)
+        `  if [ "$D" = "$HOME/.claude" ]; then security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null || true; fi`,
+        `  printf '\\n%s\\n' "$SEP"`,
         `fi`
-      ].join("; ");
+      ].join("\n");
     case "chatgpt":
       return `if [ -f "$D/auth.json" ]; then cat "$D/auth.json"; fi`;
     case "gemini":
@@ -750,16 +762,49 @@ 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";
+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;
   }
@@ -769,6 +814,9 @@ function resolveCwd(rawCwd) {
   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;
@@ -778,6 +826,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) {
@@ -804,7 +853,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({
@@ -888,37 +946,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;
@@ -1227,7 +1254,7 @@ async function status(deps = {}) {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.1.5";
+var AGENT_VERSION = "0.1.7";
 
 // src/run.ts
 function detectOs(platform = process.platform) {

package/package.json

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