@openape/apes 0.11.2 → 0.12.1

package/dist/cli.js

@@ -12,10 +12,12 @@ import {
   checkSudoRejection,
   isApesSelfDispatch,
   notifyGrantPending
-} from "./chunk-2S2J4OSK.js";
+} from "./chunk-OFIVF6NH.js";
 import {
   ApiError,
+  GENERIC_OPERATION_ID,
   apiFetch,
+  buildGenericResolved,
   buildStructuredCliGrantRequest,
   createShapesGrant,
   extractOption,
@@ -40,21 +42,23 @@ import {
   resolveCapabilityRequest,
   resolveCommand,
   resolveFromGrant,
+  resolveGenericOrReject,
   searchAdapters,
   verifyAndExecute,
   waitForGrantStatus
-} from "./chunk-U4CI2RBO.js";
+} from "./chunk-O7GSG3OE.js";
 import {
   AUTH_FILE,
   CONFIG_DIR,
   clearAuth,
   getAuthToken,
   getIdpUrl,
+  isGenericFallbackEnabled,
   loadAuth,
   loadConfig,
   saveAuth,
   saveConfig
-} from "./chunk-6JSOSD7R.js";
+} from "./chunk-6GPSKAMU.js";
 
 // src/cli.ts
 import consola27 from "consola";
@@ -1187,15 +1191,24 @@ var runGrantCommand = defineCommand12({
     const hasOpenApeCliDetail = authDetails.some((d) => d?.type === "openape_cli");
     const isShapesGrant = hasOpenApeCliDetail || audience === "shapes";
     if (isShapesGrant) {
+      const isGenericGrant = authDetails.some((d) => d?.operation_id === GENERIC_OPERATION_ID);
       let resolved;
-      try {
-        resolved = await resolveFromGrant(grant);
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        throw new CliError(`Cannot re-resolve grant: ${msg}`);
+      if (isGenericGrant) {
+        const argv = grant.request?.command ?? [];
+        if (argv.length === 0)
+          throw new CliError(`Generic grant ${grant.id} is missing command argv`);
+        const cliId = authDetails.find((d) => d?.operation_id === GENERIC_OPERATION_ID)?.cli_id ?? argv[0];
+        resolved = await buildGenericResolved(cliId, argv);
+      } else {
+        try {
+          resolved = await resolveFromGrant(grant);
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          throw new CliError(`Cannot re-resolve grant: ${msg}`);
+        }
       }
       const token = await fetchGrantToken(idp, grant.id);
-      await verifyAndExecute(token, resolved);
+      await verifyAndExecute(token, resolved, grant.id);
       return;
     }
     if (audience === "escapes") {
@@ -2244,7 +2257,7 @@ async function tryAdapterModeFromShell(command, idp, args) {
     if (existingGrantId) {
       consola19.info(`Reusing grant ${existingGrantId} for: ${resolved.detail.display}`);
       const token = await fetchGrantToken(idp, existingGrantId);
-      await verifyAndExecute(token, resolved);
+      await verifyAndExecute(token, resolved, existingGrantId);
       return true;
     }
   } catch {
@@ -2275,7 +2288,7 @@ async function tryAdapterModeFromShell(command, idp, args) {
     if (status !== "approved")
       throw new CliError(`Grant ${status}`);
     const token = await fetchGrantToken(idp, grant.id);
-    await verifyAndExecute(token, resolved);
+    await verifyAndExecute(token, resolved, grant.id);
     return true;
   }
   printPendingGrantInfo(grant, idp);
@@ -2311,6 +2324,11 @@ function extractPositionals(rawArgs) {
   }
   return positionals;
 }
+function printGenericWarning(cliId) {
+  process.stderr.write(`\u26A0 No shape registered for \`${cliId}\`.
+`);
+  process.stderr.write("Generic mode active \u2014 single-use grant will be required.\n");
+}
 async function runAdapterMode(command, rawArgs, args) {
   const idp = getIdpUrl(args.idp);
   if (!idp)
@@ -2320,15 +2338,28 @@ async function runAdapterMode(command, rawArgs, args) {
     return;
   }
   const adapterOpt = extractOption(rawArgs, "adapter");
-  const loaded = loadAdapter(command[0], adapterOpt);
-  const resolved = await resolveCommand(loaded, command);
+  const cliId = command[0];
+  let resolved;
+  try {
+    const loaded = loadAdapter(cliId, adapterOpt);
+    resolved = await resolveCommand(loaded, command);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const isNoAdapter = message.startsWith("No adapter found for ");
+    if (!isNoAdapter)
+      throw err;
+    resolved = await resolveGenericOrReject(cliId, command, {
+      genericEnabled: isGenericFallbackEnabled()
+    });
+    printGenericWarning(cliId);
+  }
   const approval = args.approval ?? "once";
   try {
     const existingGrantId = await findExistingGrant(resolved, idp);
     if (existingGrantId) {
       consola19.info(`Reusing existing grant: ${existingGrantId}`);
       const token = await fetchGrantToken(idp, existingGrantId);
-      await verifyAndExecute(token, resolved);
+      await verifyAndExecute(token, resolved, existingGrantId);
       return;
     }
   } catch {
@@ -2355,7 +2386,7 @@ async function runAdapterMode(command, rawArgs, args) {
     if (status !== "approved")
       throw new Error(`Grant ${status}`);
     const token = await fetchGrantToken(idp, grant.id);
-    await verifyAndExecute(token, resolved);
+    await verifyAndExecute(token, resolved, grant.id);
     return;
   }
   printPendingGrantInfo(grant, idp);
@@ -2692,7 +2723,7 @@ var mcpCommand = defineCommand26({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-TYXGOFDQ.js");
+    const { startMcpServer } = await import("./server-RAQYZA5U.js");
     await startMcpServer(transport, port);
   }
 });
@@ -3184,7 +3215,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "0.11.2" : "0.0.0";
+  const version = true ? "0.12.1" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -3386,10 +3417,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"0.11.2"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"0.12.1"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"0.11.2"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"0.12.1"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -3404,7 +3435,7 @@ if (shellRewrite) {
     console.log("  --help, -h      Show this help message");
     process.exit(0);
   } else if (shellRewrite.action === "interactive") {
-    const { runInteractiveShell } = await import("./orchestrator-CWDQIMJN.js");
+    const { runInteractiveShell } = await import("./orchestrator-EHFFTEL5.js");
     await runInteractiveShell();
     process.exit(0);
   } else {
@@ -3447,7 +3478,7 @@ var configCommand = defineCommand33({
 var main = defineCommand33({
   meta: {
     name: "apes",
-    version: "0.11.2",
+    version: "0.12.1",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {