@thinremote/thinr-cli 1.5.0 → 1.6.1

package/commands/product/fs.js

@@ -184,7 +184,7 @@ export function registerProductFsCommands(product) {
     registerProductFsCommand(product, {
         name: 'mkdir',
         description: 'Create a directory on every active device of the product',
-        args: '<productId> <path>',
+        args: '<product> <path>',
         perDeviceLabel: ([path]) => `mkdir ${path}`,
         build: async (api, [path]) => {
             await api.mkdir(path);
@@ -195,7 +195,7 @@ export function registerProductFsCommands(product) {
         name: 'rm',
         description:
             'Delete a file or directory on every active device of the product (DESTRUCTIVE — double-check the path).',
-        args: '<productId> <path>',
+        args: '<product> <path>',
         perDeviceLabel: ([path]) => `rm ${path}`,
         build: async (api, [path], opts) => {
             await api.delete(path, opts.recursive !== false);
@@ -209,7 +209,7 @@ export function registerProductFsCommands(product) {
     registerProductFsCommand(product, {
         name: 'mv',
         description: 'Move or rename a path on every active device of the product',
-        args: '<productId> <source> <destination>',
+        args: '<product> <source> <destination>',
         perDeviceLabel: ([src, dst]) => `mv ${src} → ${dst}`,
         build: async (api, [src, dst], opts) => {
             await api.move(src, dst, !!opts.force);

package/commands/product/index.js

@@ -10,10 +10,11 @@ import { registerProductPlaybookCommand } from './playbook.js';
 import { registerProductLogsCommand } from './logs.js';
 
 /**
- * `thinr product <subcommand> <productId> …` — fan-out commands across
- * every device that belongs to a product, plus metrics, scripts and
- * playbooks, added to the generic `product` group of @thinger-io/cli-core
- * (list, info, create, delete, property-list/get/set/delete).
+ * `thinr product <verb> <product> …` — fan-out commands across every device
+ * that belongs to a product (status, exec, files, device-property,
+ * device-resource), plus its metrics, log sources and playbooks, added to
+ * the generic `product` group of @thinger-io/cli-core (records,
+ * properties, profile, export, apply).
  */
 export function registerProductCommands(product) {
     registerProductStatusCommand(product);

package/commands/product/logs.js

@@ -9,7 +9,7 @@ import {
 } from '../../lib/product/logs.js';
 import { hint, info, label, muted, success } from '@thinger-io/cli-core/format';
 import { classifyError, isJsonMode, printErr, printOk } from '@thinger-io/cli-core/output';
-import { applyJsonFlag, ensureConfigured, getGlobalUser } from '../_shared.js';
+import { applyJsonFlag, confirmDestructive, ensureConfigured, getGlobalUser } from '../_shared.js';
 
 function truncate(value, max = 60) {
     if (typeof value !== 'string') return '';
@@ -17,9 +17,8 @@ function truncate(value, max = 60) {
 }
 
 function registerList(logs) {
-    logs
-        .command('list <productId>')
-        .helpGroup('Log sources:')
+    logs.command('list <product>')
+        .helpGroup('Records:')
         .description('List the log sources configured on a product')
         .option('-j, --json', 'Output as JSON')
         .action(async (productId, opts, cmd) => {
@@ -73,12 +72,14 @@ function registerList(logs) {
         });
 }
 
-function registerAdd(logs) {
-    logs
-        .command('add <productId> <name>')
-        .helpGroup('Log sources:')
+function registerCreate(logs) {
+    logs.command('create <product> <name>')
+        .helpGroup('Records:')
         .description('Add or replace a log source on a product')
-        .requiredOption('-c, --command <cmd>', 'Shell command the agent should exec-stream for this source')
+        .requiredOption(
+            '-c, --command <cmd>',
+            'Shell command the agent should exec-stream for this source',
+        )
         .option('--default', 'Mark this source as the active default')
         .option(
             '--pattern <regex>',
@@ -115,7 +116,8 @@ function registerAdd(logs) {
                 );
                 console.log(`  ${muted('command:')} ${truncate(opts.command, 80)}`);
                 if (opts.preset) console.log(`  ${muted('preset:')} ${opts.preset}`);
-                if (opts.pattern) console.log(`  ${muted('pattern:')} ${truncate(opts.pattern, 80)}`);
+                if (opts.pattern)
+                    console.log(`  ${muted('pattern:')} ${truncate(opts.pattern, 80)}`);
                 console.log(
                     `  ${muted('total sources:')} ${config.sources.length}${
                         config.default ? `  ${muted('default:')} ${config.default}` : ''
@@ -128,17 +130,19 @@ function registerAdd(logs) {
         });
 }
 
-function registerRemove(logs) {
-    logs
-        .command('remove <productId> <name>')
-        .alias('rm')
-        .helpGroup('Log sources:')
+function registerDelete(logs) {
+    logs.command('delete <product> <name>')
+        .helpGroup('Records:')
         .description('Remove a log source from a product (idempotent)')
+        .option('-y, --yes', 'Do not ask for confirmation')
         .option('-j, --json', 'Output as JSON')
         .action(async (productId, name, opts, cmd) => {
             applyJsonFlag(opts);
             ensureConfigured();
             const user = getGlobalUser(cmd);
+            if (!(await confirmDestructive(opts, `Remove log source ${name} from ${productId}?`))) {
+                return;
+            }
             try {
                 const { removed, config } = await removeLogSource(productId, name, user);
                 if (isJsonMode()) {
@@ -152,9 +156,7 @@ function registerRemove(logs) {
                     return;
                 }
                 if (!removed) {
-                    console.log(
-                        `Source ${info(name)} was not configured on ${info(productId)}.`,
-                    );
+                    console.log(`Source ${info(name)} was not configured on ${info(productId)}.`);
                     return;
                 }
                 if (config === null) {
@@ -175,9 +177,8 @@ function registerRemove(logs) {
 }
 
 function registerSetDefault(logs) {
-    logs
-        .command('set-default <productId> <name>')
-        .helpGroup('Log sources:')
+    logs.command('set-default <product> <name>')
+        .helpGroup('Actions:')
         .description('Set the active default source on a product')
         .option('-j, --json', 'Output as JSON')
         .action(async (productId, name, opts, cmd) => {
@@ -200,10 +201,9 @@ function registerSetDefault(logs) {
         });
 }
 
-function registerShow(logs) {
-    logs
-        .command('show <productId> <name>')
-        .helpGroup('Log sources:')
+function registerGet(logs) {
+    logs.command('get <product> <name>')
+        .helpGroup('Records:')
         .description('Show a single log source (full command, untruncated)')
         .option('-j, --json', 'Output as JSON')
         .action(async (productId, name, opts, cmd) => {
@@ -235,7 +235,9 @@ function registerShow(logs) {
                     });
                     return;
                 }
-                console.log(`${label('Source')}: ${info(source.name)}${isDefault ? ` ${muted('(default)')}` : ''}`);
+                console.log(
+                    `${label('Source')}: ${info(source.name)}${isDefault ? ` ${muted('(default)')}` : ''}`,
+                );
                 console.log(`${label('Command')}: ${source.command}`);
                 if (source.preset) console.log(`${label('Preset')}: ${source.preset}`);
                 if (source.pattern) console.log(`${label('Pattern')}: ${source.pattern}`);
@@ -248,9 +250,8 @@ function registerShow(logs) {
 }
 
 function registerPresets(logs) {
-    logs
-        .command('presets')
-        .helpGroup('Log sources:')
+    logs.command('presets')
+        .helpGroup('Records:')
         .description('List the named log line patterns shipped with the CLI')
         .option('-j, --json', 'Output as JSON')
         .action(async (opts) => {
@@ -275,15 +276,13 @@ function registerPresets(logs) {
 export function registerProductLogsCommand(product) {
     const logs = product
         .command('logs')
-        .helpGroup('Log sources:')
-        .description(
-            `Manage log sources stored on a product. ${hint('Subcommands: list, add, remove, set-default, show, presets.')}`,
-        );
+        .helpGroup('Product config:')
+        .description('Log sources of a product: the commands `thinr device logs` streams');
 
     registerList(logs);
-    registerAdd(logs);
-    registerRemove(logs);
+    registerGet(logs);
+    registerCreate(logs);
+    registerDelete(logs);
     registerSetDefault(logs);
-    registerShow(logs);
     registerPresets(logs);
 }

package/commands/product/metric.js

@@ -6,7 +6,7 @@ import {
 } from '../../lib/product.js';
 import { info, success } from '@thinger-io/cli-core/format';
 import { isJsonMode, printOk, printErr, classifyError } from '@thinger-io/cli-core/output';
-import { applyJsonFlag, ensureConfigured, getGlobalUser } from '../_shared.js';
+import { applyJsonFlag, confirmDestructive, ensureConfigured, getGlobalUser } from '../_shared.js';
 
 function stringifyMetricLine(m) {
     const parts = [
@@ -20,10 +20,19 @@ function stringifyMetricLine(m) {
     return `${m.name}  ${parts.join('  ')}${trail}`;
 }
 
+/**
+ * `thinr product metric list|set|delete` — the metrics thinr's terminal
+ * dashboard shows for a product (its `dashboard_metrics` property).
+ */
 export function registerProductMetricCommands(product) {
-    product
-        .command('metric-list <productId>')
+    const metric = product
+        .command('metric')
         .helpGroup('Product config:')
+        .description("Dashboard metrics of a product (thinr's terminal dashboard)");
+
+    metric
+        .command('list <product>')
+        .helpGroup('Records:')
         .description('List dashboard metrics configured on a product')
         .option('-j, --json', 'Output as JSON')
         .action(async (productId, opts, cmd) => {
@@ -48,9 +57,9 @@ export function registerProductMetricCommands(product) {
             }
         });
 
-    product
-        .command('metric-set <productId> <name>')
-        .helpGroup('Product config:')
+    metric
+        .command('set <product> <name>')
+        .helpGroup('Records:')
         .description('Add or update a dashboard metric on a product')
         .requiredOption('-r, --resource <resource>', 'Product API resource the dashboard invokes')
         .option('-l, --label <label>', 'Human-readable label for the metric')
@@ -59,13 +68,10 @@ export function registerProductMetricCommands(product) {
             '-a, --aggregation <agg>',
             'Aggregation across the fleet (sum, avg, max, min, count, top, none, distribution)',
         )
-        .option(
-            '-v, --visualization <viz>',
-            'Dashboard rendering hint (kpi, bar, sparkline, list)',
-        )
+        .option('-v, --visualization <viz>', 'Dashboard rendering hint (kpi, bar, sparkline, list)')
         .option('-i, --interval <seconds>', 'Dashboard refresh interval in seconds', Number)
         .option('--unit <unit>', 'Unit suffix for display (e.g. "%", "devices")')
-        .option('--json', 'Output as JSON')
+        .option('-j, --json', 'Output as JSON')
         .action(async (productId, name, opts, cmd) => {
             applyJsonFlag(opts);
             ensureConfigured();
@@ -96,15 +102,19 @@ export function registerProductMetricCommands(product) {
             }
         });
 
-    product
-        .command('metric-delete <productId> <name>')
-        .helpGroup('Product config:')
+    metric
+        .command('delete <product> <name>')
+        .helpGroup('Records:')
         .description('Remove a dashboard metric from a product')
+        .option('-y, --yes', 'Do not ask for confirmation')
         .option('-j, --json', 'Output as JSON')
         .action(async (productId, name, opts, cmd) => {
             applyJsonFlag(opts);
             ensureConfigured();
             const user = getGlobalUser(cmd);
+            if (!(await confirmDestructive(opts, `Remove metric ${name} from ${productId}?`))) {
+                return;
+            }
             try {
                 const { action, count } = await removeDashboardMetric(productId, name, user);
                 if (isJsonMode()) {

package/commands/product/playbook.js

@@ -32,6 +32,7 @@ import { classifyError, createSpinner, isJsonMode, printErr, printOk } from '@th
 import {
     applyJsonFlag,
     collectKeyValue,
+    confirmDestructive,
     ensureConfigured,
     getGlobalUser,
     parsePositiveInt,
@@ -47,7 +48,7 @@ async function readAllStdin() {
 
 function registerList(playbook) {
     playbook
-        .command('list <productId>')
+        .command('list <product>')
         .helpGroup('Playbooks:')
         .description('List playbooks registered on a product')
         .option('-j, --json', 'Output as JSON')
@@ -83,7 +84,7 @@ function registerList(playbook) {
 
 function registerUpload(playbook) {
     playbook
-        .command('upload <productId> <name> [file]')
+        .command('upload <product> <name> [file]')
         .helpGroup('Playbooks:')
         .description(
             'Upload a playbook YAML to a product (reads stdin when <file> is omitted or "-")',
@@ -153,7 +154,7 @@ function registerUpload(playbook) {
 
 function registerDownload(playbook) {
     playbook
-        .command('download <productId> <name>')
+        .command('download <product> <name>')
         .helpGroup('Playbooks:')
         .description('Download a playbook YAML by name (writes to stdout by default)')
         .option('-o, --output <file>', 'Write to a local file instead of stdout')
@@ -200,14 +201,18 @@ function registerDownload(playbook) {
 
 function registerDelete(playbook) {
     playbook
-        .command('delete <productId> <name>')
+        .command('delete <product> <name>')
         .helpGroup('Playbooks:')
         .description('Delete a playbook from a product (idempotent)')
+        .option('-y, --yes', 'Do not ask for confirmation')
         .option('-j, --json', 'Output as JSON')
         .action(async (productId, name, opts, cmd) => {
             applyJsonFlag(opts);
             ensureConfigured();
             const user = getGlobalUser(cmd);
+            if (!(await confirmDestructive(opts, `Delete playbook ${name} from ${productId}?`))) {
+                return;
+            }
             const spinner = createSpinner(`Deleting playbook ${name} from ${productId}...`).start();
             try {
                 const result = await deleteProductPlaybook({ product: productId, name, user });
@@ -772,7 +777,7 @@ async function runFleet({ productId, name, pb, overrides, resolvedScope, user, o
 
 function registerRun(playbook) {
     playbook
-        .command('run <productId> <name>')
+        .command('run <product> <name>')
         .helpGroup('Playbooks:')
         .description('Run a product playbook against one device or the whole fleet (progressive rollout)')
         .option('-d, --device <id>', 'Target device ID (single-device mode)')

package/commands/product/property.js

@@ -9,17 +9,12 @@ import {
     createSpinner,
     classifyError,
 } from '@thinger-io/cli-core/output';
-import {
-    applyJsonFlag,
-    ensureConfigured,
-    extractField,
-    getGlobalUser,
-} from '../_shared.js';
+import { applyJsonFlag, ensureConfigured, extractField, getGlobalUser } from '../_shared.js';
 import { fetchProductDevices } from './_shared.js';
 
 export function registerProductPropertyCommand(product) {
     product
-        .command('property <productId> <propertyId>')
+        .command('device-property <product> <property>')
         .helpGroup('Fan-out:')
         .description('Read a property on every device of the product')
         .option('-j, --json', 'Output as JSON')
@@ -46,16 +41,11 @@ export function registerProductPropertyCommand(product) {
             const results = [];
             for (const device of devices) {
                 try {
-                    const property = await getDeviceProperty(device.device, propertyId);
+                    const property = await getDeviceProperty(device.device, propertyId, user);
                     const value = extractField(property, opts.field);
                     results.push({ device: device.device, ok: true, data: value });
                     if (!isJsonMode()) {
-                        console.log(
-                            'Device',
-                            info(device.device),
-                            'property',
-                            info(propertyId),
-                        );
+                        console.log('Device', info(device.device), 'property', info(propertyId));
                         if (opts.field) console.log(value);
                         else console.log(formatDeviceProperty(device.device, propertyId, property));
                     }

package/commands/product/push.js

@@ -28,7 +28,7 @@ import {
 
 export function registerProductPushCommand(product) {
     product
-        .command('push <productId> <localPath> <remotePath>')
+        .command('push <product> <local-path> <remote-path>')
         .helpGroup('Filesystem:')
         .description('Upload a local file to every active device of a product, in parallel')
         .option('-j, --json', 'Output as JSON')

package/commands/product/resource.js

@@ -9,68 +9,68 @@ import {
     createSpinner,
     classifyError,
 } from '@thinger-io/cli-core/output';
-import {
-    applyJsonFlag,
-    collectInput,
-    ensureConfigured,
-    extractField,
-    getGlobalUser,
-} from '../_shared.js';
+import { bodyFromOptions, bodyOptions } from '@thinger-io/cli-core/commands/_shared';
+import { applyJsonFlag, ensureConfigured, extractField, getGlobalUser } from '../_shared.js';
 import { fetchProductDevices } from './_shared.js';
 
 export function registerProductResourceCommand(product) {
-    product
-        .command('resource <productId> <resource>')
-        .helpGroup('Fan-out:')
-        .description('Call a resource on every active device of the product')
-        .option('-j, --json', 'Output as JSON')
-        .option('-f, --field <field>', 'Extract a sub-field from each result (dot path)')
-        .option('-g, --group <group>', 'Filter devices by asset group')
-        .option('-i, --input <key=value>', 'Resource input (repeatable)', collectInput, {})
-        .action(async (productId, resource, opts, cmd) => {
-            applyJsonFlag(opts);
-            ensureConfigured();
-            const user = getGlobalUser(cmd);
-            const spinner = createSpinner(`Retrieving devices for product ${productId}...`).start();
-            let devices;
+    bodyOptions(
+        product
+            .command('device-resource <product> <resource>')
+            .helpGroup('Fan-out:')
+            .description(
+                'Call a resource on every active device of the product: with --from or --set it runs it with that input; without, it reads its output',
+            )
+            .option('-j, --json', 'Output as JSON')
+            .option('-f, --field <field>', 'Extract a sub-field from each result (dot path)')
+            .option('-g, --group <group>', 'Filter devices by asset group'),
+    ).action(async (productId, resource, opts, cmd) => {
+        applyJsonFlag(opts);
+        ensureConfigured();
+        const user = getGlobalUser(cmd);
+        let input;
+        try {
+            input = await bodyFromOptions(opts);
+        } catch (error) {
+            const { message, code } = classifyError(error);
+            printErr(message, { code });
+            return;
+        }
+        const spinner = createSpinner(`Retrieving devices for product ${productId}...`).start();
+        let devices;
+        try {
+            devices = await fetchProductDevices(productId, opts.group, user);
+            spinner.succeed(`Devices for product ${productId} retrieved successfully`);
+        } catch (error) {
+            spinner.fail(`Failed to retrieve devices for product ${productId}`);
+            const { message, code } = classifyError(error);
+            printErr(message, { code });
+            return;
+        }
+        devices = filterActiveDevices(devices);
+
+        const results = [];
+        for (const device of devices) {
             try {
-                devices = await fetchProductDevices(productId, opts.group, user);
-                spinner.succeed(`Devices for product ${productId} retrieved successfully`);
+                const result = await callDeviceResource(device.device, resource, input, { user });
+                const value = extractField(result, opts.field);
+                results.push({ device: device.device, ok: true, data: value });
+                if (!isJsonMode()) {
+                    console.log('Device', info(device.device), 'resource', info(resource));
+                    console.log(value);
+                }
             } catch (error) {
-                spinner.fail(`Failed to retrieve devices for product ${productId}`);
                 const { message, code } = classifyError(error);
-                printErr(message, { code });
-                return;
-            }
-            devices = filterActiveDevices(devices);
-
-            const results = [];
-            for (const device of devices) {
-                try {
-                    const result = await callDeviceResource(device.device, resource, opts.input);
-                    const value = extractField(result, opts.field);
-                    results.push({ device: device.device, ok: true, data: value });
-                    if (!isJsonMode()) {
-                        console.log(
-                            'Device',
-                            info(device.device),
-                            'resource',
-                            info(resource),
-                        );
-                        console.log(value);
-                    }
-                } catch (error) {
-                    const { message, code } = classifyError(error);
-                    results.push({ device: device.device, ok: false, error: { message, code } });
-                    if (!isJsonMode()) {
-                        console.error(
-                            errorStyle(
-                                `Error executing resource ${resource} for device ${device.device}: ${message}`,
-                            ),
-                        );
-                    }
+                results.push({ device: device.device, ok: false, error: { message, code } });
+                if (!isJsonMode()) {
+                    console.error(
+                        errorStyle(
+                            `Error executing resource ${resource} for device ${device.device}: ${message}`,
+                        ),
+                    );
                 }
             }
-            if (isJsonMode()) printOk({ product: productId, resource, results });
-        });
+        }
+        if (isJsonMode()) printOk({ product: productId, resource, results });
+    });
 }

package/commands/product/status.js

@@ -29,7 +29,7 @@ import { fetchProductDevices } from './_shared.js';
 
 export function registerProductStatusCommand(product) {
     product
-        .command('status <productId>')
+        .command('status <product>')
         .helpGroup('Discovery:')
         .description('Snapshot of every device in the product (status + monitoring)')
         .option('-j, --json', 'Output as JSON')

package/docs/guides/thinremote-metrics-logs.md

@@ -5,8 +5,12 @@ its terminal dashboard (`thinr` with no arguments) shows for a product, and
 the log sources an operator can stream from a device (in that dashboard or
 with `thinr device logs`). Today only thinr reads them; they are not the web
 console's dashboards (for those, see the server's `dashboard-sdk` guide and
-`thinr_dashboard_publish`). Both live on the server as product properties,
-so the devices need nothing and other clients could reuse them.
+the `dashboard` action `publish`). Both live on the server as product
+properties (type `product_property`, ids `{"product", "property"}`), so the
+devices need nothing and other clients could reuse them. Each is written
+whole: read it, change it, `resource_update` it with the whole `value`
+(not with `merge`). It is checked before it is saved, and
+`resource_describe` type `product_property` shows both shapes.
 
 Tool names below omit the `thinr_` prefix.
 
@@ -14,16 +18,14 @@ Tool names below omit the `thinr_` prefix.
 
 A metric is a value thinr's dashboard asks every device of the product for,
 and combines across the fleet: free disk, connected clients, service version…
-They live in the `dashboard_metrics` product property; edit them as the
-resource type `product_metric` (parent the product, id the metric's name:
-`resource_list`, `_get`, `_create`, `_update`, `_delete`), not by writing the
-property by hand.
+They live in the `dashboard_metrics` product property, an array of
+metrics with unique names (create the property with the first one).
 
 Fields of a metric:
 
 | Field           | Meaning                                                                                                  |
 | --------------- | -------------------------------------------------------------------------------------------------------- |
-| `name`          | Stable id (letters, digits, `_`, `-`): the resource id                                                   |
+| `name`          | Stable id (letters, digits, `_`, `-`), unique in the array                                               |
 | `label`         | Title in the panel                                                                                       |
 | `resource`      | Product API resource called on each device, usually a product script                                     |
 | `field`         | Dot path to the value in the response (`disk.used_pct`); omit for scalar responses                       |
@@ -33,8 +35,8 @@ Fields of a metric:
 | `unit`          | Display suffix (`%`, `devices`)                                                                          |
 
 Recipe: write a product script that prints the value as JSON (see
-`thinremote-scripts`), check it with `device_resource_call` on one device,
-then register the metric pointing at the script's resource name.
+`thinremote-scripts`), check it with the `device_resource` action `call` on
+one device, then add the metric pointing at the script's resource name.
 
 ## Log sources
 
@@ -42,18 +44,15 @@ A log source is a named shell command the agent streams when an operator
 opens a device's logs in thinr (`journalctl -f`, `docker logs -f app`,
 `tail -F /var/log/nginx/access.log`). They live in the `logs` product
 property; without it, products show a single `system` source running
-journalctl (listed with `fallback: true`). They are the resource type
-`product_log_source`, parent the product, id the source's name.
+journalctl. Its value is `{"sources": [...], "default"?: "<name>"}`.
 
-- `resource_create`: a source by `name` (≤ 32 chars, letters, digits,
-  `_`, `-`; up to 32 sources). The `command` is stored and run as is.
-  `default: true` makes it the one shown first (and the one
-  `thinr device logs` uses without `--source`).
+- A source has a `name` (≤ 32 chars, letters, digits, `_`, `-`; unique; up
+  to 32 sources) and a `command`, stored and run as is. `default` names the
+  one shown first (and the one `thinr device logs` uses without
+  `--source`).
 - Structured rendering: add a `preset` (`resource_describe` type
-  `product_log_source` lists them:
-  journalctl, spdlog, nginx…) or your own `pattern`, a regex with named
-  groups `time`, `level` and `msg`. With a `level` group, operators can filter
-  by severity. `preset` and `pattern` are mutually exclusive.
-- `resource_update` with `{"default": true}` picks the default;
-  `resource_delete` drops a source (removing the last one deletes the
-  property, back to the fallback).
+  `product_property` lists them: journalctl, spdlog, nginx…) or your own
+  `pattern`, a regex with named groups `time`, `level` and `msg`. With a
+  `level` group, operators can filter by severity. `preset` and `pattern`
+  are mutually exclusive.
+- Deleting the property (`resource_delete`) brings back the fallback.