@pmate/cli 0.28.2 → 0.28.3

package/dist/index.js

@@ -24420,33 +24420,70 @@ var HostCommandHandler = class {
       return;
     }
     const resolved = await client.resolveHostEnv(hostId);
-    const result = applyHostEnv(resolved.values);
+    const result = await applyHostEnvRemote(hostId, resolved.values);
     if (args.json) ui.plain(JSON.stringify({ hostId, ...result }, null, 2));
     else ui.success(`Applied ${Object.keys(resolved.values).length} host env vars`, result.envFile);
   }
 };
-function applyHostEnv(values, home = (0, import_node_os11.homedir)()) {
-  const hostDir = import_node_path30.default.join(home, ".pmate", "host");
-  const envFile = import_node_path30.default.join(hostDir, "host.env");
-  const tempFile = import_node_path30.default.join(hostDir, `.host.env.${process.pid}.tmp`);
-  const profileFile = import_node_path30.default.join(home, ".profile");
-  (0, import_node_fs25.mkdirSync)(hostDir, { recursive: true });
-  const content = Object.entries(values).sort(([a], [b]) => a.localeCompare(b)).map(([key, value]) => `${normalizeEnvKey(key)}=${shellQuote3(value)}`).join("\n") + "\n";
-  (0, import_node_fs25.writeFileSync)(tempFile, content, { mode: 384 });
-  (0, import_node_fs25.chmodSync)(tempFile, 384);
-  (0, import_node_fs25.renameSync)(tempFile, envFile);
-  (0, import_node_fs25.chmodSync)(envFile, 384);
-  const existing = (0, import_node_fs25.existsSync)(profileFile) ? (0, import_node_fs25.readFileSync)(profileFile, "utf8") : "";
-  const blockPattern = new RegExp(`${escapeRegExp(BLOCK_START)}[\\s\\S]*?${escapeRegExp(BLOCK_END)}\\n?`, "g");
-  const withoutBlock = existing.replace(blockPattern, "").trimEnd();
-  const profileContent = `${withoutBlock}${withoutBlock ? "\n\n" : ""}${PROFILE_BLOCK}
+async function applyHostEnvRemote(host, values) {
+  const target = `pmate@${normalizeHostId(host)}`;
+  const content = serializeHostEnv(values);
+  const script = buildRemoteApplyScript(Buffer.from(content, "utf8").toString("base64"));
+  await new Promise((resolve, reject) => {
+    const child = (0, import_node_child_process13.spawn)("ssh", [target, "bash -s"], { stdio: ["pipe", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code === 0) resolve();
+      else reject(new Error(`ssh to ${host} failed${stderr.trim() ? `: ${stderr.trim()}` : ` with code ${code}`}
+${stdout.trim()}`.trim()));
+    });
+    child.stdin.end(script);
+  });
+  return {
+    envFile: "~/.pmate/host/host.env",
+    profileFile: "~/.profile",
+    refreshed: true
+  };
+}
+function buildRemoteApplyScript(contentBase64) {
+  return `set -euo pipefail
+host_dir="$HOME/.pmate/host"
+env_file="$host_dir/host.env"
+profile_file="$HOME/.profile"
+mkdir -p "$host_dir"
+env_tmp="$(mktemp "$host_dir/.host.env.XXXXXX")"
+profile_tmp=""
+cleanup() { rm -f "$env_tmp"; [ -z "$profile_tmp" ] || rm -f "$profile_tmp"; }
+trap cleanup EXIT
+printf '%s' '${contentBase64}' | base64 --decode > "$env_tmp"
+chmod 600 "$env_tmp"
+mv "$env_tmp" "$env_file"
+touch "$profile_file"
+profile_tmp="$(mktemp "$HOME/.profile.XXXXXX")"
+awk '
+  $0 == "${BLOCK_START}" { managed = 1; next }
+  $0 == "${BLOCK_END}" { managed = 0; next }
+  !managed { print }
+' "$profile_file" > "$profile_tmp"
+while [ -s "$profile_tmp" ] && [ "$(tail -c 1 "$profile_tmp" | wc -l)" -eq 0 ]; do printf '\\n' >> "$profile_tmp"; done
+cat >> "$profile_tmp" <<'PMATE_PROFILE_BLOCK'
+${PROFILE_BLOCK}
+PMATE_PROFILE_BLOCK
+mv "$profile_tmp" "$profile_file"
+bash -lc '. "$HOME/.profile"'
+printf 'applied %s\\n' "$env_file"
 `;
-  const profileTemp = `${profileFile}.${process.pid}.tmp`;
-  (0, import_node_fs25.writeFileSync)(profileTemp, profileContent);
-  (0, import_node_fs25.renameSync)(profileTemp, profileFile);
-  const check = (0, import_node_child_process13.spawnSync)("bash", ["-lc", `. ${shellQuote3(profileFile)}`], { cwd: home, env: { ...process.env, HOME: home }, encoding: "utf8" });
-  if (check.status !== 0) throw new Error(`Host env refresh validation failed: ${check.stderr.trim()}`);
-  return { envFile, profileFile, refreshed: true };
+}
+function serializeHostEnv(values) {
+  return Object.entries(values).sort(([a], [b]) => a.localeCompare(b)).map(([key, value]) => `${normalizeEnvKey(key)}=${shellQuote3(value)}`).join("\n") + "\n";
 }
 function normalizeHostId(value) {
   const normalized = value.trim();
@@ -24460,9 +24497,6 @@ function normalizeEnvKey(value) {
 function shellQuote3(value) {
   return `'${value.replace(/'/g, `'"'"'`)}'`;
 }
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function requireArg(value, name) {
   if (value === void 0) throw new Error(`Missing ${name}`);
   return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {