@openape/apes 0.21.1 → 0.22.0

package/dist/cli.js

@@ -63,7 +63,7 @@ import {
 } from "./chunk-IDPV5SNB.js";
 
 // src/cli.ts
-import consola35 from "consola";
+import consola36 from "consola";
 
 // src/ape-shell.ts
 import path from "path";
@@ -379,7 +379,7 @@ async function loginWithPKCE(idp) {
   consola2.success(`Logged in as ${payload.email || payload.sub}`);
 }
 async function loginWithKey(idp, keyPath, agentEmail) {
-  const { readFileSync: readFileSync7 } = await import("fs");
+  const { readFileSync: readFileSync8 } = await import("fs");
   const { sign: sign3 } = await import("crypto");
   const { loadEd25519PrivateKey: loadEd25519PrivateKey2 } = await import("./ssh-key-YBNNG5K5.js");
   const challengeUrl = await getAgentChallengeEndpoint(idp);
@@ -392,7 +392,7 @@ async function loginWithKey(idp, keyPath, agentEmail) {
     throw new CliError(`Challenge failed: ${await challengeResp.text()}`);
   }
   const { challenge } = await challengeResp.json();
-  const keyContent = readFileSync7(keyPath, "utf-8");
+  const keyContent = readFileSync8(keyPath, "utf-8");
   const privateKey = loadEd25519PrivateKey2(keyContent);
   const signature = sign3(null, Buffer2.from(challenge), privateKey).toString("base64");
   const authenticateUrl = await getAgentAuthenticateEndpoint(idp);
@@ -3236,14 +3236,17 @@ async function runAudienceMode(audience, action, args) {
     throw new CliExit(getAsyncExitCode());
   }
   consola23.success(`Grant requested: ${grant.id}`);
+  consola23.info(`Approve at: ${idp}/grant-approval?grant_id=${grant.id}`);
   consola23.info("Waiting for approval...");
-  const maxWait = 3e5;
+  const maxWait = 15 * 60 * 1e3;
   const interval = 3e3;
   const start = Date.now();
+  let approved = false;
   while (Date.now() - start < maxWait) {
     const status = await apiFetch(`${grantsUrl}/${grant.id}`);
     if (status.status === "approved") {
       consola23.success("Grant approved!");
+      approved = true;
       break;
     }
     if (status.status === "denied" || status.status === "revoked") {
@@ -3251,6 +3254,12 @@ async function runAudienceMode(audience, action, args) {
     }
     await new Promise((r) => setTimeout(r, interval));
   }
+  if (!approved) {
+    const minutes = Math.round(maxWait / 6e4);
+    throw new CliError(
+      `Grant approval timed out after ${minutes} min (still pending). Check your DDISA inbox at ${idp}/grant-approval?grant_id=${grant.id} \u2014 if approved later, re-run the same \`apes run\` command and it will reuse the grant.`
+    );
+  }
   consola23.info("Fetching grant token...");
   const { authz_jwt } = await apiFetch(`${grantsUrl}/${grant.id}/token`, {
     method: "POST"
@@ -3761,7 +3770,7 @@ var mcpCommand = defineCommand32({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-3KAKSSMI.js");
+    const { startMcpServer } = await import("./server-GBFP2XSM.js");
     await startMcpServer(transport, port);
   }
 });
@@ -4399,7 +4408,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "0.21.1" : "0.0.0";
+  const version = true ? "0.22.0" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -4591,6 +4600,77 @@ var workflowsCommand = defineCommand43({
   }
 });
 
+// src/version-check.ts
+import { existsSync as existsSync9, mkdirSync as mkdirSync2, readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join6 } from "path";
+import consola35 from "consola";
+var PACKAGE_NAME = "@openape/apes";
+var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
+var CACHE_FILE = join6(homedir5(), ".config", "apes", ".version-check.json");
+function readCache() {
+  if (!existsSync9(CACHE_FILE)) return null;
+  try {
+    return JSON.parse(readFileSync7(CACHE_FILE, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function writeCache(entry) {
+  try {
+    const dir = join6(homedir5(), ".config", "apes");
+    if (!existsSync9(dir)) mkdirSync2(dir, { recursive: true, mode: 448 });
+    writeFileSync6(CACHE_FILE, JSON.stringify(entry), { mode: 384 });
+  } catch {
+  }
+}
+function compareSemver(a, b) {
+  const pa = a.split(".").map(Number);
+  const pb = b.split(".").map(Number);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const x = pa[i] ?? 0;
+    const y = pb[i] ?? 0;
+    if (x !== y) return x - y;
+  }
+  return 0;
+}
+async function fetchLatestVersion() {
+  try {
+    const res = await fetch(`https://registry.npmjs.org/${encodeURIComponent(PACKAGE_NAME)}/latest`, {
+      headers: { Accept: "application/json" },
+      signal: AbortSignal.timeout(2e3)
+    });
+    if (!res.ok) return null;
+    const body = await res.json();
+    return typeof body.version === "string" ? body.version : null;
+  } catch {
+    return null;
+  }
+}
+function warnIfBehind(currentVersion, latest) {
+  if (compareSemver(currentVersion, latest) < 0) {
+    consola35.warn(
+      `apes ${currentVersion} is behind latest @openape/apes@${latest}. Run \`npm i -g @openape/apes@latest\` to update. (Suppress with APES_NO_UPDATE_CHECK=1.)`
+    );
+  }
+}
+async function maybeWarnStaleVersion(currentVersion) {
+  if (process.env.APES_NO_UPDATE_CHECK) return;
+  if (!currentVersion || currentVersion === "unknown") return;
+  const cached = readCache();
+  const now = Date.now();
+  if (cached) {
+    warnIfBehind(currentVersion, cached.latest);
+  }
+  if (!cached || now - cached.checkedAt >= CACHE_TTL_MS) {
+    const latest = await fetchLatestVersion();
+    if (latest) {
+      writeCache({ latest, checkedAt: now });
+      if (!cached) warnIfBehind(currentVersion, latest);
+    }
+  }
+}
+
 // src/cli.ts
 process.stdout.on("error", (err) => {
   if (err.code === "EPIPE") process.exit(0);
@@ -4601,10 +4681,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"0.21.1"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"0.22.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"0.21.1"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"0.22.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -4662,7 +4742,7 @@ var configCommand = defineCommand44({
 var main = defineCommand44({
   meta: {
     name: "apes",
-    version: "0.21.1",
+    version: "0.22.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -4717,18 +4797,20 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
+await maybeWarnStaleVersion("0.22.0").catch(() => {
+});
 runMain(main).catch((err) => {
   if (err instanceof CliExit) {
     process.exit(err.exitCode);
   }
   if (err instanceof CliError) {
-    consola35.error(err.message);
+    consola36.error(err.message);
     process.exit(err.exitCode);
   }
   if (debug) {
-    consola35.error(err);
+    consola36.error(err);
   } else {
-    consola35.error(err instanceof ApiError ? err.message : err instanceof Error ? err.message : String(err));
+    consola36.error(err instanceof ApiError ? err.message : err instanceof Error ? err.message : String(err));
   }
   process.exit(1);
 });