@openape/apes 0.15.0 → 0.15.2

package/dist/cli.js

@@ -1820,7 +1820,7 @@ function buildDestroyTeardownScript(input) {
   return `#!/bin/bash
 # Best-effort teardown. set -u catches typos; we deliberately do NOT use -e
 # because pkill / launchctl are allowed to fail when the user has no live
-# sessions, and dscl -delete is allowed to fail when the user is already gone.
+# sessions.
 set -u
 
 NAME=${shQuote(name)}
@@ -1837,7 +1837,32 @@ if [ -d "$HOME_DIR" ] && [ "$HOME_DIR" != "/" ] && [ "$HOME_DIR" != "" ]; then
   rm -rf "$HOME_DIR"
 fi
 
-dscl . -delete "/Users/$NAME" 2>/dev/null || true
+# Delete the user record. \`sysadminctl -deleteUser\` is the canonical macOS
+# API and removes Open Directory metadata that \`dscl . -delete\` leaves
+# behind. Fall back to dscl if sysadminctl isn't available or rejects the
+# user. Surface a clear error if both fail \u2014 silent failure here is what
+# left orphaned dscl records on previous spawn/destroy round-trips.
+if command -v sysadminctl >/dev/null 2>&1; then
+  if sysadminctl -deleteUser "$NAME" 2>/dev/null; then
+    :
+  elif dscl . -read "/Users/$NAME" >/dev/null 2>&1; then
+    dscl . -delete "/Users/$NAME" || {
+      echo "ERROR: failed to delete user record /Users/$NAME" >&2
+      exit 1
+    }
+  fi
+elif dscl . -read "/Users/$NAME" >/dev/null 2>&1; then
+  dscl . -delete "/Users/$NAME" || {
+    echo "ERROR: failed to delete user record /Users/$NAME" >&2
+    exit 1
+  }
+fi
+
+# Verify the record is actually gone.
+if dscl . -read "/Users/$NAME" >/dev/null 2>&1; then
+  echo "ERROR: user record /Users/$NAME still exists after teardown" >&2
+  exit 1
+fi
 
 echo "OK destroyed $NAME"
 `;
@@ -1998,6 +2023,18 @@ ${consequences.join("\n")}`);
         throw new CliExit(0);
       }
     }
+    if (idpExists) {
+      const id = encodeURIComponent(idpAgent.email);
+      if (args.soft) {
+        await apiFetch(`/api/my-agents/${id}`, { method: "PATCH", body: { isActive: false }, idp });
+        consola18.success(`Deactivated IdP agent ${idpAgent.email}`);
+      } else {
+        await apiFetch(`/api/my-agents/${id}`, { method: "DELETE", idp });
+        consola18.success(`Deleted IdP agent ${idpAgent.email}`);
+      }
+    } else {
+      consola18.info("No IdP agent to remove (skipped).");
+    }
     if (osUserExists) {
       const apes = whichBinary("apes");
       if (!apes) {
@@ -2012,27 +2049,15 @@ ${consequences.join("\n")}`);
       try {
         const script = buildDestroyTeardownScript({ name, homeDir: `/Users/${name}` });
         writeFileSync(scriptPath, script, { mode: 448 });
-        consola18.start("Running teardown as root via `apes run --as root`\u2026");
-        consola18.info("You will be asked to approve the as=root grant in your DDISA inbox.");
-        execFileSync3(apes, ["run", "--as", "root", "--", "bash", scriptPath], { stdio: "inherit" });
+        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], { stdio: "inherit" });
       } finally {
         rmSync(scratch, { recursive: true, force: true });
       }
     } else if (!args["keep-os-user"] && isDarwin()) {
       consola18.info("No macOS user to remove (skipped).");
     }
-    if (idpExists) {
-      const id = encodeURIComponent(idpAgent.email);
-      if (args.soft) {
-        await apiFetch(`/api/my-agents/${id}`, { method: "PATCH", body: { isActive: false }, idp });
-        consola18.success(`Deactivated IdP agent ${idpAgent.email}`);
-      } else {
-        await apiFetch(`/api/my-agents/${id}`, { method: "DELETE", idp });
-        consola18.success(`Deleted IdP agent ${idpAgent.email}`);
-      }
-    } else {
-      consola18.info("No IdP agent to remove (skipped).");
-    }
     consola18.success(`Destroyed ${name}.`);
   }
 });
@@ -2347,9 +2372,9 @@ and try again.`
         hookScriptSource: includeClaudeHook ? BASH_VIA_APE_SHELL_HOOK_SOURCE : null
       });
       writeFileSync3(scriptPath, script, { mode: 448 });
-      consola21.start("Running privileged setup as root via `apes run --as root`\u2026");
-      consola21.info("You will be asked to approve the as=root grant in your DDISA inbox.");
-      execFileSync4(apes, ["run", "--as", "root", "--", "bash", scriptPath], { stdio: "inherit" });
+      consola21.start("Running privileged setup as root via `apes run --as root --wait`\u2026");
+      consola21.info("You will be asked to approve the as=root grant in your DDISA inbox; this command blocks until you do.");
+      execFileSync4(apes, ["run", "--as", "root", "--wait", "--", "bash", scriptPath], { stdio: "inherit" });
       consola21.success(`Agent ${name} spawned.`);
       console.log("");
       console.log("Run as the agent with:");
@@ -3626,7 +3651,7 @@ var mcpCommand = defineCommand32({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-QQI4MKTY.js");
+    const { startMcpServer } = await import("./server-25QMTVUR.js");
     await startMcpServer(transport, port);
   }
 });
@@ -4074,7 +4099,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "0.15.0" : "0.0.0";
+  const version = true ? "0.15.2" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -4276,10 +4301,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"0.15.0"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"0.15.2"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"0.15.0"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"0.15.2"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -4337,7 +4362,7 @@ var configCommand = defineCommand39({
 var main = defineCommand39({
   meta: {
     name: "apes",
-    version: "0.15.0",
+    version: "0.15.2",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {