@openape/apes 1.18.0 → 1.20.0

package/dist/cli.js

@@ -1375,7 +1375,19 @@ var delegateCommand = defineCommand14({
       body.scopes = args.scopes.split(",").map((s) => s.trim());
     }
     if (args.expires) {
-      body.expires_at = args.expires;
+      if (args.approval === "timed") {
+        const expiresMs = Date.parse(args.expires);
+        if (Number.isNaN(expiresMs)) {
+          throw new CliError(`Invalid --expires value: "${args.expires}" is not an ISO 8601 timestamp.`);
+        }
+        const durationSec = Math.floor((expiresMs - Date.now()) / 1e3);
+        if (durationSec <= 0) {
+          throw new CliError(`Invalid --expires value: "${args.expires}" is in the past.`);
+        }
+        body.duration = durationSec;
+      } else {
+        body.expires_at = args.expires;
+      }
     }
     const result = await apiFetch(delegationsUrl, {
       method: "POST",
@@ -2770,7 +2782,7 @@ if [ -n "$UID_OF" ]; then
   pkill -9 -u "$UID_OF" 2>/dev/null || true
 fi
 
-# Per-agent system LaunchDaemon written by spawn --bridge. Bootout +
+# Per-agent system LaunchDaemon written by spawn (unless --no-bridge). Bootout +
 # delete must come BEFORE we delete the user, otherwise launchd keeps a
 # zombie reference. No-op if the plist isn't there.
 BRIDGE_LABEL="eco.hofmann.apes.bridge.$NAME"
@@ -3900,12 +3912,12 @@ function resolveBridgeConfig(opts) {
 function captureHostBinDirs() {
   const dirs = [];
   const seen = /* @__PURE__ */ new Set();
-  for (const bin of ["node", "openape-chat-bridge", "apes"]) {
+  for (const bin of ["node", "ape-agent", "apes"]) {
     let resolved;
     try {
       resolved = execFileSync5("/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)";
+      const installCmd = bin === "ape-agent" ? "npm i -g @openape/ape-agent" : 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 = dirname2(resolved);
@@ -3925,7 +3937,7 @@ function bridgePlistPath(agentName) {
 function buildBridgeEnvFile(cfg) {
   const modelLine = cfg.model ? `APE_CHAT_BRIDGE_MODEL=${cfg.model}
 ` : "";
-  return `# Auto-generated by 'apes agents spawn --bridge'.
+  return `# Auto-generated by 'apes agents spawn'.
 # Read by the chat-bridge daemon at boot to talk to the local LLM proxy.
 LITELLM_BASE_URL=${cfg.baseUrl}
 LITELLM_API_KEY=${cfg.apiKey}
@@ -3934,7 +3946,7 @@ ${modelLine}`;
 function buildBridgeStartScript(hostBinDirs) {
   const pathLine = `export PATH="${hostBinDirs.join(":")}:/usr/bin:/bin"`;
   return `#!/usr/bin/env bash
-# Auto-generated by 'apes agents spawn --bridge'.
+# Auto-generated by 'apes agents spawn'.
 # Slim launcher \u2014 bridge stack lives on the host, no per-agent install.
 set -euo pipefail
 
@@ -3948,13 +3960,13 @@ ${pathLine}
 set -a
 . "$HOME/Library/Application Support/openape/bridge/.env"
 set +a
-exec openape-chat-bridge
+exec ape-agent
 `;
 }
 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 stdoutLog = `${homeDir}/Library/Logs/ape-agent.log`;
+  const stderrLog = `${homeDir}/Library/Logs/ape-agent.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">
@@ -4031,9 +4043,9 @@ var spawnAgentCommand = defineCommand26({
       type: "boolean",
       description: "Read the Claude Code OAuth token from stdin (paranoid form of --claude-token)."
     },
-    "bridge": {
+    "no-bridge": {
       type: "boolean",
-      description: "Install the openape-chat-bridge daemon for this agent: drops a launchd plist that runs `@openape/chat-bridge` so the agent answers chat.openape.ai messages. Reads LITELLM_API_KEY/BASE_URL defaults from ~/litellm/.env; override via --bridge-key / --bridge-base-url."
+      description: "Skip the ape-agent runtime install. Default behaviour installs the runtime so the agent answers chat.openape.ai messages (reads LITELLM_API_KEY/BASE_URL from ~/litellm/.env; override via --bridge-key / --bridge-base-url). Use --no-bridge for headless / CI / IdP-only account provisioning where the agent will not run a chat loop."
     },
     "bridge-key": {
       type: "string",
@@ -4126,7 +4138,8 @@ and try again.`
         flag: typeof args["claude-token"] === "string" ? args["claude-token"] : void 0,
         fromStdin: !!args["claude-token-stdin"]
       });
-      const bridge = args.bridge ? (() => {
+      const withBridge = !args["no-bridge"];
+      const bridge = withBridge ? (() => {
         const cfg = resolveBridgeConfig({
           cliKey: typeof args["bridge-key"] === "string" ? args["bridge-key"] : void 0,
           cliBaseUrl: typeof args["bridge-base-url"] === "string" ? args["bridge-base-url"] : void 0,
@@ -4180,7 +4193,7 @@ and try again.`
           home: homeDir,
           email: registration.email,
           registeredAt: Math.floor(Date.now() / 1e3),
-          bridge: args.bridge ? {
+          bridge: withBridge ? {
             baseUrl: typeof args["bridge-base-url"] === "string" ? args["bridge-base-url"] : void 0,
             apiKey: typeof args["bridge-key"] === "string" ? args["bridge-key"] : void 0,
             model: typeof args["bridge-model"] === "string" ? args["bridge-model"] : void 0
@@ -4191,7 +4204,7 @@ and try again.`
       }
       consola23.success(`Agent ${name} spawned.`);
       consola23.info(`\u{1F517} Troop: https://troop.openape.ai/agents/${name}`);
-      if (args.bridge) {
+      if (withBridge) {
         consola23.info(`On first boot, the bridge will send you a contact request from ${registration.email}.`);
         consola23.info("Open chat.openape.ai and accept it to start chatting with the agent.");
       }
@@ -4503,8 +4516,11 @@ var DEFAULT_ALLOW_PATTERNS = [
   // Bridge invocation. The grant request escapes-helper sends to the
   // IdP contains the *inner* command only — `apes run --as <agent> --`
   // is the wrapper that gets unwrapped before grant creation. So the
-  // YOLO target string is just `openape-chat-bridge`, not the full
-  // wrapped invocation.
+  // YOLO target string is just the agent-runtime binary name, not
+  // the full wrapped invocation. We list both the new canonical
+  // name and the legacy alias — pm2 ecosystem.config.js files
+  // written before @openape/ape-agent@2.0.0 still use the old name.
+  "ape-agent",
   "openape-chat-bridge",
   // Phase E: per-agent pm2 management. The Nest shells out
   // `apes run --as <agent> -- bash /var/openape/agents/<agent>/start.sh`
@@ -4748,7 +4764,7 @@ var installNestCommand = defineCommand32({
     },
     "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."
+      description: "Default model for ape-agent spawns. Persisted as APE_CHAT_BRIDGE_MODEL in ~/litellm/.env so every `apes [nest|agents] spawn` 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 }) {
@@ -4857,7 +4873,7 @@ var spawnNestCommand = defineCommand34({
       "spawn",
       name
     ];
-    if (!args["no-bridge"]) apesArgs.push("--bridge");
+    if (args["no-bridge"]) apesArgs.push("--no-bridge");
     if (typeof args["bridge-key"] === "string") apesArgs.push("--bridge-key", args["bridge-key"]);
     if (typeof args["bridge-base-url"] === "string") apesArgs.push("--bridge-base-url", args["bridge-base-url"]);
     if (typeof args["bridge-model"] === "string") apesArgs.push("--bridge-model", args["bridge-model"]);
@@ -6412,7 +6428,7 @@ var mcpCommand = defineCommand48({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-BDZV6EI6.js");
+    const { startMcpServer } = await import("./server-WKCSHOBY.js");
     await startMcpServer(transport, port);
   }
 });
@@ -7050,7 +7066,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "1.18.0" : "0.0.0";
+  const version = true ? "1.20.0" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -7323,10 +7339,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"1.18.0"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"1.20.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"1.18.0"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"1.20.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -7384,7 +7400,7 @@ var configCommand = defineCommand60({
 var main = defineCommand60({
   meta: {
     name: "apes",
-    version: "1.18.0",
+    version: "1.20.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -7441,7 +7457,7 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
-await maybeWarnStaleVersion("1.18.0").catch(() => {
+await maybeWarnStaleVersion("1.20.0").catch(() => {
 });
 runMain(main).catch((err) => {
   if (err instanceof CliExit) {