@commercelayer/agent-cli 1.0.0-dev.15 → 1.0.0-dev.16

package/README.md

@@ -78,7 +78,7 @@ Destructive verbs (deletes, `orders cancel`, `payments void` and `refund`, `sand
 - A verb that never runs live (sandbox, plans, sales calls, `auth login`, `auth switch`, `shop`) stops on this machine with `state_required`.
 - `c11r status --live --org <slug>` is the organization's live status, with `live_credential` and the warning `live_credential_held` while the API holds one.
 - `c11r auth logout --live --org <slug>` revokes that credential in Commerce Layer (`DELETE /v1/auth/live`): `{ org, revoked, credential }`. The login stays on this machine. `--dry-run` says what it would revoke.
-- A destructive verb's confirmation names the mode and the organization: `Delete markets eu, in LIVE mode on S`. When the API supplies its own sentence (money, in a later step), that one is shown.
+- A verb that needs a yes is confirmed by the API in live, with a sentence naming the action, the amount and the mode (`Refunds EUR 1.00 on order N, in LIVE mode, real money.`): the CLI sends it without `confirm=true` and shows that `confirmation_required` as it is, with the API's next command, or asks it with those words in a terminal. `--yes` sends `confirm=true` on every live write, `payments capture` included.
 - A verb that answers a secret (`credentials create`) writes it in live only to the file the human chose with `--out`: without it, `missing_value` with the command and `--out FILE`. Never to c11r's secrets folder, never printed. A live delete leaves the test mode's secret files of the same organization alone.
 - `store.yml`, `.c11r/export.json` and the drift notes are of an organization in a mode: a live write marks a live `store.yml` behind, never a test one, and the other way round.
 - `c11r organizations disconnect <slug>` (confirmed) has the API revoke its credentials and the organization tokens; this machine then forgets the token, its secret files and a `.c11r.json` naming it, as `sandbox destroy` does, and answers `forgotten`.

package/dist/engine.js

@@ -118,10 +118,16 @@ async function executeOnce(argv, opts) {
     const loginOrg = org.source && org.source !== 'only_stored' ? org.org : null;
     let confirmed = false;
     const confirmFlags = verb.confirmIf.filter((k) => parsed.values[k] !== undefined && parsed.values[k] !== false);
-    if ((verb.destructive || verb.confirm || confirmFlags.length) && !cmd.globals.dryRun) {
+    // In live mode the API asks for the verbs it confirms, with a sentence naming the action, the
+    // amount and the mode ("Refunds EUR 1.00 on order N, in LIVE mode, real money."): the CLI sends
+    // without confirm=true and shows that 428 as it is, or asks it in a terminal. --yes sends
+    // confirm=true on every live write, payments capture included.
+    const apiAsks = live && (verb.confirm || confirmFlags.length > 0);
+    if (live && cmd.globals.yes && verb.method !== 'GET')
+        confirmed = true;
+    if ((verb.destructive || verb.confirm || confirmFlags.length) && !cmd.globals.dryRun && !apiAsks) {
         const what = `${verb.name} ${schema.noun}${parsed.id ? ` ${parsed.id}` : ''}${confirmFlags.length ? ` with ${confirmFlags.map(toFlag).join(' ')}` : ''}`;
-        // In live mode the sentence says so, and on which organization.
-        const sentence = `${what.charAt(0).toUpperCase() + what.slice(1)}${live ? `, in LIVE mode on ${liveOrg}` : ''}`;
+        const sentence = what.charAt(0).toUpperCase() + what.slice(1);
         await confirm(sentence, line, { yes: cmd.globals.yes, prompter: opts.prompter });
         confirmed = true;
     }
@@ -149,6 +155,15 @@ async function executeOnce(argv, opts) {
                 return await sendOnce(req);
             }
             catch (e) {
+                // The API's own confirmation, in live: as it is with no terminal; asked with its words in one.
+                if (live && !confirmed && e instanceof CliError && e.code === 'confirmation_required') {
+                    const p = opts.prompter ?? terminal;
+                    if (!p.interactive)
+                        throw e;
+                    await confirm(e.body.message, line, { yes: false, prompter: p, sentence: e.body.message });
+                    confirmed = true;
+                    return sendOnce(req);
+                }
                 // A login token Commerce Layer no longer takes: mint a new one, once.
                 if (!(e instanceof CliError && e.code === 'login_required') || !login)
                     throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercelayer/agent-cli",
-  "version": "1.0.0-dev.15",
+  "version": "1.0.0-dev.16",
   "description": "c11r: the Commerce Layer CLI for coding agents. One grammar, c11r <noun> <verb>, from a sandbox to a running organization.",
   "homepage": "https://commercelayer.ai",
   "keywords": [