@thinremote/thinr-cli 1.3.4 → 1.4.0

package/commands/_shared.js

@@ -1,44 +1,15 @@
 // @ts-check
 import { InvalidArgumentError } from 'commander';
-import { configExists } from '../lib/config.js';
-import {
-    setJsonMode,
-    isJsonMode,
-    printOk,
-    printErr,
-    createSpinner,
-    classifyError,
-} from '../lib/output.js';
-
-export function ensureConfigured() {
-    if (!configExists()) {
-        printErr('Not configured. Run thinr without parameters to set up.', {
-            code: 'not_configured',
-        });
-    }
-}
-
-export function applyJsonFlag(opts) {
-    if (opts.json) setJsonMode(true);
-}
-
-// Walks up to the root program so subcommands can read `--user` regardless
-// of nesting depth.
-export function getGlobalUser(cmd) {
-    let root = cmd;
-    while (root.parent) root = root.parent;
-    return root.opts().user || null;
-}
-
-export function parsePositiveInt(label) {
-    return (value) => {
-        const n = Number(value);
-        if (!Number.isInteger(n) || n <= 0) {
-            throw new InvalidArgumentError(`${label} must be a positive integer`);
-        }
-        return n;
-    };
-}
+// Helpers shared with every CLI on @thinger-io/cli-core; `runDeviceCommand`
+// is the name thinr's subcommands have always used for its `runCommand`.
+export {
+    applyJsonFlag,
+    ensureConfigured,
+    extractField,
+    getGlobalUser,
+    parsePositiveInt,
+    runCommand as runDeviceCommand,
+} from '@thinger-io/cli-core/commands/_shared';
 
 // Collect repeatable `-i key=value` / `-v key=value` pairs into a single
 // object. Uses Commander's InvalidArgumentError so a bad value prints a
@@ -54,14 +25,6 @@ export function collectKeyValue(value, previous = {}) {
 export const collectInput = collectKeyValue;
 export const collectVar = collectKeyValue;
 
-// Resolve a dot-path against a nested object. Returns `undefined` as soon
-// as any intermediate hop is missing — matching the previous inline
-// `reduce((o, k) => o && o[k], obj)` behaviour across the CLI.
-export function extractField(obj, path) {
-    if (!path) return obj;
-    return path.split('.').reduce((o, k) => (o == null ? o : o[k]), obj);
-}
-
 /**
  * Live counter for fan-out spinners. Wraps an ora spinner and rewrites
  * its text as work enters/leaves the pool and completes. Use it to avoid
@@ -109,46 +72,3 @@ export class ProgressSpinner {
         this.spinner.stop();
     }
 }
-
-/**
- * One-shot command skeleton shared by read-only device subcommands
- * (status, list, property, resource…). Handles the spinner start,
- * try/catch, `classifyError`+`printErr` on failure, and the
- * `isJsonMode() ? printOk : console.log` default for the success path.
- *
- * Shape:
- *   await runDeviceCommand({
- *       start: 'Fetching devices…',          // spinner label
- *       fn: () => getDevices(filter),        // async unit of work
- *       success: n => `Found ${n} device(s)`,// string | (result) => string | null
- *       failure: 'Failed to list devices',   // string on failure
- *       onSuccess: (result) => { … },        // optional full render override
- *   });
- *
- * When `success` is `null` the spinner just stops (no checkmark), which
- * matches the idiom used by commands whose output block already speaks
- * for the "found" state. When `onSuccess` is omitted the result is
- * printed verbatim (`printOk` in JSON mode, `console.log` otherwise).
- */
-export async function runDeviceCommand({ start, fn, success, failure, onSuccess }) {
-    const spinner = createSpinner(start).start();
-    try {
-        const result = await fn();
-        if (success === null) {
-            spinner.stop();
-        } else {
-            spinner.succeed(typeof success === 'function' ? success(result) : success);
-        }
-        if (onSuccess) {
-            await onSuccess(result);
-        } else if (isJsonMode()) {
-            printOk(result);
-        } else {
-            console.log(result);
-        }
-    } catch (error) {
-        spinner.fail(typeof failure === 'function' ? failure(error) : failure);
-        const { message, code } = classifyError(error);
-        printErr(message, { code });
-    }
-}

package/commands/device/_shared.js

@@ -1,6 +1,6 @@
 // @ts-check
-import { classifyError } from '../../lib/output.js';
-import { error as errorStyle } from '../../lib/format.js';
+import { classifyError } from '@thinger-io/cli-core/output';
+import { error as errorStyle } from '@thinger-io/cli-core/format';
 
 export {
     ensureConfigured,

package/commands/device/exec.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { createDeviceAPI } from '../../lib/device-api.js';
-import { isJsonMode, printOk, printErr, classifyError } from '../../lib/output.js';
-import { error as errorStyle, warning } from '../../lib/format.js';
+import { isJsonMode, printOk, printErr, classifyError } from '@thinger-io/cli-core/output';
+import { error as errorStyle, warning } from '@thinger-io/cli-core/format';
 import { applyJsonFlag, ensureConfigured, getGlobalUser } from './_shared.js';
 
 export function registerExecCommand(device) {

package/commands/device/fs.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { createDeviceAPI } from '../../lib/device-api.js';
-import { isJsonMode, printOk, printErr, createSpinner, classifyError } from '../../lib/output.js';
-import { success, hint, muted, label } from '../../lib/format.js';
+import { isJsonMode, printOk, printErr, createSpinner, classifyError } from '@thinger-io/cli-core/output';
+import { success, hint, muted, label } from '@thinger-io/cli-core/format';
 import { applyJsonFlag, ensureConfigured, getGlobalUser } from './_shared.js';
 
 /**

package/commands/device/index.js

@@ -1,40 +1,26 @@
 // @ts-check
-import { registerListCommand } from './list.js';
 import { registerProxyCommands } from './proxy.js';
 import { registerConsoleCommand } from './console.js';
 import { registerStatusCommand } from './status.js';
-import { registerPropertyCommand } from './property.js';
-import { registerResourceCommand } from './resource.js';
 import { registerExecCommand } from './exec.js';
 import { registerUpdateCommand } from './update.js';
 import { registerTransferCommands } from './transfer.js';
 import { registerFsCommands } from './fs.js';
 import { registerLogsCommand } from './logs.js';
-import { registerDeleteCommand } from './delete.js';
 
 /**
- * `thinr device <subcommand> [<deviceId>] …` — all device-scoped actions
- * as proper Commander subcommands. Most subcommands declare `<deviceId>`
- * as their first positional so help, option parsing and validation are
- * autogenerated per-action; `list` is the exception (it operates on the
- * fleet, not a single device).
+ * `thinr device <subcommand> [<deviceId>] …` — the agent-backed actions
+ * (console, proxies, exec, files, logs, status, agent updates), added to
+ * the generic `device` group of @thinger-io/cli-core, which already holds
+ * list, info, create, delete, set-product, property and resource.
  */
-export function deviceCommand(program) {
-    const device = program
-        .command('device')
-        .helpGroup('Operations:')
-        .description('Device commands (subcommand-first: thinr device <action> <deviceId>)');
-
-    registerListCommand(device);
+export function registerDeviceCommands(device) {
     registerProxyCommands(device);
     registerConsoleCommand(device);
     registerStatusCommand(device);
-    registerPropertyCommand(device);
-    registerResourceCommand(device);
     registerExecCommand(device);
     registerUpdateCommand(device);
     registerTransferCommands(device);
     registerFsCommands(device);
     registerLogsCommand(device);
-    registerDeleteCommand(device);
 }

package/commands/device/logs.js

@@ -1,10 +1,10 @@
 // @ts-check
 import { createDeviceAPI } from '../../lib/device-api.js';
-import { getDevice } from '../../lib/devices.js';
+import { getDevice } from '@thinger-io/cli-core/devices';
 import { getProductLogs } from '../../lib/product/logs.js';
-import { inputError } from '../../lib/errors.js';
-import { isJsonMode, printOk, printErr, classifyError } from '../../lib/output.js';
-import { error as errorStyle, muted, warning } from '../../lib/format.js';
+import { inputError } from '@thinger-io/cli-core/errors';
+import { isJsonMode, printOk, printErr, classifyError } from '@thinger-io/cli-core/output';
+import { error as errorStyle, muted, warning } from '@thinger-io/cli-core/format';
 import { applyJsonFlag, ensureConfigured, getGlobalUser } from './_shared.js';
 
 // Single-quote for /bin/sh: wrap in '…' and escape embedded single quotes.

package/commands/device/status.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { getDeviceStatus, formatDeviceStatus } from '../../lib/status.js';
 import { getMonitoringData } from '../../lib/monitoring.js';
-import { isJsonMode, printOk } from '../../lib/output.js';
+import { isJsonMode, printOk } from '@thinger-io/cli-core/output';
 import { applyJsonFlag, ensureConfigured, runDeviceCommand } from './_shared.js';
 
 export function registerStatusCommand(device) {

package/commands/device/transfer.js

@@ -5,8 +5,8 @@ import { Transform } from 'node:stream';
 import { basename } from 'path';
 import cliProgress from 'cli-progress';
 import { createDeviceAPI } from '../../lib/device-api.js';
-import { isJsonMode, printOk, printErr, classifyError } from '../../lib/output.js';
-import { success, hint, formatBytes, formatETA } from '../../lib/format.js';
+import { isJsonMode, printOk, printErr, classifyError } from '@thinger-io/cli-core/output';
+import { success, hint, formatBytes, formatETA } from '@thinger-io/cli-core/format';
 import { applyJsonFlag, ensureConfigured, getGlobalUser } from './_shared.js';
 
 /**

package/commands/device/update.js

@@ -1,7 +1,13 @@
 // @ts-check
 import { createDeviceAPI } from '../../lib/device-api.js';
-import { isJsonMode, printOk, printErr, createSpinner, classifyError } from '../../lib/output.js';
-import { label as labelText, accent } from '../../lib/format.js';
+import {
+    isJsonMode,
+    printOk,
+    printErr,
+    createSpinner,
+    classifyError,
+} from '@thinger-io/cli-core/output';
+import { label as labelText, accent } from '@thinger-io/cli-core/format';
 import { TIMEOUTS } from '../../lib/constants.js';
 import { applyJsonFlag, ensureConfigured, getGlobalUser } from './_shared.js';
 

package/commands/fleet/upgrade.js

@@ -1,6 +1,6 @@
 // @ts-check
 import { confirm } from '@inquirer/prompts';
-import { getDevices } from '../../lib/devices.js';
+import { getDevices } from '@thinger-io/cli-core/devices';
 import { getMonitoringData } from '../../lib/monitoring.js';
 import { fetchLatestAgentVersion } from '../../lib/agent-releases.js';
 import { runFleetUpgrade, summarize } from '../../lib/fleet-upgrade.js';
@@ -11,7 +11,7 @@ import {
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
+} from '@thinger-io/cli-core/output';
 import {
     success,
     error as errorStyle,
@@ -20,7 +20,7 @@ import {
     label,
     muted,
     accent,
-} from '../../lib/format.js';
+} from '@thinger-io/cli-core/format';
 import {
     applyJsonFlag,
     ensureConfigured,

package/commands/playbook/run.js

@@ -8,8 +8,8 @@ import {
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
-import { success, error as errorStyle, warning, hint, label, muted } from '../../lib/format.js';
+} from '@thinger-io/cli-core/output';
+import { success, error as errorStyle, warning, hint, label, muted } from '@thinger-io/cli-core/format';
 import {
     applyJsonFlag,
     ensureConfigured,

package/commands/playbook/validate.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { loadPlaybookFile } from '../../lib/playbook/loader.js';
-import { isJsonMode, printOk, printErr, classifyError } from '../../lib/output.js';
-import { success, label, hint } from '../../lib/format.js';
+import { isJsonMode, printOk, printErr, classifyError } from '@thinger-io/cli-core/output';
+import { success, label, hint } from '@thinger-io/cli-core/format';
 import { applyJsonFlag } from './_shared.js';
 
 export function registerValidateCommand(playbook) {

package/commands/product/_shared.js

@@ -1,5 +1,5 @@
 // @ts-check
-import { getDevices } from '../../lib/devices.js';
+import { getDevices } from '@thinger-io/cli-core/devices';
 
 export async function fetchProductDevices(productId, group, user) {
     const filter = { product: productId };

package/commands/product/exec.js

@@ -10,14 +10,14 @@ import {
     success,
     error as errorStyle,
     warning,
-} from '../../lib/format.js';
+} from '@thinger-io/cli-core/format';
 import {
     isJsonMode,
     printOk,
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
+} from '@thinger-io/cli-core/output';
 import {
     applyJsonFlag,
     ensureConfigured,

package/commands/product/fs.js

@@ -9,14 +9,14 @@ import {
     success,
     error as errorStyle,
     warning,
-} from '../../lib/format.js';
+} from '@thinger-io/cli-core/format';
 import {
     isJsonMode,
     printOk,
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
+} from '@thinger-io/cli-core/output';
 import {
     applyJsonFlag,
     ensureConfigured,

package/commands/product/index.js

@@ -1,7 +1,5 @@
 // @ts-check
-import { registerProductListCommand } from './list.js';
 import { registerProductPropertyCommand } from './property.js';
-import { registerProductPropertyAdminCommands } from './props.js';
 import { registerProductMetricCommands } from './metric.js';
 import { registerProductResourceCommand } from './resource.js';
 import { registerProductExecCommand } from './exec.js';
@@ -13,18 +11,13 @@ import { registerProductLogsCommand } from './logs.js';
 
 /**
  * `thinr product <subcommand> <productId> …` — fan-out commands across
- * every device that belongs to a product.
+ * 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).
  */
-export function productCommand(program) {
-    const product = program
-        .command('product')
-        .helpGroup('Operations:')
-        .description('Product commands (subcommand-first: thinr product <action> <productId>)');
-
-    registerProductListCommand(product);
+export function registerProductCommands(product) {
     registerProductStatusCommand(product);
     registerProductPropertyCommand(product);
-    registerProductPropertyAdminCommands(product);
     registerProductMetricCommands(product);
     registerProductResourceCommand(product);
     registerProductExecCommand(product);

package/commands/product/logs.js

@@ -7,8 +7,8 @@ import {
     removeLogSource,
     setDefaultLogSource,
 } from '../../lib/product/logs.js';
-import { hint, info, label, muted, success } from '../../lib/format.js';
-import { classifyError, isJsonMode, printErr, printOk } from '../../lib/output.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';
 
 function truncate(value, max = 60) {

package/commands/product/metric.js

@@ -4,8 +4,8 @@ import {
     upsertDashboardMetric,
     removeDashboardMetric,
 } from '../../lib/product.js';
-import { info, success } from '../../lib/format.js';
-import { isJsonMode, printOk, printErr, classifyError } from '../../lib/output.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';
 
 function stringifyMetricLine(m) {

package/commands/product/playbook.js

@@ -15,9 +15,9 @@ import { parsePlaybook } from '../../lib/playbook/loader.js';
 import { buildDryRunPlan, runPlaybook } from '../../lib/playbook/runner.js';
 import { DEFAULT_FAILURE_THRESHOLD, runFleetPlaybook } from '../../lib/playbook/fleet.js';
 import { coerceCliVarValue, listVariables, resolveVarScope } from '../../lib/playbook/vars.js';
-import { filterActiveDevices, getDevices } from '../../lib/devices.js';
-import { requireConfig } from '../../lib/config.js';
-import { inputError } from '../../lib/errors.js';
+import { filterActiveDevices, getDevices } from '@thinger-io/cli-core/devices';
+import { requireConfig } from '@thinger-io/cli-core/config';
+import { inputError } from '@thinger-io/cli-core/errors';
 import {
     accent,
     error as errorStyle,
@@ -27,8 +27,8 @@ import {
     muted,
     success,
     warning,
-} from '../../lib/format.js';
-import { classifyError, createSpinner, isJsonMode, printErr, printOk } from '../../lib/output.js';
+} from '@thinger-io/cli-core/format';
+import { classifyError, createSpinner, isJsonMode, printErr, printOk } from '@thinger-io/cli-core/output';
 import {
     applyJsonFlag,
     collectKeyValue,

package/commands/product/property.js

@@ -1,14 +1,14 @@
 // @ts-check
-import { formatDeviceProperty, getDeviceProperty } from '../../lib/property.js';
-import { filterActiveDevices } from '../../lib/devices.js';
-import { error as errorStyle, info } from '../../lib/format.js';
+import { formatDeviceProperty, getDeviceProperty } from '@thinger-io/cli-core/property';
+import { filterActiveDevices } from '@thinger-io/cli-core/devices';
+import { error as errorStyle, info } from '@thinger-io/cli-core/format';
 import {
     isJsonMode,
     printOk,
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
+} from '@thinger-io/cli-core/output';
 import {
     applyJsonFlag,
     ensureConfigured,

package/commands/product/push.js

@@ -10,14 +10,14 @@ import {
     success,
     error as errorStyle,
     warning,
-} from '../../lib/format.js';
+} from '@thinger-io/cli-core/format';
 import {
     isJsonMode,
     printOk,
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
+} from '@thinger-io/cli-core/output';
 import {
     applyJsonFlag,
     ensureConfigured,

package/commands/product/resource.js

@@ -1,14 +1,14 @@
 // @ts-check
-import { callDeviceResource } from '../../lib/resource.js';
-import { filterActiveDevices } from '../../lib/devices.js';
-import { error as errorStyle, info } from '../../lib/format.js';
+import { callDeviceResource } from '@thinger-io/cli-core/resource';
+import { filterActiveDevices } from '@thinger-io/cli-core/devices';
+import { error as errorStyle, info } from '@thinger-io/cli-core/format';
 import {
     isJsonMode,
     printOk,
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
+} from '@thinger-io/cli-core/output';
 import {
     applyJsonFlag,
     collectInput,

package/commands/product/status.js

@@ -1,7 +1,7 @@
 // @ts-check
 import Table from 'cli-table3';
 import { InvalidArgumentError } from 'commander';
-import { runPool } from '../../lib/concurrency.js';
+import { runPool } from '@thinger-io/cli-core/concurrency';
 import { getMonitoringData } from '../../lib/monitoring.js';
 import {
     formatUptime,
@@ -11,14 +11,14 @@ import {
     hint,
     success,
     error as errorStyle,
-} from '../../lib/format.js';
+} from '@thinger-io/cli-core/format';
 import {
     isJsonMode,
     printOk,
     printErr,
     createSpinner,
     classifyError,
-} from '../../lib/output.js';
+} from '@thinger-io/cli-core/output';
 import {
     applyJsonFlag,
     ensureConfigured,