@openape/apes 1.31.3 → 1.31.5

package/dist/cli.js

@@ -98,7 +98,7 @@ function rewriteApeShellArgs(argv, argv0) {
 }
 
 // src/cli.ts
-import { defineCommand as defineCommand65, runMain } from "citty";
+import { defineCommand as defineCommand65, runCommand as runCittyCommand, runMain } from "citty";
 
 // src/commands/auth/login.ts
 import { Buffer } from "buffer";
@@ -148,11 +148,6 @@ 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;
   let idpSource;
   if (flags.idp) {
@@ -161,12 +156,6 @@ async function resolveLoginInputs(flags) {
   } else if (process.env.APES_IDP) {
     idp = process.env.APES_IDP;
     idpSource = "env";
-  } else if (process.env.GRAPES_IDP) {
-    idp = process.env.GRAPES_IDP;
-    idpSource = "env";
-    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;
     idpSource = "config";
@@ -776,8 +765,8 @@ async function waitForApproval(grantsUrl, grantId) {
 import { hostname as hostname2 } from "os";
 import { defineCommand as defineCommand8 } from "citty";
 import consola8 from "consola";
-function parseCapabilityArgs(rawArgs) {
-  const tokens = [...rawArgs];
+function parseCapabilityArgs(rawArgs2) {
+  const tokens = [...rawArgs2];
   if (tokens[0] === "request-capability") {
     tokens.shift();
   }
@@ -949,12 +938,12 @@ var requestCapabilityCommand = defineCommand8({
       default: false
     }
   },
-  async run({ rawArgs }) {
+  async run({ rawArgs: rawArgs2 }) {
     const auth = loadAuth();
     if (!auth) {
       throw new CliError("Not logged in. Run `apes login` first.");
     }
-    const parsed = parseCapabilityArgs(rawArgs);
+    const parsed = parseCapabilityArgs(rawArgs2);
     const idp = getIdpUrl(parsed.idp);
     if (!idp) {
       throw new CliError("No IdP URL configured. Use --idp or log in first.");
@@ -1910,13 +1899,13 @@ function parseKeyValues(pairs) {
 function missingCapabilities(required, provided) {
   return required.filter((env) => !(env in provided));
 }
-function collectFlag(rawArgs, name) {
+function collectFlag(rawArgs2, name) {
   const out = [];
   const long = `--${name}`;
-  for (let i = 0; i < rawArgs.length; i++) {
-    const a = rawArgs[i];
+  for (let i = 0; i < rawArgs2.length; i++) {
+    const a = rawArgs2[i];
     if (a === long) {
-      const v = rawArgs[i + 1];
+      const v = rawArgs2[i + 1];
       if (v !== void 0 && !v.startsWith("--")) {
         out.push(v);
         i++;
@@ -1948,11 +1937,11 @@ var deployAgentCommand = defineCommand21({
     "host-id": { type: "string", description: "Target nest host_id (default: first connected)" },
     json: { type: "boolean", description: "Machine-readable output, no prompts" }
   },
-  async run({ args, rawArgs }) {
+  async run({ args, rawArgs: rawArgs2 }) {
     const repoRef = args.repo;
     if (!repoRef) throw new CliError("usage: apes agent deploy <repo>@<ref> [--param k=v] [--secret ENV=val]");
-    const params = parseKeyValues(collectFlag(rawArgs, "param"));
-    const secrets = parseKeyValues(collectFlag(rawArgs, "secret"));
+    const params = parseKeyValues(collectFlag(rawArgs2, "param"));
+    const secrets = parseKeyValues(collectFlag(rawArgs2, "secret"));
     const json = !!args.json;
     const token = (await ensureFreshIdpAuth()).access_token;
     const troop = resolveTroopUrl();
@@ -2857,10 +2846,22 @@ fi
 // src/commands/agents/list.ts
 import { defineCommand as defineCommand27 } from "citty";
 import consola24 from "consola";
+function buildOsStateResolver() {
+  const platform = getHostPlatform();
+  const osUsers = platform.listAgentUserNames();
+  return (agentName) => {
+    const u = platform.lookupAgentUser(agentName);
+    if (u) return { osUser: true, home: u.homeDir };
+    if (osUsers.has(platform.agentUsername(agentName)) || osUsers.has(agentName)) {
+      return { osUser: true, home: null };
+    }
+    return { osUser: false, home: null };
+  };
+}
 var listAgentsCommand = defineCommand27({
   meta: {
     name: "list",
-    description: "List agents owned by the current user, with local OS-user status"
+    description: "List agents owned by the current user (from the IdP); annotated with local OS-user status on a nest host"
   },
   args: {
     json: {
@@ -2883,25 +2884,13 @@ var listAgentsCommand = defineCommand27({
     }
     const all = await apiFetch("/api/my-agents", { idp });
     const filtered = args["include-inactive"] ? all : all.filter((u) => u.isActive !== false);
-    const platform = getHostPlatform();
-    const osUsers = platform.listAgentUserNames();
-    const osStateOf = (agentName) => {
-      const u = platform.lookupAgentUser(agentName);
-      if (u) return { osUser: true, home: u.homeDir };
-      if (osUsers.has(platform.agentUsername(agentName)) || osUsers.has(agentName)) {
-        return { osUser: true, home: null };
-      }
-      return { osUser: false, home: null };
-    };
+    const onNest = isLinux();
+    const osStateOf = onNest ? buildOsStateResolver() : null;
     const rows = filtered.map((u) => {
+      const base = { name: u.name, email: u.email, isActive: u.isActive !== false };
+      if (!osStateOf) return base;
       const os = osStateOf(u.name);
-      return {
-        name: u.name,
-        email: u.email,
-        isActive: u.isActive !== false,
-        osUser: os.osUser,
-        home: os.home
-      };
+      return { ...base, osUser: os.osUser, home: os.home };
     });
     if (args.json) {
       process.stdout.write(`${JSON.stringify(rows, null, 2)}
@@ -2914,14 +2903,23 @@ var listAgentsCommand = defineCommand27({
     }
     const nameW = Math.max(4, ...rows.map((r) => r.name.length));
     const emailW = Math.max(5, ...rows.map((r) => r.email.length));
-    const header = `${"NAME".padEnd(nameW)}  ${"EMAIL".padEnd(emailW)}  ACTIVE  OS-USER  HOME`;
+    if (onNest) {
+      const header2 = `${"NAME".padEnd(nameW)}  ${"EMAIL".padEnd(emailW)}  ACTIVE  OS-USER  HOME`;
+      console.log(header2);
+      console.log("-".repeat(header2.length));
+      for (const r of rows) {
+        const active = r.isActive ? "\u2713" : "\u2717";
+        const os = r.osUser ? "\u2713" : "\u2717";
+        const homeCol = r.home ?? "(missing)";
+        console.log(`${r.name.padEnd(nameW)}  ${r.email.padEnd(emailW)}  ${active.padEnd(6)}  ${os.padEnd(7)}  ${homeCol}`);
+      }
+      return;
+    }
+    const header = `${"NAME".padEnd(nameW)}  ${"EMAIL".padEnd(emailW)}  ACTIVE`;
     console.log(header);
     console.log("-".repeat(header.length));
     for (const r of rows) {
-      const active = r.isActive ? "\u2713" : "\u2717";
-      const os = r.osUser ? "\u2713" : "\u2717";
-      const homeCol = r.home ?? "(missing)";
-      console.log(`${r.name.padEnd(nameW)}  ${r.email.padEnd(emailW)}  ${active.padEnd(6)}  ${os.padEnd(7)}  ${homeCol}`);
+      console.log(`${r.name.padEnd(nameW)}  ${r.email.padEnd(emailW)}  ${r.isActive ? "\u2713" : "\u2717"}`);
     }
   }
 });
@@ -4804,6 +4802,7 @@ function resolveRunAsTarget(runAs) {
   if (!runAs) return runAs;
   if (!AGENT_NAME_REGEX.test(runAs)) return runAs;
   if (runAs.startsWith("openape-agent-")) return runAs;
+  if (!isLinux()) return runAs;
   const platform = getHostPlatform();
   const prefixed = platform.agentUsername(runAs);
   if (platform.readAgentUser(prefixed)) return prefixed;
@@ -4939,8 +4938,8 @@ var runCommand = defineCommand47({
       required: false
     }
   },
-  async run({ rawArgs, args }) {
-    const wrappedCommand = extractWrappedCommand(rawArgs ?? []);
+  async run({ rawArgs: rawArgs2, args }) {
+    const wrappedCommand = extractWrappedCommand(rawArgs2 ?? []);
     if (wrappedCommand.length > 0 && getUserMode() === "agent") {
       routeDiagnosticsToStderrForWrappedAgentRun();
     }
@@ -4949,9 +4948,9 @@ var runCommand = defineCommand47({
       return;
     }
     if (wrappedCommand.length > 0) {
-      await runAdapterMode(wrappedCommand, rawArgs ?? [], args);
+      await runAdapterMode(wrappedCommand, rawArgs2 ?? [], args);
     } else {
-      const positionals = extractPositionals(rawArgs ?? []);
+      const positionals = extractPositionals(rawArgs2 ?? []);
       if (positionals.length < 2)
         throw new Error("Usage: apes run -- <cli> <args...>  OR  apes run <audience> <action>");
       await runAudienceMode(positionals[0], positionals[1], args);
@@ -5104,10 +5103,10 @@ function execShellCommand(command) {
     throw new CliExit(exitCode);
   }
 }
-function extractPositionals(rawArgs) {
+function extractPositionals(rawArgs2) {
   const positionals = [];
-  const delimiter = rawArgs.indexOf("--");
-  const args = delimiter >= 0 ? rawArgs.slice(0, delimiter) : rawArgs;
+  const delimiter = rawArgs2.indexOf("--");
+  const args = delimiter >= 0 ? rawArgs2.slice(0, delimiter) : rawArgs2;
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "run")
@@ -5125,7 +5124,7 @@ function printGenericWarning(cliId) {
 `);
   process.stderr.write("Generic mode active \u2014 single-use grant will be required.\n");
 }
-async function runAdapterMode(command, rawArgs, args) {
+async function runAdapterMode(command, rawArgs2, args) {
   const idp = getIdpUrl(args.idp);
   if (!idp)
     throw new Error("No IdP URL configured. Run `apes login` first or pass --idp.");
@@ -5133,7 +5132,7 @@ async function runAdapterMode(command, rawArgs, args) {
     await runAudienceMode("escapes", command.join(" "), args, command);
     return;
   }
-  const adapterOpt = extractOption(rawArgs, "adapter");
+  const adapterOpt = extractOption(rawArgs2, "adapter");
   const cliId = command[0];
   let resolved;
   try {
@@ -5507,8 +5506,8 @@ var proxyCommand = defineCommand48({
       required: false
     }
   },
-  async run({ rawArgs }) {
-    const wrapped = extractWrappedCommand(rawArgs ?? []);
+  async run({ rawArgs: rawArgs2 }) {
+    const wrapped = extractWrappedCommand(rawArgs2 ?? []);
     if (wrapped.length === 0) {
       throw new CliError("Usage: apes proxy -- <cmd> [args...]");
     }
@@ -5613,11 +5612,11 @@ var explainCommand = defineCommand49({
       required: false
     }
   },
-  async run({ rawArgs }) {
-    const command = extractWrappedCommand(rawArgs ?? []);
+  async run({ rawArgs: rawArgs2 }) {
+    const command = extractWrappedCommand(rawArgs2 ?? []);
     if (command.length === 0)
       throw new Error("Missing wrapped command. Usage: apes explain [--adapter <file>] -- <cli> ...");
-    const adapterOpt = extractOption(rawArgs ?? [], "adapter");
+    const adapterOpt = extractOption(rawArgs2 ?? [], "adapter");
     const loaded = loadAdapter(command[0], adapterOpt);
     const resolved = await resolveCommand(loaded, command);
     process.stdout.write(`${JSON.stringify({
@@ -5863,7 +5862,7 @@ var mcpCommand = defineCommand53({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-CELKDGTK.js");
+    const { startMcpServer } = await import("./server-EDPNSY35.js");
     await startMcpServer(transport, port);
   }
 });
@@ -6501,7 +6500,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "1.31.3" : "0.0.0";
+  const version = true ? "1.31.5" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -6774,10 +6773,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"1.31.3"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"1.31.5"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"1.31.3"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"1.31.5"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -6836,7 +6835,7 @@ var configCommand = defineCommand65({
 var main = defineCommand65({
   meta: {
     name: "apes",
-    version: "1.31.3",
+    version: "1.31.5",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -6894,9 +6893,9 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
-await maybeWarnStaleVersion("1.31.3").catch(() => {
+await maybeWarnStaleVersion("1.31.5").catch(() => {
 });
-runMain(main).catch((err) => {
+function handleCliError(err) {
   if (err instanceof CliExit) {
     process.exit(err.exitCode);
   }
@@ -6910,5 +6909,21 @@ runMain(main).catch((err) => {
     consola54.error(err instanceof ApiError ? err.message : err instanceof Error ? err.message : String(err));
   }
   process.exit(1);
-});
+}
+var rawArgs = process.argv.slice(2);
+var dashDash = rawArgs.indexOf("--");
+var flagScan = dashDash === -1 ? rawArgs : rawArgs.slice(0, dashDash);
+var wantsBuiltin = rawArgs.length === 0 || flagScan.some((a) => a === "-h" || a === "--help" || a === "-v" || a === "--version");
+if (wantsBuiltin) {
+  runMain(main).catch(handleCliError);
+} else {
+  runCittyCommand(main, { rawArgs }).catch((err) => {
+    const code = err?.code;
+    if (typeof code === "string" && code.startsWith("E_")) {
+      runMain(main).catch(handleCliError);
+      return;
+    }
+    handleCliError(err);
+  });
+}
 //# sourceMappingURL=cli.js.map