@openape/apes 0.10.0 → 0.11.0

package/dist/cli.js

@@ -136,6 +136,11 @@ async function resolveLoginInputs(flags) {
       consola.info(`Using email from ${keyPath}.pub comment: ${email}`);
     }
   }
+  if (process.env.APES_IDP && process.env.GRAPES_IDP) {
+    consola.warn(
+      "Both APES_IDP and GRAPES_IDP are set \u2014 using APES_IDP. GRAPES_IDP is deprecated and will be removed in a future release."
+    );
+  }
   let idp;
   if (flags.idp) {
     idp = flags.idp;
@@ -143,6 +148,9 @@ async function resolveLoginInputs(flags) {
     idp = process.env.APES_IDP;
   } else if (process.env.GRAPES_IDP) {
     idp = process.env.GRAPES_IDP;
+    consola.warn(
+      "GRAPES_IDP is deprecated, use APES_IDP instead. GRAPES_IDP support will be removed in a future release."
+    );
   } else if (config.defaults?.idp) {
     idp = config.defaults.idp;
   } else if (email && email.includes("@")) {
@@ -161,7 +169,7 @@ async function resolveLoginInputs(flags) {
 
 // src/commands/auth/login.ts
 var CALLBACK_PORT = 9876;
-var CLIENT_ID = "grapes-cli";
+var CLIENT_ID = "apes-cli";
 var loginCommand = defineCommand({
   meta: {
     name: "login",
@@ -1064,6 +1072,59 @@ var revokeCommand = defineCommand11({
 import { execFileSync } from "child_process";
 import { defineCommand as defineCommand12 } from "citty";
 import consola12 from "consola";
+
+// src/grant-poll.ts
+function getPollIntervalSeconds() {
+  const envValue = process.env.APES_GRANT_POLL_INTERVAL;
+  if (envValue) {
+    const n = Number(envValue);
+    if (Number.isFinite(n) && n > 0)
+      return Math.floor(n);
+  }
+  const cfg = loadConfig();
+  const cfgValue = cfg.defaults?.grant_poll_interval_seconds;
+  if (cfgValue) {
+    const n = Number(cfgValue);
+    if (Number.isFinite(n) && n > 0)
+      return Math.floor(n);
+  }
+  return 10;
+}
+function getPollMaxMinutes() {
+  const envValue = process.env.APES_GRANT_POLL_MAX_MINUTES;
+  if (envValue) {
+    const n = Number(envValue);
+    if (Number.isFinite(n) && n > 0)
+      return Math.floor(n);
+  }
+  const cfg = loadConfig();
+  const cfgValue = cfg.defaults?.grant_poll_max_minutes;
+  if (cfgValue) {
+    const n = Number(cfgValue);
+    if (Number.isFinite(n) && n > 0)
+      return Math.floor(n);
+  }
+  return 5;
+}
+async function pollGrantUntilResolved(idp, grantId) {
+  const grantsEndpoint = await getGrantsEndpoint(idp);
+  const intervalSec = getPollIntervalSeconds();
+  const maxMinutes = getPollMaxMinutes();
+  const maxMs = maxMinutes * 6e4;
+  const intervalMs = intervalSec * 1e3;
+  const start = Date.now();
+  while (Date.now() - start < maxMs) {
+    const grant = await apiFetch(`${grantsEndpoint}/${grantId}`);
+    if (grant.status === "approved")
+      return { kind: "approved" };
+    if (grant.status === "denied" || grant.status === "revoked" || grant.status === "used")
+      return { kind: "terminal", status: grant.status };
+    await new Promise((r) => setTimeout(r, intervalMs));
+  }
+  return { kind: "timeout" };
+}
+
+// src/commands/grants/run.ts
 var runGrantCommand = defineCommand12({
   meta: {
     name: "run",
@@ -1079,6 +1140,11 @@ var runGrantCommand = defineCommand12({
       type: "string",
       description: "Path to escapes binary (audience=escapes only)",
       default: "escapes"
+    },
+    wait: {
+      type: "boolean",
+      description: "If the grant is pending, block and poll until approved (or denied/revoked/used/timeout). Reuses APES_GRANT_POLL_INTERVAL / APES_GRANT_POLL_MAX_MINUTES knobs.",
+      default: false
     }
   },
   async run({ args }) {
@@ -1086,9 +1152,29 @@ var runGrantCommand = defineCommand12({
     if (!idp)
       throw new CliError("No IdP URL configured. Run `apes login` first or pass --idp.");
     const grantsUrl = await getGrantsEndpoint(idp);
-    const grant = await apiFetch(`${grantsUrl}/${args.id}`);
-    if (grant.status === "pending")
-      throw new CliError(`Grant ${grant.id} is still pending. Approve at: ${idp}/grant-approval?grant_id=${grant.id}`);
+    let grant = await apiFetch(`${grantsUrl}/${args.id}`);
+    if (grant.status === "pending") {
+      if (!args.wait) {
+        throw new CliError(
+          `Grant ${grant.id} is still pending. Approve at: ${idp}/grant-approval?grant_id=${grant.id}`
+        );
+      }
+      const maxMinutes = getPollMaxMinutes();
+      consola12.info(`Waiting for grant ${grant.id} approval (up to ${maxMinutes} minute${maxMinutes === 1 ? "" : "s"})...`);
+      const outcome = await pollGrantUntilResolved(idp, grant.id);
+      if (outcome.kind === "timeout") {
+        throw new CliError(
+          `Grant ${grant.id} approval timed out after ${maxMinutes} minute${maxMinutes === 1 ? "" : "s"}. Re-run after approval, or extend the timeout via APES_GRANT_POLL_MAX_MINUTES.`
+        );
+      }
+      if (outcome.kind === "terminal") {
+        throw new CliError(
+          `Grant ${grant.id} resolved to ${outcome.status}. Request a new one.`
+        );
+      }
+      grant = await apiFetch(`${grantsUrl}/${args.id}`);
+      consola12.info(`Grant ${grant.id} approved \u2014 continuing`);
+    }
     if (grant.status === "denied" || grant.status === "revoked")
       throw new CliError(`Grant ${grant.id} is ${grant.status}. Request a new one.`);
     if (grant.status === "used")
@@ -1940,38 +2026,6 @@ function getUserMode() {
     return "human";
   return "agent";
 }
-function getPollIntervalSeconds() {
-  const envValue = process.env.APES_GRANT_POLL_INTERVAL;
-  if (envValue) {
-    const n = Number(envValue);
-    if (Number.isFinite(n) && n > 0)
-      return Math.floor(n);
-  }
-  const cfg = loadConfig();
-  const cfgValue = cfg.defaults?.grant_poll_interval_seconds;
-  if (cfgValue) {
-    const n = Number(cfgValue);
-    if (Number.isFinite(n) && n > 0)
-      return Math.floor(n);
-  }
-  return 10;
-}
-function getPollMaxMinutes() {
-  const envValue = process.env.APES_GRANT_POLL_MAX_MINUTES;
-  if (envValue) {
-    const n = Number(envValue);
-    if (Number.isFinite(n) && n > 0)
-      return Math.floor(n);
-  }
-  const cfg = loadConfig();
-  const cfgValue = cfg.defaults?.grant_poll_max_minutes;
-  if (cfgValue) {
-    const n = Number(cfgValue);
-    if (Number.isFinite(n) && n > 0)
-      return Math.floor(n);
-  }
-  return 5;
-}
 function getAsyncExitCode() {
   const envValue = process.env.APES_ASYNC_EXIT_CODE;
   if (envValue !== void 0 && envValue !== "") {
@@ -2003,17 +2057,25 @@ function printPendingGrantInfo(grant, idp) {
     console.log("  this grant without re-approval on the next invocation.");
     return;
   }
-  const pollSec = getPollIntervalSeconds();
   const maxMin = getPollMaxMinutes();
   consola19.success(`Grant ${grant.id} created (pending approval)`);
   console.log(`  Approve:   ${approveUrl}`);
   console.log(`  Status:    ${statusCmd} [--json]`);
-  console.log(`  Execute:   ${executeCmd}`);
+  console.log(`  Execute:   ${executeCmd} --wait`);
+  console.log("");
+  console.log("  For agents:");
+  console.log(`    1. Tell the user about the pending grant and the approve URL above.`);
+  console.log(`    2. Run \`${executeCmd} --wait\`. This blocks up to ${maxMin} minutes`);
+  console.log(`       until the user approves (or denies/timeout) and then executes`);
+  console.log(`       the command in a single step. The CLI handles the polling loop`);
+  console.log(`       internally \u2014 you do not need to poll the status yourself.`);
+  console.log(`    3. Exit 0 means approved + executed; stdout is the command output.`);
+  console.log(`       Exit 75 (pending) only appears if you accidentally call this`);
+  console.log(`       without --wait. Any other non-zero exit means denied, revoked,`);
+  console.log(`       used, or timeout \u2014 report the reason to the user.`);
   console.log("");
-  console.log(`  For agents: poll \`${statusCmd} --json\` every ${pollSec}s, wait up to ${maxMin} minutes.`);
-  console.log(`  When .status == "approved", run \`${executeCmd}\` to execute.`);
-  console.log(`  On "denied" or "revoked", stop and report to the user.`);
-  console.log(`  On timeout, stop and notify the user that approval has not happened.`);
+  console.log('  Note: exit code 75 (EX_TEMPFAIL) from this command means "pending,');
+  console.log('  retry later" \u2014 do not abort your workflow, follow the steps above.');
   console.log("");
   console.log('  Tip: Approve as "timed" or "always" in the browser to let this');
   console.log("  grant be reused on subsequent invocations without re-approval.");
@@ -2626,7 +2688,7 @@ var mcpCommand = defineCommand26({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-N3DPYYBL.js");
+    const { startMcpServer } = await import("./server-YNJ5SURM.js");
     await startMcpServer(transport, port);
   }
 });
@@ -3118,7 +3180,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "0.10.0" : "0.0.0";
+  const version = true ? "0.11.0" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -3320,10 +3382,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"0.10.0"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"0.11.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"0.10.0"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"0.11.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -3338,7 +3400,7 @@ if (shellRewrite) {
     console.log("  --help, -h      Show this help message");
     process.exit(0);
   } else if (shellRewrite.action === "interactive") {
-    const { runInteractiveShell } = await import("./orchestrator-QL3AT67U.js");
+    const { runInteractiveShell } = await import("./orchestrator-U5TZ2KXF.js");
     await runInteractiveShell();
     process.exit(0);
   } else {
@@ -3381,7 +3443,7 @@ var configCommand = defineCommand33({
 var main = defineCommand33({
   meta: {
     name: "apes",
-    version: "0.10.0",
+    version: "0.11.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {