@openape/apes 1.8.1 → 1.10.0

package/dist/cli.js

@@ -2702,23 +2702,9 @@ chown root:wheel ${shQuote(bridge.plistPath)}
 chmod 644 ${shQuote(bridge.plistPath)}
 `;
 }
-function buildBridgeBootstrapBlock(bridge, name) {
+function buildBridgeBootstrapBlock(bridge, _name) {
   if (!bridge) return "";
   return `
-echo "==> Installing bridge stack as ${name} via bun (one-time)\u2026"
-su - ${shQuote(name)} -c '
-set -euo pipefail
-if ! command -v bun >/dev/null 2>&1 && [ ! -x "$HOME/.bun/bin/bun" ]; then
-  echo "==> bun not found \u2014 installing via official installer"
-  curl -fsSL https://bun.sh/install | bash
-fi
-export PATH="$HOME/.bun/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:$HOME/.bun/install/global/bin"
-bun add -g @openape/chat-bridge @openape/apes
-'
-
-# Bootstrap into the system domain. Spawn already runs as root via
-# \`apes run --as root\`, so we have permission. Stale label is bootouted
-# first to make re-spawn idempotent.
 launchctl bootout "system/${bridge.plistLabel}" 2>/dev/null || true
 launchctl bootstrap system ${shQuote(bridge.plistPath)} || \\
   echo "warn: bridge bootstrap into system domain failed; check ${bridge.plistPath}"
@@ -4135,7 +4121,7 @@ async function handleInbound(msg, sessions) {
 }
 
 // src/commands/agents/spawn.ts
-import { execFileSync as execFileSync7 } from "child_process";
+import { execFileSync as execFileSync8 } from "child_process";
 import { mkdtempSync as mkdtempSync2, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
 import { join as join6 } from "path";
@@ -4152,7 +4138,8 @@ function escape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 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 pathDirs = (input.hostBinDirs && input.hostBinDirs.length > 0 ? input.hostBinDirs : ["/opt/homebrew/bin", "/usr/local/bin"]).join(":");
+  const pathLine = `    <key>PATH</key><string>${escape(pathDirs)}:/usr/bin:/bin</string>
 `;
   const agentUserLine = `    <key>AGENT_USER</key><string>${escape(input.userName)}</string>
 `;
@@ -4250,9 +4237,10 @@ function generateKeyPairInMemory() {
 }
 
 // src/lib/llm-bridge.ts
+import { execFileSync as execFileSync7 } from "child_process";
 import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join5 } from "path";
+import { dirname as dirname3, join as join5 } from "path";
 var PLIST_LABEL_PREFIX = "eco.hofmann.apes.bridge";
 function readLitellmEnv(envPath = join5(homedir8(), "litellm", ".env")) {
   if (!existsSync8(envPath)) return null;
@@ -4287,6 +4275,25 @@ function resolveBridgeConfig(opts) {
   }
   return { baseUrl, apiKey, model };
 }
+function captureHostBinDirs() {
+  const dirs = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const bin of ["node", "openape-chat-bridge", "apes"]) {
+    let resolved;
+    try {
+      resolved = execFileSync7("/usr/bin/which", [bin], { encoding: "utf8" }).trim();
+    } catch {
+      const installCmd = bin === "openape-chat-bridge" ? "npm i -g @openape/chat-bridge" : bin === "apes" ? "npm i -g @openape/apes" : "install Node.js (e.g. brew install node)";
+      throw new Error(`'${bin}' not found on host PATH. ${installCmd} before spawning agents \u2014 the bridge runtime resolves these at spawn time and bakes the dir into the agent's launchd plist.`);
+    }
+    const dir = dirname3(resolved);
+    if (!seen.has(dir)) {
+      seen.add(dir);
+      dirs.push(dir);
+    }
+  }
+  return dirs;
+}
 function bridgePlistLabel(agentName) {
   return `${PLIST_LABEL_PREFIX}.${agentName}`;
 }
@@ -4302,34 +4309,31 @@ LITELLM_BASE_URL=${cfg.baseUrl}
 LITELLM_API_KEY=${cfg.apiKey}
 ${modelLine}`;
 }
-function buildBridgeStartScript() {
+function buildBridgeStartScript(hostBinDirs) {
+  const pathLine = `export PATH="${hostBinDirs.join(":")}:/usr/bin:/bin"`;
   return `#!/usr/bin/env bash
 # Auto-generated by 'apes agents spawn --bridge'.
-# Slim launcher \u2014 install stack lives in spawn, not here.
+# Slim launcher \u2014 bridge stack lives on the host, no per-agent install.
 set -euo pipefail
 
-export PATH="$HOME/.bun/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin"
+${pathLine}
 
 # Token refresh is in-process via @openape/cli-auth's challenge-response
 # path (auth.json.key_path -> ~/.ssh/id_ed25519). No "apes login" needed
 # at boot \u2014 keeping start.sh slim avoids the rate-limit dance the old
 # refresh hit when KeepAlive crash-restarted the daemon every 1h.
 
-# M6 dropped the third-party LLM-runtime install + extension write
-# that used to live here. The bridge now spawns
-# \`apes agents serve --rpc\` directly (M8) which calls LiteLLM
-# itself, so no third-party extension config is needed.
-
 set -a
 . "$HOME/Library/Application Support/openape/bridge/.env"
 set +a
 exec openape-chat-bridge
 `;
 }
-function buildBridgePlist(agentName, homeDir, ownerEmail) {
+function buildBridgePlist(agentName, homeDir, ownerEmail, hostBinDirs) {
   const startScript = `${homeDir}/Library/Application Support/openape/bridge/start.sh`;
   const stdoutLog = `${homeDir}/Library/Logs/openape-chat-bridge.log`;
   const stderrLog = `${homeDir}/Library/Logs/openape-chat-bridge.err.log`;
+  const pathValue = `${hostBinDirs.join(":")}:/usr/bin:/bin`;
   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">
 <plist version="1.0">
@@ -4360,7 +4364,7 @@ function buildBridgePlist(agentName, homeDir, ownerEmail) {
         <key>HOME</key>
         <string>${homeDir}</string>
         <key>PATH</key>
-        <string>${homeDir}/.bun/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+        <string>${pathValue}</string>
         <key>OPENAPE_OWNER_EMAIL</key>
         <string>${ownerEmail}</string>
     </dict>
@@ -4498,20 +4502,22 @@ and try again.`
           cliBaseUrl: typeof args["bridge-base-url"] === "string" ? args["bridge-base-url"] : void 0,
           cliModel: typeof args["bridge-model"] === "string" ? args["bridge-model"] : void 0
         });
+        const hostBinDirs = captureHostBinDirs();
         return {
           plistLabel: bridgePlistLabel(name),
           plistPath: bridgePlistPath(name),
-          plistContent: buildBridgePlist(name, homeDir, auth.email),
-          startScript: buildBridgeStartScript(),
+          plistContent: buildBridgePlist(name, homeDir, auth.email, hostBinDirs),
+          startScript: buildBridgeStartScript(hostBinDirs),
           envFile: buildBridgeEnvFile(cfg)
         };
       })() : null;
       const troopPlistLabel = `openape.troop.sync.${name}`;
       const troopPlistPath = `/Library/LaunchDaemons/${troopPlistLabel}.plist`;
+      const troopBinDirs = bridge ? captureHostBinDirs() : captureHostBinDirs();
       const troop = {
         plistLabel: troopPlistLabel,
         plistPath: troopPlistPath,
-        plistContent: buildSyncPlist({ agentName: name, apesBin: apes, homeDir, userName: name })
+        plistContent: buildSyncPlist({ agentName: name, apesBin: apes, homeDir, userName: name, hostBinDirs: troopBinDirs })
       };
       const script = buildSpawnSetupScript({
         name,
@@ -4529,7 +4535,7 @@ and try again.`
       writeFileSync4(scriptPath, script, { mode: 448 });
       consola23.start("Running privileged setup as root via `apes run --as root --wait`\u2026");
       consola23.info("You will be asked to approve the as=root grant in your DDISA inbox; this command blocks until you do.");
-      execFileSync7(apes, ["run", "--as", "root", "--wait", "--", "bash", scriptPath], { stdio: "inherit" });
+      execFileSync8(apes, ["run", "--as", "root", "--wait", "--", "bash", scriptPath], { stdio: "inherit" });
       consola23.success(`Agent ${name} spawned.`);
       consola23.info(`\u{1F517} Troop: https://troop.openape.ai/agents/${name}`);
       if (args.bridge) {
@@ -4575,11 +4581,11 @@ import { defineCommand as defineCommand27 } from "citty";
 import consola24 from "consola";
 
 // src/lib/macos-host.ts
-import { execFileSync as execFileSync8 } from "child_process";
+import { execFileSync as execFileSync9 } from "child_process";
 import { hostname as hostname3 } from "os";
 function getHostId() {
   try {
-    const output = execFileSync8(
+    const output = execFileSync9(
       "/usr/sbin/ioreg",
       ["-d2", "-c", "IOPlatformExpertDevice"],
       { encoding: "utf8", timeout: 2e3 }
@@ -4728,7 +4734,7 @@ var agentsCommand = defineCommand28({
 import { defineCommand as defineCommand37 } from "citty";
 
 // src/commands/nest/authorize.ts
-import { execFileSync as execFileSync9 } from "child_process";
+import { execFileSync as execFileSync10 } from "child_process";
 import { existsSync as existsSync11, readFileSync as readFileSync10 } from "fs";
 import { join as join9 } from "path";
 import { defineCommand as defineCommand30 } from "citty";
@@ -4884,7 +4890,7 @@ var authorizeNestCommand = defineCommand30({
       cmdArgs.push("--expires-in", args["expires-in"]);
     }
     try {
-      execFileSync9("apes", cmdArgs, { stdio: "inherit" });
+      execFileSync10("apes", cmdArgs, { stdio: "inherit" });
     } catch (err) {
       throw new CliError(err instanceof Error ? err.message : String(err));
     }
@@ -5029,10 +5035,10 @@ var destroyNestCommand = defineCommand31({
 });
 
 // src/commands/nest/install.ts
-import { execFileSync as execFileSync10 } from "child_process";
+import { execFileSync as execFileSync11 } from "child_process";
 import { existsSync as existsSync12, mkdirSync as mkdirSync5, readFileSync as readFileSync11, writeFileSync as writeFileSync7 } from "fs";
 import { homedir as homedir11, userInfo as userInfo2 } from "os";
-import { dirname as dirname3, join as join10 } from "path";
+import { dirname as dirname4, join as join10 } from "path";
 import { defineCommand as defineCommand32 } from "citty";
 import consola29 from "consola";
 
@@ -5129,7 +5135,7 @@ function buildPlist(args) {
   <key>EnvironmentVariables</key>
   <dict>
     <key>HOME</key><string>${escape2(args.nestHome)}</string>
-    <key>PATH</key><string>${escape2(args.userHome)}/.bun/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+    <key>PATH</key><string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
     <key>OPENAPE_NEST_PORT</key><string>${args.port}</string>
     <key>OPENAPE_APES_BIN</key><string>${escape2(args.apesBin)}</string>
   </dict>
@@ -5143,7 +5149,7 @@ function buildPlist(args) {
 }
 function installAdapter2() {
   const target = join10(homedir11(), ".openape", "shapes", "adapters", "apes-agents.toml");
-  mkdirSync5(dirname3(target), { recursive: true });
+  mkdirSync5(dirname4(target), { recursive: true });
   let existing = "";
   try {
     existing = readFileSync11(target, "utf8");
@@ -5154,6 +5160,19 @@ function installAdapter2() {
   consola29.success(`Wrote shapes adapter ${target}`);
   return true;
 }
+function writeBridgeModelDefault(model) {
+  const envDir = join10(homedir11(), "litellm");
+  const envFile = join10(envDir, ".env");
+  mkdirSync5(envDir, { recursive: true });
+  let lines = [];
+  if (existsSync12(envFile)) {
+    lines = readFileSync11(envFile, "utf8").split("\n").filter((l) => !l.startsWith("APE_CHAT_BRIDGE_MODEL="));
+  }
+  lines.push(`APE_CHAT_BRIDGE_MODEL=${model}`);
+  while (lines.length > 0 && lines.at(-1).trim() === "") lines.pop();
+  writeFileSync7(envFile, `${lines.join("\n")}
+`, { mode: 384 });
+}
 function findBinary(name) {
   for (const dir of [
     join10(homedir11(), ".bun", "bin"),
@@ -5175,6 +5194,10 @@ var installNestCommand = defineCommand32({
     port: {
       type: "string",
       description: "Port for the nest HTTP API (default: 9091)"
+    },
+    "bridge-model": {
+      type: "string",
+      description: "Default model for chat-bridge spawns. Persisted as APE_CHAT_BRIDGE_MODEL in ~/litellm/.env so every `apes [nest|agents] spawn --bridge` picks it up automatically. Common values: `gpt-5.4` (ChatGPT-only LiteLLM proxy), `claude-haiku-4-5` (Anthropic-only). Re-run install with a new value to overwrite."
     }
   },
   async run({ args }) {
@@ -5189,6 +5212,10 @@ var installNestCommand = defineCommand32({
     consola29.info(`  nest binary: ${nestBin}`);
     consola29.info(`  apes binary: ${apesBin}`);
     consola29.info(`  HTTP port:   ${port}`);
+    if (typeof args["bridge-model"] === "string" && args["bridge-model"]) {
+      writeBridgeModelDefault(args["bridge-model"]);
+      consola29.success(`Default bridge model set to ${args["bridge-model"]} (in ~/litellm/.env)`);
+    }
     installAdapter2();
     mkdirSync5(join10(homeDir, "Library", "LaunchAgents"), { recursive: true });
     mkdirSync5(NEST_DATA_DIR, { recursive: true });
@@ -5206,10 +5233,10 @@ var installNestCommand = defineCommand32({
     }
     const uid = userInfo2().uid;
     try {
-      execFileSync10("/bin/launchctl", ["bootout", `gui/${uid}/${PLIST_LABEL}`], { stdio: "ignore" });
+      execFileSync11("/bin/launchctl", ["bootout", `gui/${uid}/${PLIST_LABEL}`], { stdio: "ignore" });
     } catch {
     }
-    execFileSync10("/bin/launchctl", ["bootstrap", `gui/${uid}`, plistPath()], { stdio: "inherit" });
+    execFileSync11("/bin/launchctl", ["bootstrap", `gui/${uid}`, plistPath()], { stdio: "inherit" });
     consola29.success(`Nest daemon bootstrapped \u2014 http://127.0.0.1:${port}`);
     consola29.info("");
     consola29.info("Next steps for zero-prompt spawn \u2014 both one-time:");
@@ -5372,7 +5399,7 @@ var statusNestCommand = defineCommand35({
 });
 
 // src/commands/nest/uninstall.ts
-import { execFileSync as execFileSync11 } from "child_process";
+import { execFileSync as execFileSync12 } from "child_process";
 import { existsSync as existsSync13, unlinkSync } from "fs";
 import { homedir as homedir12, userInfo as userInfo3 } from "os";
 import { join as join11 } from "path";
@@ -5388,7 +5415,7 @@ var uninstallNestCommand = defineCommand36({
     const uid = userInfo3().uid;
     const path2 = join11(homedir12(), "Library", "LaunchAgents", `${PLIST_LABEL2}.plist`);
     try {
-      execFileSync11("/bin/launchctl", ["bootout", `gui/${uid}/${PLIST_LABEL2}`], { stdio: "ignore" });
+      execFileSync12("/bin/launchctl", ["bootout", `gui/${uid}/${PLIST_LABEL2}`], { stdio: "ignore" });
       consola33.success("Nest daemon stopped");
     } catch {
       consola33.info("Nest daemon was not loaded");
@@ -5943,7 +5970,7 @@ var adapterCommand = defineCommand42({
 });
 
 // src/commands/run.ts
-import { execFileSync as execFileSync12 } from "child_process";
+import { execFileSync as execFileSync13 } from "child_process";
 import { hostname as hostname6 } from "os";
 import { basename } from "path";
 import { defineCommand as defineCommand43 } from "citty";
@@ -6221,7 +6248,7 @@ function execShellCommand(command) {
     throw new CliError("No command to execute");
   try {
     const { APES_SHELL_WRAPPER: _wrapperMarker, ...inheritedEnv } = process.env;
-    execFileSync12(command[0], command.slice(1), {
+    execFileSync13(command[0], command.slice(1), {
       stdio: "inherit",
       env: inheritedEnv
     });
@@ -6373,7 +6400,7 @@ async function runAudienceMode(audience, action, args) {
     consola38.info(`Executing: ${command.join(" ")}`);
     try {
       const { APES_SHELL_WRAPPER: _wrapperMarker, ...inheritedEnv } = process.env;
-      execFileSync12(args["escapes-path"] || "escapes", ["--grant", authz_jwt, "--", ...command], {
+      execFileSync13(args["escapes-path"] || "escapes", ["--grant", authz_jwt, "--", ...command], {
         stdio: "inherit",
         env: inheritedEnv
       });
@@ -6426,7 +6453,7 @@ import { spawn } from "child_process";
 import { mkdtempSync as mkdtempSync3, rmSync as rmSync3, writeFileSync as writeFileSync8 } from "fs";
 import { createRequire } from "module";
 import { tmpdir as tmpdir3 } from "os";
-import { dirname as dirname4, join as join12, resolve as resolve4 } from "path";
+import { dirname as dirname5, join as join12, resolve as resolve4 } from "path";
 var require2 = createRequire(import.meta.url);
 function findProxyBin() {
   const pkgPath = require2.resolve("@openape/proxy/package.json");
@@ -6435,7 +6462,7 @@ function findProxyBin() {
   if (!binRel) {
     throw new Error("@openape/proxy is missing the openape-proxy bin entry");
   }
-  return resolve4(dirname4(pkgPath), binRel);
+  return resolve4(dirname5(pkgPath), binRel);
 }
 async function startEphemeralProxy(configToml) {
   const tmpDir = mkdtempSync3(join12(tmpdir3(), "openape-proxy-"));
@@ -6875,7 +6902,7 @@ var mcpCommand = defineCommand49({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-EKUVZDZC.js");
+    const { startMcpServer } = await import("./server-AZOEKT55.js");
     await startMcpServer(transport, port);
   }
 });
@@ -6883,7 +6910,7 @@ var mcpCommand = defineCommand49({
 // src/commands/init/index.ts
 import { existsSync as existsSync14, copyFileSync, writeFileSync as writeFileSync9 } from "fs";
 import { randomBytes } from "crypto";
-import { execFileSync as execFileSync13 } from "child_process";
+import { execFileSync as execFileSync14 } from "child_process";
 import { join as join13 } from "path";
 import { defineCommand as defineCommand50 } from "citty";
 import consola42 from "consola";
@@ -6895,11 +6922,11 @@ async function downloadTemplate(repo, targetDir) {
 function installDeps(dir) {
   const hasLockFile = (name) => existsSync14(join13(dir, name));
   if (hasLockFile("pnpm-lock.yaml")) {
-    execFileSync13("pnpm", ["install"], { cwd: dir, stdio: "inherit" });
+    execFileSync14("pnpm", ["install"], { cwd: dir, stdio: "inherit" });
   } else if (hasLockFile("bun.lockb")) {
-    execFileSync13("bun", ["install"], { cwd: dir, stdio: "inherit" });
+    execFileSync14("bun", ["install"], { cwd: dir, stdio: "inherit" });
   } else {
-    execFileSync13("npm", ["install"], { cwd: dir, stdio: "inherit" });
+    execFileSync14("npm", ["install"], { cwd: dir, stdio: "inherit" });
   }
 }
 async function promptChoice(message, choices) {
@@ -7513,7 +7540,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "1.8.1" : "0.0.0";
+  const version = true ? "1.10.0" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -7786,10 +7813,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"1.8.1"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"1.10.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"1.8.1"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"1.10.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -7847,7 +7874,7 @@ var configCommand = defineCommand61({
 var main = defineCommand61({
   meta: {
     name: "apes",
-    version: "1.8.1",
+    version: "1.10.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -7904,7 +7931,7 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
-await maybeWarnStaleVersion("1.8.1").catch(() => {
+await maybeWarnStaleVersion("1.10.0").catch(() => {
 });
 runMain(main).catch((err) => {
   if (err instanceof CliExit) {