@openape/apes 0.24.0 → 0.25.0

package/dist/cli.js

@@ -2087,6 +2087,60 @@ function isShellRegistered(shellPath) {
   return content.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#")).includes(shellPath);
 }
 
+// src/lib/silent-password.ts
+function readPasswordSilent(prompt) {
+  if (!process.stdin.isTTY) {
+    return Promise.reject(new CliError(
+      "No TTY available for the silent password prompt. Set APES_ADMIN_PASSWORD in the environment instead."
+    ));
+  }
+  return new Promise((resolve4, reject) => {
+    process.stdout.write(prompt);
+    const wasRaw = process.stdin.isRaw ?? false;
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.setEncoding("utf8");
+    let buf = "";
+    let cleanupFn;
+    const cleanup = () => cleanupFn?.();
+    const onData = (chunk) => {
+      for (const ch of chunk) {
+        const code = ch.charCodeAt(0);
+        if (ch === "\r" || ch === "\n") {
+          cleanup();
+          process.stdout.write("\n");
+          resolve4(buf);
+          return;
+        }
+        if (code === 3) {
+          cleanup();
+          process.stdout.write("\n");
+          reject(new CliError("Aborted by user (Ctrl-C)."));
+          return;
+        }
+        if (code === 4 && buf.length === 0) {
+          cleanup();
+          process.stdout.write("\n");
+          reject(new CliError("Aborted by user (Ctrl-D)."));
+          return;
+        }
+        if (code === 127 || code === 8) {
+          if (buf.length > 0) buf = buf.slice(0, -1);
+          continue;
+        }
+        if (code < 32) continue;
+        buf += ch;
+      }
+    };
+    cleanupFn = () => {
+      process.stdin.removeListener("data", onData);
+      process.stdin.setRawMode(wasRaw);
+      process.stdin.pause();
+    };
+    process.stdin.on("data", onData);
+  });
+}
+
 // src/commands/agents/destroy.ts
 var destroyAgentCommand = defineCommand20({
   meta: {
@@ -2166,25 +2220,21 @@ ${consequences.join("\n")}`);
       consola18.info("No IdP agent to remove (skipped).");
     }
     if (osUserExists) {
-      const apes = whichBinary("apes");
-      if (!apes) {
-        throw new CliError("`apes` not found on PATH. Install @openape/apes globally first.");
-      }
-      const escapes = whichBinary("escapes");
-      if (!escapes) {
-        throw new CliError("`escapes` not found on PATH; OS teardown requires escapes.");
+      const sudo = whichBinary("sudo");
+      if (!sudo) {
+        throw new CliError("`sudo` not found on PATH; required for OS teardown.");
       }
       const adminUser = userInfo().username;
-      const adminPassword = await collectAdminPassword({ adminUser, force: !!args.force });
+      const adminPassword = await collectAdminPassword({ adminUser });
       const scratch = mkdtempSync(join2(tmpdir(), `apes-destroy-${name}-`));
       const scriptPath = join2(scratch, "teardown.sh");
       try {
         const script = buildDestroyTeardownScript({ name, homeDir: `/Users/${name}`, adminUser });
         writeFileSync(scriptPath, script, { mode: 448 });
-        consola18.start("Running teardown as root via `apes run --as root --wait`\u2026");
-        consola18.info("You will be asked to approve the as=root grant in your DDISA inbox; this command blocks until you do.");
-        execFileSync3(apes, ["run", "--as", "root", "--wait", "--", "bash", scriptPath], {
+        consola18.start("Running teardown via sudo\u2026");
+        execFileSync3(sudo, ["-S", "--prompt=", "--", "bash", scriptPath], {
           input: `${adminPassword}
+${adminPassword}
 `,
           stdio: ["pipe", "inherit", "inherit"]
         });
@@ -2200,14 +2250,8 @@ ${consequences.join("\n")}`);
 async function collectAdminPassword(opts) {
   const fromEnv = process.env.APES_ADMIN_PASSWORD;
   if (fromEnv && fromEnv.length > 0) return fromEnv;
-  if (!process.stdin.isTTY) {
-    throw new CliError(
-      `Admin password required for sysadminctl -deleteUser. No TTY available for the silent prompt; set APES_ADMIN_PASSWORD in the environment (local admin password for ${opts.adminUser}). The teardown reads it from stdin and never stores it.`
-    );
-  }
-  consola18.info(`Local admin password for ${opts.adminUser} (used for sysadminctl -deleteUser; not stored):`);
-  const pw = await consola18.prompt("Admin password", { type: "text", mask: "*" });
-  if (typeof pw === "symbol" || !pw || pw.length === 0) {
+  const pw = await readPasswordSilent(`Password for ${opts.adminUser}: `);
+  if (pw.length === 0) {
     throw new CliExit(0);
   }
   return pw;
@@ -4094,7 +4138,7 @@ var mcpCommand = defineCommand32({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-J4H4UV25.js");
+    const { startMcpServer } = await import("./server-3HW3TBY5.js");
     await startMcpServer(transport, port);
   }
 });
@@ -4732,7 +4776,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "0.24.0" : "0.0.0";
+  const version = true ? "0.25.0" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -5005,10 +5049,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"0.24.0"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"0.25.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"0.24.0"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"0.25.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -5066,7 +5110,7 @@ var configCommand = defineCommand44({
 var main = defineCommand44({
   meta: {
     name: "apes",
-    version: "0.24.0",
+    version: "0.25.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -5121,7 +5165,7 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
-await maybeWarnStaleVersion("0.24.0").catch(() => {
+await maybeWarnStaleVersion("0.25.0").catch(() => {
 });
 runMain(main).catch((err) => {
   if (err instanceof CliExit) {