@openape/apes 1.14.0 → 1.15.0

package/dist/cli.js

@@ -2643,6 +2643,12 @@ if dscl . -read "/Users/$NAME" >/dev/null 2>&1; then
   exit 1
 fi
 
+# Phase G: agent home dirs live under /var/openape/homes/, not
+# /Users/. Pre-create the parent and chmod it world-traversable
+# so per-agent dirs can be reached by their respective uids.
+mkdir -p /var/openape/homes
+chmod 755 /var/openape/homes
+
 # Pick the next free UID in the [200, 500) hidden service-account range.
 # Starts the running max at 199 so an empty range yields 200 after the
 # floor check; otherwise NEXT_UID = max(existing in-range UIDs) + 1.
@@ -2846,10 +2852,12 @@ function readMacOSUser(name) {
   }
   const uidMatch = output.match(/UniqueID:\s*(\d+)/);
   const shellMatch = output.match(/UserShell:\s*(\S.*)$/m);
+  const homeMatch = output.match(/NFSHomeDirectory:\s*(\S.*)$/m);
   return {
     name,
     uid: uidMatch ? Number.parseInt(uidMatch[1], 10) : null,
-    shell: shellMatch ? shellMatch[1].trim() : null
+    shell: shellMatch ? shellMatch[1].trim() : null,
+    homeDir: homeMatch ? homeMatch[1].trim() : null
   };
 }
 function listMacOSUserNames() {
@@ -3107,14 +3115,18 @@ var destroyAgentCommand = defineCommand21({
     const owned = await apiFetch("/api/my-agents", { idp });
     const idpAgent = owned.find((u) => u.name === name);
     const idpExists = idpAgent !== void 0;
-    const osUserExists = !args["keep-os-user"] && isDarwin() && readMacOSUser(name) !== null;
+    const osUser = isDarwin() ? readMacOSUser(name) : null;
+    const osUserExists = !args["keep-os-user"] && osUser !== null;
     if (!idpExists && !osUserExists) {
       consola19.info(`Nothing to destroy: no IdP agent and no OS user named "${name}".`);
       return;
     }
     if (!args.force) {
       const consequences = [];
-      if (osUserExists) consequences.push(`\u2022 Remove macOS user ${name} and rm -rf /Users/${name}`);
+      if (osUserExists) {
+        const home = osUser?.homeDir ?? `/Users/${name}`;
+        consequences.push(`\u2022 Remove macOS user ${name} and rm -rf ${home}`);
+      }
       if (idpExists) {
         consequences.push(args.soft ? `\u2022 Deactivate IdP agent ${idpAgent.email} (PATCH isActive=false)` : `\u2022 Hard-delete IdP agent ${idpAgent.email} and all its SSH keys`);
       }
@@ -3152,7 +3164,8 @@ ${consequences.join("\n")}`);
       const scratch = mkdtempSync(join3(tmpdir(), `apes-destroy-${name}-`));
       const scriptPath = join3(scratch, "teardown.sh");
       try {
-        const script = buildDestroyTeardownScript({ name, homeDir: `/Users/${name}`, adminUser });
+        const homeDir = osUser?.homeDir ?? `/Users/${name}`;
+        const script = buildDestroyTeardownScript({ name, homeDir, adminUser });
         writeFileSync2(scriptPath, script, { mode: 448 });
         consola19.start("Running teardown via sudo\u2026");
         execFileSync4(sudo, ["-S", "--prompt=", "--", "bash", scriptPath], {
@@ -3215,13 +3228,17 @@ var listAgentsCommand = defineCommand22({
     const all = await apiFetch("/api/my-agents", { idp });
     const filtered = args["include-inactive"] ? all : all.filter((u) => u.isActive !== false);
     const osUsers = isDarwin() ? listMacOSUserNames() : /* @__PURE__ */ new Set();
-    const home = (name) => `/Users/${name}`;
+    const homeOf = (name) => {
+      if (!osUsers.has(name)) return null;
+      const u = readMacOSUser(name);
+      return u?.homeDir ?? `/Users/${name}`;
+    };
     const rows = filtered.map((u) => ({
       name: u.name,
       email: u.email,
       isActive: u.isActive !== false,
       osUser: osUsers.has(u.name),
-      home: osUsers.has(u.name) ? home(u.name) : null
+      home: homeOf(u.name)
     }));
     if (args.json) {
       process.stdout.write(`${JSON.stringify(rows, null, 2)}
@@ -4029,7 +4046,7 @@ and try again.`
     if (existing) {
       throw new CliError(`macOS user "${name}" already exists (uid=${existing.uid ?? "?"}). Refusing to overwrite.`);
     }
-    const homeDir = `/Users/${name}`;
+    const homeDir = `/var/openape/homes/${name}`;
     const scratch = mkdtempSync2(join7(tmpdir2(), `apes-spawn-${name}-`));
     const scriptPath = join7(scratch, "setup.sh");
     try {
@@ -6306,7 +6323,7 @@ var mcpCommand = defineCommand48({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-P2XXAHS5.js");
+    const { startMcpServer } = await import("./server-A24A4ILW.js");
     await startMcpServer(transport, port);
   }
 });
@@ -6944,7 +6961,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "1.14.0" : "0.0.0";
+  const version = true ? "1.15.0" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -7217,10 +7234,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"1.14.0"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"1.15.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"1.14.0"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"1.15.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -7278,7 +7295,7 @@ var configCommand = defineCommand60({
 var main = defineCommand60({
   meta: {
     name: "apes",
-    version: "1.14.0",
+    version: "1.15.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -7335,7 +7352,7 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
-await maybeWarnStaleVersion("1.14.0").catch(() => {
+await maybeWarnStaleVersion("1.15.0").catch(() => {
 });
 runMain(main).catch((err) => {
   if (err instanceof CliExit) {