@commercelayer/agent-cli 1.0.0-dev.10 → 1.0.0-dev.11

package/README.md

@@ -18,7 +18,7 @@ This is the 1.0.0 line, in development on the `clean-slate` branch. It replaces
 - A dotted flag sets part of an object: `--customer.email ada@example.com`. An `in` filter takes several values as the flag repeated or a JSON array; on enums, numbers and dates also separated by commas, while a name or text is one value even with a comma in it (`--tax-calculator.in "UK VAT, manual"`), and a list that has one is sent as a JSON array. Any other array takes a JSON array, values separated by commas, or the flag repeated; an array of objects takes `key=value` pairs, one object per flag: `--items sku=COFFEE,quantity=2`. `--data` takes the fields as one JSON object, or `@` and a file name.
 - Amounts are in major units: `--amount 12.50`.
 - A secret field the schema marks `secret_input` (provider credentials) has no flag of its own: `--credentials-file <file>` reads it, as JSON or `KEY=value` lines, from a plain file only its owner can read (mode 600). Without the file, a terminal asks for it without echo; with neither, the command stops with `secret_required`. It is refused as a flag value or in `--data`, and never printed.
-- A document field the schema marks `file_input` (price rules, rule filters) also reads from a JSON file: `--file <file>`, or `--<field>-file` when a verb has more than one.
+- A document field the schema marks `file_input` (price rules, rule filters) also reads from a JSON file: `--file <file>`, or `--<field>-file` when a verb has more than one. Where the verb takes `--format csv` (`imports create`), the file goes as CSV text with `--format csv`, or when its name ends in `.csv` and no format is given; otherwise it is JSON.
 - A verb whose schema lists `id_alternative` takes the id or those flags in its place: `c11r prices get pr_1`, or `c11r prices get --sku BEANS-1KG --price-list eur`. Both at once, or half the flags, stop before sending.
 
 ## Built-in nouns
@@ -76,7 +76,7 @@ Destructive verbs (deletes, `orders cancel`, `payments void` and `refund`, `sand
 
 ## The store's setup in files
 
-`c11r config export` writes the organization's setup into the project folder: `store.yml` (the Configure nouns, refs by key, no ids, no secrets; its first key, `meta`, names the organization and the time) and `price_lists/<code>.csv`. It records what it wrote in `.c11r/export.json`, and never overwrites a file changed since the last export (or one no export wrote) without `--yes`: the answer lists them. A price list file the organization no longer has, unchanged since, goes. `c11r config plan` sends the files and answers what `config apply` would change; `apply` makes the organization match them, and with `--prune` (confirmed) also deletes what the files lack. While imports run, `apply` answers `status: running` with each noun's state and `retry_after`; `--wait` applies again until done or failed.
+`c11r config export` writes the organization's setup into the project folder: `store.yml` (the Configure nouns, refs by key, no ids, no secrets; its first key, `meta`, names the organization and the time) and `price_lists/<code>.csv` (in a row, an empty `compare_at_amount` means equal to `amount`, and one below `amount` is refused). It records what it wrote in `.c11r/export.json`, and never overwrites a file changed since the last export (or one no export wrote) without `--yes`: the answer lists them. A price list file the organization no longer has, unchanged since, goes. `c11r config plan` sends the files and answers what `config apply` would change; `apply` makes the organization match them, and with `--prune` (confirmed) also deletes what the files lack. While imports run, `apply` answers `status: running` with each noun's state, `retry_after` and the run's token, `run`; `--wait` applies again with that token and the same files until done or failed, and the done answer counts everything the run wrote. The `next` an unfinished apply suggests carries `--run <token> --wait`. `plan` lists in `needs` the new records the files can't make alone (a webhook without its `callback_url`); `apply` skips them and warns `needs_input` with the command that creates each.
 
 Records that share a key (two shipping methods with the same name in one market, say) can't be matched to the files. `export` and `plan` list them in `ambiguous` (an empty list when there are none), each with the command that makes its key differ, and `export` puts the first one at the top of `next`. `apply` refuses with `conflict` and the same list in `error.details.ambiguous`, before it writes anything.
 

package/dist/builtins/extensions.js

@@ -169,14 +169,18 @@ export const config = {
             };
         }
         if (name === 'plan' || name === 'apply') {
-            const req = resourceRequest('config', run.verb, undefined, run.parsed.values);
-            let r = await run.send(req);
+            const values = run.parsed.values;
+            let r = await run.send(resourceRequest('config', run.verb, undefined, values));
             const started = Date.now();
-            while (name === 'apply' && run.parsed.values.wait && r.data?.status === 'running' && Date.now() - started < WAIT_MAX_MS) {
+            while (name === 'apply' && values.wait && r.data?.status === 'running' && Date.now() - started < WAIT_MAX_MS) {
                 const ms = waitMs(r.data);
                 process.stderr.write(JSON.stringify({ running: { nouns: states(r.data), next_in_ms: ms } }) + '\n');
                 await sleep(ms);
-                r = await run.send(req);
+                // The same run carries on (45.9): its token goes back with the same files, so done counts
+                // everything the run wrote.
+                if (typeof r.data?.run === 'string')
+                    values.run = r.data.run;
+                r = await run.send(resourceRequest('config', run.verb, undefined, values));
             }
             const warnings = [...r.warnings];
             const here = storeFileOrg();
@@ -192,12 +196,25 @@ export const config = {
                 ...r,
                 data: running ? { ...data, retry_after: waitMs(data) / 1000, states: states(data) } : data,
                 warnings,
-                next: running && !run.parsed.values.wait ? [{ command: `${run.line} --wait`, why: 'carry on, and wait until every noun is done or failed' }, ...r.next] : r.next,
+                next: running ? [{ command: carryOn(run.line, run.verb.flags.run ? data.run : undefined), why: 'carry on with the same files, and wait until every noun is done or failed' }, ...r.next] : r.next,
             };
         }
         return undefined;
     },
 };
+/**
+ * The apply that carries this run on: the same line with its --run token and --wait. Without --yes:
+ * a yes covers the run the human saw, so carrying on a prune is confirmed again.
+ */
+function carryOn(line, token) {
+    let out = line
+        .replace(/\s--run(=|\s+)("[^"]*"|'[^']*'|\S+)/g, '')
+        .replace(/\s--wait\b/g, '')
+        .replace(/\s(--yes|-y)(?=\s|$)/g, '');
+    if (typeof token === 'string' && token)
+        out += ` --run ${/^[\w.~:+\/=-]+$/.test(token) ? token : `'${token.replace(/'/g, `'\\''`)}'`}`;
+    return `${out} --wait`;
+}
 /** Each noun's state while apply runs: done, running (with its import), waiting, failed or unchanged. */
 function states(data) {
     const out = {};

package/dist/inputs.js

@@ -4,6 +4,8 @@
 // KEY=value lines, from a plain file only its owner can read; or, in a terminal, typed without
 // echo. Never from a flag value or --data, never printed: an error names the file, not the value.
 // A document field (file_input: price rules, rule filters) is also read from a JSON file, --file.
+// Where the verb takes --format csv (imports), the file is sent as CSV text with --format csv, or
+// when it ends in .csv and no format is given; JSON otherwise.
 import fs from 'node:fs';
 import { toFlag } from './argv.js';
 import { fail } from './errors.js';
@@ -29,7 +31,12 @@ export async function readInputs(noun, verb, parsed, prompter) {
                 continue;
             if (parsed.values[input.target] !== undefined)
                 fail('invalid_value', `${cmd} takes ${input.target} from ${toFlag(input.target)} or from ${toFlag(key)}, not both.`, { path: key });
-            parsed.values[input.target] = documentOf(file, key, spec);
+            if (isCsv(verb, parsed, file)) {
+                parsed.values.format ??= 'csv';
+                parsed.values[input.target] = csvOf(file, key);
+            }
+            else
+                parsed.values[input.target] = documentOf(file, key, spec);
             continue;
         }
         if (file !== undefined) {
@@ -51,6 +58,19 @@ export async function readInputs(noun, verb, parsed, prompter) {
         });
     }
 }
+const isCsv = (verb, parsed, file) => Boolean(verb.flags.format?.values?.includes('csv')) && (parsed.values.format === 'csv' || (parsed.values.format === undefined && /\.csv$/i.test(file)));
+function csvOf(file, key) {
+    let text;
+    try {
+        text = fs.readFileSync(file, 'utf8');
+    }
+    catch (e) {
+        fail('invalid_value', `${toFlag(key)} ${file}: ${e.code === 'ENOENT' ? 'no such file' : e.message}.`, { path: key });
+    }
+    if (!text.trim())
+        fail('invalid_value', `${file} is empty: a CSV file starts with its header row.`, { path: key });
+    return text;
+}
 function documentOf(file, key, spec) {
     let text;
     try {

package/dist/schema.js

@@ -103,7 +103,9 @@ function fileInputs(flags, fields, body) {
             type: 'string',
             to: 'local',
             input: { kind: 'document', target: k, required: Boolean(flags[k].required), target_type: flags[k].type },
-            description: `A JSON file with ${k}, in place of ${toFlag(k)}.`,
+            description: flags.format?.values?.includes('csv')
+                ? `A file with ${k}, in place of ${toFlag(k)}: JSON, or CSV with --format csv or a name ending in .csv.`
+                : `A JSON file with ${k}, in place of ${toFlag(k)}.`,
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercelayer/agent-cli",
-  "version": "1.0.0-dev.10",
+  "version": "1.0.0-dev.11",
   "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": [