@openape/apes 1.2.0 → 1.2.1

package/dist/cli.js

@@ -3343,16 +3343,18 @@ function escape(s) {
 }
 function buildSyncPlist(input) {
   const pathLine = `    <key>PATH</key><string>${escape(input.homeDir)}/.bun/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+`;
+  const agentUserLine = `    <key>AGENT_USER</key><string>${escape(input.userName)}</string>
 `;
   const envBlock = input.troopUrl ? `  <key>EnvironmentVariables</key>
   <dict>
     <key>HOME</key><string>${escape(input.homeDir)}</string>
-${pathLine}    <key>OPENAPE_TROOP_URL</key><string>${escape(input.troopUrl)}</string>
+${pathLine}${agentUserLine}    <key>OPENAPE_TROOP_URL</key><string>${escape(input.troopUrl)}</string>
   </dict>
 ` : `  <key>EnvironmentVariables</key>
   <dict>
     <key>HOME</key><string>${escape(input.homeDir)}</string>
-${pathLine}  </dict>
+${pathLine}${agentUserLine}  </dict>
 `;
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -3360,8 +3362,6 @@ ${pathLine}  </dict>
 <dict>
   <key>Label</key>
   <string>${escape(syncPlistLabel(input.agentName))}</string>
-  <key>UserName</key>
-  <string>${escape(input.userName)}</string>
   <key>ProgramArguments</key>
   <array>
     <string>${escape(input.apesBin)}</string>
@@ -3750,8 +3750,8 @@ async function resolveClaudeToken(opts) {
 }
 
 // src/commands/agents/sync.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "fs";
-import { homedir as homedir10 } from "os";
+import { chownSync, existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync10, statSync, writeFileSync as writeFileSync6 } from "fs";
+import { homedir as homedir9 } from "os";
 import { join as join8 } from "path";
 import { defineCommand as defineCommand27 } from "citty";
 import consola24 from "consola";
@@ -3759,11 +3759,11 @@ import consola24 from "consola";
 // src/lib/launchd-reconcile.ts
 import { execFileSync as execFileSync8 } from "child_process";
 import { mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync9, unlinkSync, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir9, userInfo as userInfo2 } from "os";
+import { userInfo as userInfo2 } from "os";
 import { join as join7 } from "path";
 var PLIST_PREFIX = "openape.troop.";
 function plistDir() {
-  return join7(homedir9(), "Library", "LaunchAgents");
+  return "/Library/LaunchDaemons";
 }
 function plistPath(agentName, taskId) {
   return join7(plistDir(), `${PLIST_PREFIX}${agentName}.${taskId}.plist`);
@@ -3848,6 +3848,8 @@ ${calendarBlocks}
 <dict>
   <key>Label</key>
   <string>${escape2(input.label)}</string>
+  <key>UserName</key>
+  <string>${escape2(input.userName)}</string>
   <key>ProgramArguments</key>
   <array>
     <string>${escape2(input.apesBin)}</string>
@@ -3861,6 +3863,8 @@ ${calendarBlocks}
   <dict>
     <key>HOME</key>
     <string>${escape2(input.homeDir)}</string>
+    <key>PATH</key>
+    <string>${escape2(input.homeDir)}/.bun/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
   </dict>
 ${calendarKey}
   <key>StandardOutPath</key>
@@ -3877,22 +3881,20 @@ function buildPlistContent(args) {
     apesBin: args.apesBin,
     taskId: args.task.taskId,
     schedule: cronToSchedule(args.task.cron),
-    homeDir: args.homeDir
+    homeDir: args.homeDir,
+    userName: args.userName ?? userInfo2().username
   });
 }
-function uid() {
-  return userInfo2().uid;
-}
 function bootstrap(label, path2) {
   try {
-    execFileSync8("/bin/launchctl", ["bootout", `gui/${uid()}/${label}`], { stdio: "ignore" });
+    execFileSync8("/bin/launchctl", ["bootout", `system/${label}`], { stdio: "ignore" });
   } catch {
   }
-  execFileSync8("/bin/launchctl", ["bootstrap", `gui/${uid()}`, path2], { stdio: "ignore" });
+  execFileSync8("/bin/launchctl", ["bootstrap", "system", path2], { stdio: "ignore" });
 }
 function bootout(label) {
   try {
-    execFileSync8("/bin/launchctl", ["bootout", `gui/${uid()}/${label}`], { stdio: "ignore" });
+    execFileSync8("/bin/launchctl", ["bootout", `system/${label}`], { stdio: "ignore" });
   } catch {
   }
 }
@@ -3921,7 +3923,8 @@ function reconcile(input) {
       agentName: input.agentName,
       apesBin: input.apesBin,
       homeDir: input.homeDir,
-      task
+      task,
+      userName: input.userName
     });
     let existingContent = "";
     try {
@@ -3968,8 +3971,8 @@ function getHostname() {
 }
 
 // src/commands/agents/sync.ts
-var AUTH_PATH3 = join8(homedir10(), ".config", "apes", "auth.json");
-var TASK_CACHE_DIR2 = join8(homedir10(), ".openape", "agent", "tasks");
+var AUTH_PATH3 = join8(homedir9(), ".config", "apes", "auth.json");
+var TASK_CACHE_DIR2 = join8(homedir9(), ".openape", "agent", "tasks");
 function readAuthJson() {
   if (!existsSync9(AUTH_PATH3)) {
     throw new CliError(
@@ -4041,26 +4044,54 @@ var syncAgentCommand = defineCommand27({
     consola24.info(sync.first_sync ? "\u2713 first sync \u2014 agent registered" : "\u2713 presence updated");
     const { system_prompt: systemPrompt, tasks } = await client.listTasks();
     consola24.info(`Pulled ${tasks.length} task${tasks.length === 1 ? "" : "s"}`);
-    const agentDir = join8(homedir10(), ".openape", "agent");
+    let agentUid = null;
+    let agentGid = null;
+    if (process.geteuid?.() === 0) {
+      try {
+        const homeStat = statSync(homedir9());
+        agentUid = homeStat.uid;
+        agentGid = homeStat.gid;
+      } catch {
+      }
+    }
+    function chownToAgent(path2) {
+      if (agentUid !== null && agentGid !== null) {
+        try {
+          chownSync(path2, agentUid, agentGid);
+        } catch {
+        }
+      }
+    }
+    const agentDir = join8(homedir9(), ".openape", "agent");
     mkdirSync4(agentDir, { recursive: true });
+    chownToAgent(join8(homedir9(), ".openape"));
+    chownToAgent(agentDir);
+    const agentJsonPath = join8(agentDir, "agent.json");
     writeFileSync6(
-      join8(agentDir, "agent.json"),
+      agentJsonPath,
       `${JSON.stringify({ systemPrompt }, null, 2)}
 `,
       { mode: 384 }
     );
+    chownToAgent(agentJsonPath);
     mkdirSync4(TASK_CACHE_DIR2, { recursive: true });
+    chownToAgent(TASK_CACHE_DIR2);
     for (const task of tasks) {
       const path2 = join8(TASK_CACHE_DIR2, `${task.taskId}.json`);
       writeFileSync6(path2, `${JSON.stringify(task, null, 2)}
 `, { mode: 384 });
+      chownToAgent(path2);
     }
     const apesBin = findApesBin();
     const result = reconcile({
       agentName,
       apesBin,
-      homeDir: homedir10(),
-      desired: tasks
+      homeDir: homedir9(),
+      desired: tasks,
+      // Sync runs as root in production — pass the agent username
+      // explicitly for the UserName plist key (launchd will then run
+      // each task daemon AS the agent, not as root).
+      userName: process.env.AGENT_USER || void 0
     });
     if (result.added.length) consola24.success(`launchd: added ${result.added.join(", ")}`);
     if (result.updated.length) consola24.success(`launchd: updated ${result.updated.join(", ")}`);
@@ -5349,7 +5380,7 @@ var mcpCommand = defineCommand36({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-6OLIVAHI.js");
+    const { startMcpServer } = await import("./server-YDC3S4PC.js");
     await startMcpServer(transport, port);
   }
 });
@@ -5987,7 +6018,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "1.2.0" : "0.0.0";
+  const version = true ? "1.2.1" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -6181,12 +6212,12 @@ var workflowsCommand = defineCommand47({
 
 // src/version-check.ts
 import { existsSync as existsSync13, mkdirSync as mkdirSync5, readFileSync as readFileSync13, writeFileSync as writeFileSync9 } from "fs";
-import { homedir as homedir11 } from "os";
+import { homedir as homedir10 } from "os";
 import { join as join11 } from "path";
 import consola38 from "consola";
 var PACKAGE_NAME = "@openape/apes";
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
-var CACHE_FILE = join11(homedir11(), ".config", "apes", ".version-check.json");
+var CACHE_FILE = join11(homedir10(), ".config", "apes", ".version-check.json");
 function readCache() {
   if (!existsSync13(CACHE_FILE)) return null;
   try {
@@ -6197,7 +6228,7 @@ function readCache() {
 }
 function writeCache(entry) {
   try {
-    const dir = join11(homedir11(), ".config", "apes");
+    const dir = join11(homedir10(), ".config", "apes");
     if (!existsSync13(dir)) mkdirSync5(dir, { recursive: true, mode: 448 });
     writeFileSync9(CACHE_FILE, JSON.stringify(entry), { mode: 384 });
   } catch {
@@ -6260,10 +6291,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"1.2.0"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"1.2.1"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"1.2.0"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"1.2.1"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -6321,7 +6352,7 @@ var configCommand = defineCommand48({
 var main = defineCommand48({
   meta: {
     name: "apes",
-    version: "1.2.0",
+    version: "1.2.1",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -6376,7 +6407,7 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
-await maybeWarnStaleVersion("1.2.0").catch(() => {
+await maybeWarnStaleVersion("1.2.1").catch(() => {
 });
 runMain(main).catch((err) => {
   if (err instanceof CliExit) {