@lifeaitools/clauth 1.30.13 → 1.30.14

package/cli/enrollment-script.js

@@ -0,0 +1,82 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+
+function shellSingleQuote(value) {
+  return `'${String(value ?? "").replace(/'/g, "''")}'`;
+}
+
+function posixShellQuote(value) {
+  return `'${String(value ?? "").replace(/'/g, "'\\\"'\\\"'")}'`;
+}
+
+export function enrollmentScriptName(label, target = "windows") {
+  const slug = String(label || "new-computer")
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .slice(0, 40) || "new-computer";
+  return `clauth-enroll-${slug}${target === "linux" ? ".sh" : ".ps1"}`;
+}
+
+function windowsScript({ supabaseUrl, anonKey, enrollmentCode }) {
+  return [
+    "$ErrorActionPreference = 'Stop'",
+    "$label = $env:COMPUTERNAME",
+    "if (-not $label) { $label = [System.Net.Dns]::GetHostName() }",
+    "npm install -g @lifeaitools/clauth@latest",
+    ["clauth setup", `--supabase-url ${shellSingleQuote(supabaseUrl)}`, `--anon-key ${shellSingleQuote(anonKey)}`, `--enrollment-code ${shellSingleQuote(enrollmentCode)}`, "--label \"$label\""].join(" "),
+    "clauth serve install",
+    "$self = $PSCommandPath",
+    "Start-Process powershell.exe -WindowStyle Hidden -ArgumentList @('-NoProfile','-Command',\"Start-Sleep -Seconds 2; & ('Remove' + '-Item') -LiteralPath '$self' -Force -ErrorAction SilentlyContinue\")",
+  ].join("\r\n");
+}
+
+function linuxScript({ supabaseUrl, anonKey, enrollmentCode }) {
+  return [
+    "#!/usr/bin/env sh",
+    "set -eu",
+    "label=$(hostname)",
+    "as_root() { if [ \"$(id -u)\" -eq 0 ]; then \"$@\"; elif command -v sudo >/dev/null; then sudo \"$@\"; else echo 'Root or sudo is required to install prerequisites.' >&2; exit 1; fi; }",
+    "install_prerequisites() {",
+    "  if command -v apt-get >/dev/null; then as_root apt-get update; as_root apt-get install -y nodejs npm openssl;",
+    "  elif command -v dnf >/dev/null; then as_root dnf install -y nodejs npm openssl;",
+    "  else echo 'Headless enrollment supports systemd hosts with apt-get or dnf. Install Node.js 18+, npm, and openssl, then rerun this script.' >&2; exit 1; fi",
+    "}",
+    "if ! command -v systemctl >/dev/null || ! command -v loginctl >/dev/null; then echo 'Headless enrollment requires systemd and loginctl.' >&2; exit 1; fi",
+    "if ! command -v node >/dev/null || ! command -v npm >/dev/null || ! command -v openssl >/dev/null; then install_prerequisites; fi",
+    "node_major=$(node -p \"process.versions.node.split('.')[0]\")",
+    "if [ \"$node_major\" -lt 18 ]; then echo 'Node.js 18+ is required.' >&2; exit 1; fi",
+    "if ! npm install -g @lifeaitools/clauth@latest; then as_root npm install -g @lifeaitools/clauth@latest; fi",
+    ["clauth setup", `--supabase-url ${posixShellQuote(supabaseUrl)}`, `--anon-key ${posixShellQuote(anonKey)}`, `--enrollment-code ${posixShellQuote(enrollmentCode)}`, '--label "$label"'].join(" "),
+    "user_name=$(id -un)",
+    "if loginctl enable-linger \"$user_name\"; then echo \"Linger enabled for $user_name.\"; elif as_root loginctl enable-linger \"$user_name\"; then echo \"Linger enabled for $user_name.\"; else echo 'Could not enable linger for unattended restart.' >&2; exit 1; fi",
+    "if ! test -t 0; then echo 'Headless enrollment requires an interactive TTY to set the vault password.' >&2; exit 1; fi",
+    "restore_echo() { stty echo 2>/dev/null || true; }",
+    "trap restore_echo EXIT HUP INT TERM",
+    "printf 'Re-enter the vault password to enable unattended restart: ' >&2",
+    "stty -echo",
+    "IFS= read -r vault_password",
+    "stty echo",
+    "trap - EXIT HUP INT TERM",
+    "printf '\\n' >&2",
+    "[ -n \"$vault_password\" ] || { echo 'A vault password is required for unattended restart.' >&2; exit 1; }",
+    "printf %s \"$vault_password\" | clauth serve install --pw-stdin",
+    "unset vault_password",
+    "rm -f -- \"$0\"",
+  ].join("\n");
+}
+
+export function writeEnrollmentScript({ supabaseUrl, anonKey, enrollmentCode, label, target = "windows", appDir } = {}) {
+  if (!["windows", "linux"].includes(target)) throw new Error(`Unsupported enrollment target: ${target}`);
+  const outputDir = appDir || (process.platform === "win32"
+    ? path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "clauth")
+    : path.join(os.homedir(), ".config", "clauth"));
+  fs.mkdirSync(outputDir, { recursive: true });
+  const scriptPath = path.join(outputDir, enrollmentScriptName(label, target));
+  const script = target === "linux"
+    ? linuxScript({ supabaseUrl, anonKey, enrollmentCode })
+    : windowsScript({ supabaseUrl, anonKey, enrollmentCode });
+  fs.writeFileSync(scriptPath, `${script}\n`, { encoding: "utf8", mode: target === "linux" ? 0o700 : undefined });
+  return scriptPath;
+}

package/cli/index.js

@@ -13,53 +13,11 @@ import { writeCredentialWithRecovery } from "./recovery.js";
 import os from "os";
 import fs from "fs";
 import path from "path";
+import { writeEnrollmentScript } from "./enrollment-script.js";
 
 const config = new Conf(getConfOptions());
 const VERSION = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
 
-function shellSingleQuote(value) {
-  return `'${String(value ?? "").replace(/'/g, "''")}'`;
-}
-
-function enrollmentScriptName(label) {
-  const slug = String(label || "new-computer")
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .slice(0, 40) || "new-computer";
-  return `clauth-enroll-${slug}.ps1`;
-}
-
-function writeEnrollmentScript({ supabaseUrl, anonKey, enrollmentCode, label }) {
-  const appDir = process.platform === "win32"
-    ? path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "clauth")
-    : path.join(os.homedir(), ".config", "clauth");
-  fs.mkdirSync(appDir, { recursive: true });
-  const scriptPath = path.join(appDir, enrollmentScriptName(label));
-  const script = [
-    "$ErrorActionPreference = 'Stop'",
-    "$label = $env:COMPUTERNAME",
-    "if (-not $label) { $label = [System.Net.Dns]::GetHostName() }",
-    "Write-Host 'Installing clauth...'",
-    "npm install -g @lifeaitools/clauth@latest",
-    "Write-Host 'Enrolling this computer with clauth...'",
-    [
-      "clauth setup",
-      `--supabase-url ${shellSingleQuote(supabaseUrl)}`,
-      `--anon-key ${shellSingleQuote(anonKey)}`,
-      `--enrollment-code ${shellSingleQuote(enrollmentCode)}`,
-      "--label \"$label\"",
-    ].join(" "),
-    "Write-Host 'Installing clauth startup service...'",
-    "clauth serve install",
-    "Write-Host 'clauth enrollment complete.'",
-    "$self = $PSCommandPath",
-    "Start-Process powershell.exe -WindowStyle Hidden -ArgumentList @('-NoProfile','-Command',\"Start-Sleep -Seconds 2; Remove-Item -LiteralPath '$self' -Force -ErrorAction SilentlyContinue\")",
-  ].join("\r\n");
-  fs.writeFileSync(scriptPath, `${script}\r\n`, "utf8");
-  return scriptPath;
-}
-
 // ============================================================
 // Password prompt helper
 // ============================================================
@@ -161,7 +119,7 @@ async function searchServices(auth, query, opts = {}) {
       .map(([field]) => field);
 
     let addressHints = [];
-    if (opts.addresses !== false && ADDRESS_KEY_TYPES.has(String(s.key_type || "").toLowerCase()) && s.vault_key) {
+    if (opts.addresses === true && ADDRESS_KEY_TYPES.has(String(s.key_type || "").toLowerCase()) && s.vault_key) {
       const secret = await api.retrieve(auth.password, auth.machineHash, auth.token, auth.timestamp, s.name);
       if (!secret.error) {
         addressHints = collectAddressHints(secret.value, s.key_type);
@@ -391,6 +349,7 @@ program
   .option("--label <label>", "Suggested label for the new computer")
   .option("--ttl-minutes <minutes>", "Enrollment lifetime, 5 to 1440 minutes", "60")
   .option("--install-id <id>", "Override install id; default is current machine's install id")
+  .option("--target <target>", "Enrollment target: windows or linux", "windows")
   .option("-p, --pw <password>", "Password (or will prompt)")
   .action(async (opts) => {
     console.log(chalk.cyan("\n🔐 clauth enroll\n"));
@@ -414,6 +373,7 @@ program
         anonKey,
         enrollmentCode: result.enrollment_code,
         label: opts.label,
+        target: opts.target,
       });
       spinner.succeed(chalk.green(`Enrollment created for install_id=${result.install_id}`));
       console.log("");
@@ -675,15 +635,15 @@ program
 
 program
   .command("search <query>")
-  .description("Search services by name, label, project, description, type, or redacted address hints")
+  .description("Search services by name, label, project, description, or type")
   .option("-p, --pw <password>")
   .option("--project <name>", "Filter by project scope")
-  .option("--no-addresses", "Skip address-bearing secret metadata scans")
+  .option("--addresses", "Also search redacted address hints from address-bearing secrets (may retrieve multiple secrets)")
   .action(async (query, opts) => {
     const auth = await getAuth(opts.pw);
     const spinner = ora("Searching services...").start();
     try {
-      const rows = await searchServices(auth, query, { project: opts.project, addresses: opts.addresses });
+      const rows = await searchServices(auth, query, { project: opts.project, addresses: opts.addresses === true });
       spinner.stop();
       console.log(chalk.cyan(`\n Search results for "${query}":\n`));
       if (!rows.length) {
@@ -786,9 +746,13 @@ program
   .addHelpText("after", `
 Examples:
   clauth scrub              Scrub the most recent (active) transcript
-  clauth scrub <file>       Scrub a specific .jsonl file
-  clauth scrub all          Scrub every transcript in ~/.claude/projects/
+  clauth scrub <file>       Scrub a specific file
+  clauth scrub all          Scrub every transcript + tool-result sidecar (.jsonl + .txt)
   clauth scrub all --force  Rescrub all files (ignore markers)
+  clauth scrub session      Scrub ONLY the ending session (transcript + sidecars); reads SessionEnd hook JSON on stdin
+
+  Redacts: built-in token patterns, your ~/.clauth/scrub-patterns.json,
+  and this machine's live vault values (best-effort via the daemon).
 `)
   .action(async (target, opts) => {
     await runScrub(target, opts);
@@ -1036,7 +1000,7 @@ program.addHelpText("beforeAll", chalk.cyan(`
 // ──────────────────────────────────────────────
 program
   .command("serve [action]")
-  .description("Manage localhost HTTP vault daemon and supervisor (start|stop|restart|ping|supervisor|install|uninstall)")
+  .description("Manage localhost HTTP vault daemon and supervisor (start|stop|restart|ping|supervisor|install|uninstall)")
   .option("--port <n>", "Port (default: 52437)")
   .option("-p, --pw <password>", "clauth password (optional — omit to start locked, unlock in browser)")
   .option("--services <list>", "Comma-separated service whitelist (default: all)")
@@ -1044,6 +1008,8 @@ program
   .option("--staged", "Start on staging port (52438) for blue-green verification before make-live")
   .option("--isolated", "Run on a non-live port without touching live PID files, browser, or boot-key credentials")
   .option("--from-boot-key", "Internal: password came from boot.key auto-unlock (degrade gracefully on verify failure)")
+  .option("--pw-env", "Internal: read the daemon password from CLAUTH_BOOT_PASSWORD")
+  .option("--pw-stdin", "Internal: read the installer password from standard input")
   .option("--action <action>", "Internal: action override for daemon child")
   .addHelpText("after", `
 Actions:
@@ -1052,9 +1018,9 @@ Actions:
   restart     Stop + start
   ping        Check if the daemon is running
   foreground  Run in foreground (Ctrl+C to stop) — default if no action given
-  mcp         Run as MCP stdio server for Claude Code (JSON-RPC over stdin/stdout)
-  supervisor  Run localhost-only supervisor control plane on port 52439
-  install     Store password securely + register auto-start service (cross-platform)
+  mcp         Run as MCP stdio server for Claude Code (JSON-RPC over stdin/stdout)
+  supervisor  Run localhost-only supervisor control plane on port 52439
+  install     Store password securely + register auto-start service (cross-platform)
               Windows: DPAPI + HKCU\\Run | macOS: Keychain + LaunchAgent | Linux: libsecret/openssl + systemd
   uninstall   Remove auto-start service + delete stored password
   upgrade     Blue-green upgrade: start new version on staging port, verify, then make live
@@ -1070,10 +1036,10 @@ Examples:
   clauth serve ping                      Check status
   clauth serve restart                   Restart (stays locked until browser unlock)
   clauth serve start --services github,vercel
-  clauth serve mcp                       Start MCP server for Claude Code
-  clauth serve mcp -p mypass             Start MCP server pre-unlocked
-  clauth serve supervisor                Start supervisor API on http://127.0.0.1:52439
-  clauth serve foreground --port 53137 --isolated
+  clauth serve mcp                       Start MCP server for Claude Code
+  clauth serve mcp -p mypass             Start MCP server pre-unlocked
+  clauth serve supervisor                Start supervisor API on http://127.0.0.1:52439
+  clauth serve foreground --port 53137 --isolated
                                           Start isolated passwordless server for route tests
   clauth serve install                   Set up auto-start on login (DPAPI/Keychain/libsecret)
   clauth serve install --tunnel host     Auto-start with Cloudflare Tunnel