@openape/apes 0.7.2 → 0.8.0

package/dist/cli.js

@@ -8,6 +8,9 @@ import {
   loadEd25519PrivateKey,
   readPublicKeyComment
 } from "./chunk-ION3CWD5.js";
+import {
+  notifyGrantPending
+} from "./chunk-LSKHTHUY.js";
 import {
   ApiError,
   apiFetch,
@@ -37,8 +40,10 @@ import {
   searchAdapters,
   verifyAndExecute,
   waitForGrantStatus
-} from "./chunk-B32ZQP5K.js";
+} from "./chunk-HGCKOCJA.js";
 import {
+  AUTH_FILE,
+  CONFIG_DIR,
   clearAuth,
   getAuthToken,
   getIdpUrl,
@@ -46,7 +51,7 @@ import {
   loadConfig,
   saveAuth,
   saveConfig
-} from "./chunk-TBYYREL6.js";
+} from "./chunk-AZVY3X7Q.js";
 
 // src/cli.ts
 import consola26 from "consola";
@@ -79,7 +84,7 @@ function rewriteApeShellArgs(argv, argv0) {
 }
 
 // src/cli.ts
-import { defineCommand as defineCommand31, runMain } from "citty";
+import { defineCommand as defineCommand32, runMain } from "citty";
 
 // src/commands/auth/login.ts
 import { Buffer } from "buffer";
@@ -1929,6 +1934,13 @@ async function runShellMode(command, args) {
   });
   consola18.info(`Grant requested: ${grant.id}`);
   consola18.info("Waiting for approval...");
+  notifyGrantPending({
+    grantId: grant.id,
+    approveUrl: `${idp}/grant-approval?grant_id=${grant.id}`,
+    command: command.join(" ").slice(0, 200),
+    audience: "ape-shell",
+    host: targetHost
+  });
   const maxWait = 3e5;
   const interval = 3e3;
   const start = Date.now();
@@ -1982,6 +1994,13 @@ async function tryAdapterModeFromShell(command, idp, args) {
     consola18.info("");
     consola18.info(`  Similar grant(s) found (${n}). Your approver can extend an existing grant to cover this request.`);
   }
+  notifyGrantPending({
+    grantId: grant.id,
+    approveUrl: `${idp}/grant-approval?grant_id=${grant.id}`,
+    command: resolved.detail?.display || parsed?.raw || "unknown",
+    audience: resolved.adapter?.cli?.audience ?? "shapes",
+    host: args.host || hostname3()
+  });
   const status = await waitForGrantStatus(idp, grant.id);
   if (status !== "approved")
     throw new CliError(`Grant ${status}`);
@@ -2385,7 +2404,7 @@ var mcpCommand = defineCommand25({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-GPETT3ON.js");
+    const { startMcpServer } = await import("./server-DPNFUTHG.js");
     await startMcpServer(transport, port);
   }
 });
@@ -2838,8 +2857,127 @@ var dnsCheckCommand = defineCommand29({
   }
 });
 
-// src/commands/workflows.ts
+// src/commands/health.ts
+import { exec } from "child_process";
+import { promisify } from "util";
 import { defineCommand as defineCommand30 } from "citty";
+var execAsync = promisify(exec);
+async function resolveApeShellPath() {
+  try {
+    const { stdout } = await execAsync("command -v ape-shell", { shell: "/bin/bash" });
+    const trimmed = stdout.trim();
+    return trimmed.length > 0 ? trimmed : null;
+  } catch {
+    return null;
+  }
+}
+async function probeIdp(url) {
+  const ctrl = new AbortController();
+  const timeout = setTimeout(() => ctrl.abort(), 3e3);
+  try {
+    await fetch(url, { method: "GET", signal: ctrl.signal });
+    return { reachable: true };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { reachable: false, error: message };
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+async function bestEffortGrantCount(idp) {
+  try {
+    const grantsUrl = await getGrantsEndpoint(idp);
+    const res = await apiFetch(`${grantsUrl}?limit=1`);
+    const count = Array.isArray(res?.data) ? res.data.length : 0;
+    return { count };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { error: message };
+  }
+}
+async function runHealth(args) {
+  const version = true ? "0.8.0" : "0.0.0";
+  const auth = loadAuth();
+  if (!auth) {
+    throw new CliError("Not logged in. Run `apes login` first.", 1);
+  }
+  const isAgent = auth.email.includes("agent+");
+  const expiresDate = new Date(auth.expires_at * 1e3);
+  const isExpired = Date.now() / 1e3 > auth.expires_at;
+  if (isExpired) {
+    throw new CliError(`Token expired at ${expiresDate.toISOString()}. Run \`apes login\`.`, 1);
+  }
+  const idpProbe = await probeIdp(auth.idp);
+  const grantInfo = await bestEffortGrantCount(auth.idp);
+  const apeShellPath = await resolveApeShellPath();
+  const report = {
+    version,
+    config: { dir: CONFIG_DIR },
+    auth: {
+      file: AUTH_FILE,
+      present: true,
+      email: auth.email,
+      type: isAgent ? "agent" : "human",
+      idp: auth.idp,
+      expires_at_iso: expiresDate.toISOString(),
+      expires_at_local: expiresDate.toLocaleString(),
+      expired: false
+    },
+    idp: {
+      url: auth.idp,
+      reachable: idpProbe.reachable,
+      ..."error" in idpProbe ? { error: idpProbe.error } : {}
+    },
+    grants: "count" in grantInfo ? { count: grantInfo.count } : { error: grantInfo.error },
+    ape_shell_binary: apeShellPath,
+    ok: idpProbe.reachable
+  };
+  if (args.json) {
+    console.log(JSON.stringify(report, null, 2));
+  } else {
+    console.log(`apes ${version}`);
+    console.log("");
+    console.log(`Config: ${CONFIG_DIR}`);
+    console.log(`Auth:   ${AUTH_FILE}`);
+    console.log(`        ${auth.email} (${isAgent ? "agent" : "human"})`);
+    console.log(`        IdP: ${auth.idp}`);
+    console.log(`        Token: valid until ${expiresDate.toISOString()} (local: ${expiresDate.toLocaleString()})`);
+    console.log("");
+    if (idpProbe.reachable) {
+      console.log("IdP: reachable");
+    } else {
+      console.log(`IdP: <unreachable: ${idpProbe.error}>`);
+    }
+    if ("count" in grantInfo) {
+      console.log(`Grants: ${grantInfo.count}`);
+    } else {
+      console.log(`Grants: <unreachable: ${grantInfo.error}>`);
+    }
+    console.log(`ape-shell: ${apeShellPath ?? "(not on PATH)"}`);
+  }
+  if (!idpProbe.reachable) {
+    throw new CliError(`IdP ${auth.idp} unreachable: ${idpProbe.error}`, 1);
+  }
+}
+var healthCommand = defineCommand30({
+  meta: {
+    name: "health",
+    description: "Report CLI diagnostic state (auth, IdP, grants, binaries)"
+  },
+  args: {
+    json: {
+      type: "boolean",
+      description: "Emit a machine-readable JSON report",
+      default: false
+    }
+  },
+  async run({ args }) {
+    await runHealth({ json: Boolean(args.json) });
+  }
+});
+
+// src/commands/workflows.ts
+import { defineCommand as defineCommand31 } from "citty";
 import consola25 from "consola";
 
 // src/guides/index.ts
@@ -2890,7 +3028,7 @@ var guides = [
 ];
 
 // src/commands/workflows.ts
-var workflowsCommand = defineCommand30({
+var workflowsCommand = defineCommand31({
   meta: {
     name: "workflows",
     description: "Discover workflow guides"
@@ -2960,10 +3098,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"0.7.2"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"0.8.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"0.7.2"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"0.8.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -2978,7 +3116,7 @@ if (shellRewrite) {
     console.log("  --help, -h      Show this help message");
     process.exit(0);
   } else if (shellRewrite.action === "interactive") {
-    const { runInteractiveShell } = await import("./orchestrator-JAMWD6DD.js");
+    const { runInteractiveShell } = await import("./orchestrator-FTQW3ZRS.js");
     await runInteractiveShell();
     process.exit(0);
   } else {
@@ -2987,7 +3125,7 @@ if (shellRewrite) {
   }
 }
 var debug = process.argv.includes("--debug");
-var grantsCommand = defineCommand31({
+var grantsCommand = defineCommand32({
   meta: {
     name: "grants",
     description: "Grant management"
@@ -3007,7 +3145,7 @@ var grantsCommand = defineCommand31({
     "delegation-revoke": delegationRevokeCommand
   }
 });
-var configCommand = defineCommand31({
+var configCommand = defineCommand32({
   meta: {
     name: "config",
     description: "Configuration management"
@@ -3017,10 +3155,10 @@ var configCommand = defineCommand31({
     set: configSetCommand
   }
 });
-var main = defineCommand31({
+var main = defineCommand32({
   meta: {
     name: "apes",
-    version: "0.7.2",
+    version: "0.8.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -3031,6 +3169,7 @@ var main = defineCommand31({
     login: loginCommand,
     logout: logoutCommand,
     whoami: whoamiCommand,
+    health: healthCommand,
     grants: grantsCommand,
     admin: adminCommand,
     run: runCommand,