@dataworks-technology/cli 1.1.0 → 1.2.0

package/README.md

@@ -23,13 +23,14 @@ The `dw` binary turns the public GraphQL contract published by `@dataworks-techn
 | Command               | Description                                                 |
 | --------------------- | ----------------------------------------------------------- |
 | `dw auth ...`         | Log in, log out, and inspect the active UAT or Live session |
+| `dw autocomplete`     | Install shell completion for commands and flags             |
 | `dw data ...`         | Run schema-derived queries, mutations, and subscriptions    |
 | `dw ingest`           | Send athlete metrics to the Data Engine ingest endpoint     |
 | `dw events subscribe` | Subscribe to AppSync Events channels                        |
 | `dw graphql ...`      | Run raw GraphQL queries, mutations, and subscriptions       |
 | `dw report-error`     | Report a datasource error                                   |
-| `dw tenant select`    | Select the tenant used by subsequent commands               |
-| `dw commands`         | Print the complete machine-readable command inventory       |
+| `dw tenant ...`       | List or select the tenant used by subsequent commands       |
+| `dw commands`         | Print the complete command inventory                        |
 
 ---
 
@@ -41,7 +42,7 @@ The `dw` binary turns the public GraphQL contract published by `@dataworks-techn
 
 ---
 
-## Getting Started
+## Quickstart
 
 1. **Install the CLI:**
 
@@ -54,7 +55,7 @@ The `dw` binary turns the public GraphQL contract published by `@dataworks-techn
 
    ```sh
    dw auth login --environment uat
-   dw auth status --json
+   dw auth status
    ```
 
    The CLI opens Dataworks Managed Login in your browser and never receives your password. Sessions are stored in the operating-system credential store, never in the Dataworks config file. If a browser cannot be opened automatically, pass `--no-browser` and visit the displayed URL on the same computer. Headless jobs can provide a protected `DW_SESSION_JSON` secret instead.
@@ -63,22 +64,23 @@ The `dw` binary turns the public GraphQL contract published by `@dataworks-techn
    `--client-id`, `DW_UAT_CLIENT_ID`, `DW_LIVE_CLIENT_ID`, or `DW_CLIENT_ID` when
    testing a different app client.
 
-3. **Select a tenant.** Run the command without an ID to choose interactively, or
-   pass an ID for noninteractive use. The selection is saved to your local profile.
+3. **List and select a tenant.** The selection is saved to your local profile
+   and used by subsequent commands.
 
    ```bash
+   dw tenant list
    dw tenant select
    dw tenant select tenant-123
    ```
 
-   Use `dw tenant select --json` to list the available tenant IDs and friendly
-   names without opening an interactive prompt.
+   `dw tenant list` shows the friendly name, ID, and current selection. Agents
+   and scripts should use `dw tenant list --json`.
 
 4. **Discover and run commands:**
 
    ```sh
-   dw commands --json
-   dw data athlete list --json
+   dw commands
+   dw data athlete list
    dw data athlete create --name "Ada" --date-of-birth 1992-01-01
    ```
 
@@ -86,10 +88,24 @@ Generated command documentation is available in [`docs/commands`](./docs/command
 
 ---
 
+## Bash autocomplete
+
+Generate the completion cache and print the one-time Bash setup instructions:
+
+```sh
+dw autocomplete bash
+```
+
+After following the displayed instruction and reloading Bash, press Tab to
+complete `dw` command names and flags. Run `dw autocomplete --refresh-cache`
+after installing a release that adds commands.
+
+---
+
 ## Output and Safety
 
-- Commands that emit finite data support `--json` and return a stable `{data,meta}` envelope.
-- Subscriptions and other streams emit newline-delimited JSON (NDJSON).
+- Commands render human-readable tables by default.
+- Pass `--json` for scripts and agents. Finite results use a stable `{data,meta}` envelope; subscriptions and other streams emit newline-delimited JSON (NDJSON).
 - Generated mutations support `--dry-run --json` to render a request without sending it.
 - Destructive mutations and all Live mutations require confirmation; non-interactive callers must pass `--yes`.
 - Passwords, tokens, authorization headers, secrets, and API keys are redacted from structured output.
@@ -106,6 +122,83 @@ dw data athlete delete --public-id athlete-123 --yes
 dw graphql query --document @query.graphql --variables @variables.json --json
 ```
 
+### Ingest metrics
+
+`dw ingest` validates and sends athlete metrics to an event and
+dataset-datasource. Each metric requires `athletePublicId`, `metric`, `value`,
+and a positive integer `timestamp`. Pass either an inline JSON array, a
+`{ "metrics": [...] }` object, `@filename`, or `-` to read JSON from standard
+input.
+
+```sh
+# Inline JSON
+dw ingest --event event-123 --dataset-datasource ds-456 --metrics '[{"athletePublicId":"ath-1","metric":"heartrate_calculated","value":172,"timestamp":1700000000}]'
+
+# File input; strict validation rejects the whole batch if any metric is invalid
+dw ingest --event event-123 --dataset-datasource ds-456 --metrics @metrics.json
+
+# Send valid metrics, report dropped invalid metrics, and return stable JSON
+dw ingest --event event-123 --dataset-datasource ds-456 --metrics @metrics.json --best-effort --json
+```
+
+### Subscribe to realtime events
+
+Realtime metric channels use
+`dataworks/<dataset-datasource-id>/<event-id>/<metric-or-*>`. Use `*` to watch
+every metric for that dataset-datasource/event pair or a metric name to narrow
+the stream. A leading `/` is optional. Human output is tabular; add `--json` for
+NDJSON.
+
+Press `Ctrl+C` once to close the WebSocket subscription and return to the
+shell.
+
+```sh
+# Watch all metrics for dataset-datasource 1 and event 1
+dw events subscribe --channel dataworks/1/1/*
+
+# Watch only heart-rate metrics as NDJSON
+dw events subscribe --channel dataworks/1/1/heartrate --json
+```
+
+### Query Data Explorer
+
+`dw data data-explorer execute` queries metric storage with an explicit column
+list and metric category. Optional fields support Data Explorer filter rules,
+aggregation, grouping, ordering, limits, and polling an asynchronous
+`queryExecutionId`. The category must be `METRICS_TYPE_A`, `METRICS_TYPE_B`, or
+`METRICS_TYPE_C`; `--columns` is a JSON array.
+
+```sh
+# Keep a filtered GPS query in a reusable JSON file
+dw data data-explorer execute --input @gps-query.json --json
+
+# Return the latest 30 GPS positions for one athlete
+dw data data-explorer execute --columns '["timestamp","athletepublicid","current"]' --metric-category METRICS_TYPE_A --filter-rules '{"combinator":"and","rules":[{"field":"metric","operator":"in","value":"latlong"},{"field":"athletepublicid","operator":"in","value":"athlete-123"}]}' --limit 30 --order-by timestamp --order-direction DESC --json
+```
+
+The corresponding `gps-query.json` contains the same fields without CLI flag
+conversion:
+
+```json
+{
+  "columns": ["timestamp", "athletepublicid", "metric", "current"],
+  "metricCategory": "METRICS_TYPE_A",
+  "filterRules": "{\"combinator\":\"and\",\"rules\":[{\"field\":\"metric\",\"operator\":\"in\",\"value\":\"latlong\"},{\"field\":\"athletepublicid\",\"operator\":\"in\",\"value\":\"athlete-123\"}]}",
+  "limit": 30,
+  "orderBy": "timestamp",
+  "orderDirection": "DESC"
+}
+```
+
+`filterRules` is an AWSJSON string containing a top-level `combinator` and a
+`rules` array. Each rule has `field`, `operator`, and string `value`; supported
+operators include `=`, `!=`, `>`, `<`, `>=`, `<=`, `contains`, and `in`.
+Multiple values for `in` are comma-separated. GPS is metric `latlong` in
+`METRICS_TYPE_A`; the `current` value is a `latitude:longitude` string. Run
+`dw data data-explorer execute --help` for the complete flag list and examples.
+In `--json` output, `rows` is AWSJSON and may need JSON-decoding until it becomes
+an array; default table output performs that decoding for humans.
+
 ---
 
 ## Common Commands

package/dist/commands/auth/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAUxD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,gBAAgB;IACrD,OAAgB,WAAW,SAA2D;IACtF,OAAgB,QAAQ;;;QAStB;IACF,OAAgB,KAAK;;;;;MAUnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiClC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAUxD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,gBAAgB;IACrD,OAAgB,WAAW,SAA2D;IACtF,OAAgB,QAAQ;;;QAStB;IACF,OAAgB,KAAK;;;;;MAUnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqClC"}

package/dist/commands/auth/login.js

@@ -37,7 +37,7 @@ export default class AuthLogin extends DataworksCommand {
         if (!environment && process.stdin.isTTY)
             environment = await prompt("Environment (uat/live)");
         if (!environment || !isEnvironment(environment)) {
-            throw new CliError("Specify --environment uat|live", "ENVIRONMENT_REQUIRED", 2);
+            throw new CliError("Specify either --environment uat or --environment live", "ENVIRONMENT_REQUIRED", 2);
         }
         const config = resolveEnvironment(environment, flags["client-id"]);
         const session = await loginWithBrowser(config, {

package/dist/commands/auth/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}

package/dist/commands/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/commands/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAkBrD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IACpD,OAAgB,WAAW,SACgC;IAC3D,OAAgB,KAAK;;MAEnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBlC"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/commands/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAoBrD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IACpD,OAAgB,WAAW,SACgC;IAC3D,OAAgB,KAAK;;MAEnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBlC"}

package/dist/commands/commands.js

@@ -6,6 +6,7 @@ const builtIns = [
     "auth login",
     "auth logout",
     "auth status",
+    "autocomplete",
     "commands",
     "events subscribe",
     "graphql mutate",
@@ -13,6 +14,7 @@ const builtIns = [
     "graphql subscribe",
     "ingest",
     "report-error",
+    "tenant list",
     "tenant select",
 ];
 export default class Commands extends DataworksCommand {

package/dist/commands/commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/commands/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,QAAQ,GAAG;IACf,YAAY;IACZ,aAAa;IACb,aAAa;IACb,UAAU;IACV,kBAAkB;IAClB,gBAAgB;IAChB,eAAe;IACf,mBAAmB;IACnB,QAAQ;IACR,cAAc;IACd,eAAe;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IACpD,MAAM,CAAU,WAAW,GACzB,wDAAwD,CAAC;IAC3D,MAAM,CAAU,KAAK,GAAG;QACtB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;KAChE,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG;YACX,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,EAAE,EAAE,CAAC,CAAC;YACnE,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBACxC,OAAO,EAAE,MAAM,SAAS,CAAC,OAAO,EAAE;gBAClC,SAAS,EAAE,SAAS,CAAC,IAAI;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,SAAS,EAAE,SAAS,CAAC,SAAS;aAC/B,CAAC,CAAC;SACJ,CAAC;QACF,WAAW,CAAC,IAAI,EAAE;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,EAAE,cAAc,EAAE,UAAU,CAAC,MAAM,EAAE;SAC5C,CAAC,CAAC;IACL,CAAC"}
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/commands/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,QAAQ,GAAG;IACf,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,gBAAgB;IAChB,eAAe;IACf,mBAAmB;IACnB,QAAQ;IACR,cAAc;IACd,aAAa;IACb,eAAe;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IACpD,MAAM,CAAU,WAAW,GACzB,wDAAwD,CAAC;IAC3D,MAAM,CAAU,KAAK,GAAG;QACtB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;KAChE,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG;YACX,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,EAAE,EAAE,CAAC,CAAC;YACnE,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBACxC,OAAO,EAAE,MAAM,SAAS,CAAC,OAAO,EAAE;gBAClC,SAAS,EAAE,SAAS,CAAC,IAAI;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,SAAS,EAAE,SAAS,CAAC,SAAS;aAC/B,CAAC,CAAC;SACJ,CAAC;QACF,WAAW,CAAC,IAAI,EAAE;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,EAAE,cAAc,EAAE,UAAU,CAAC,MAAM,EAAE;SAC5C,CAAC,CAAC;IACL,CAAC"}

package/dist/commands/events/subscribe.d.ts

@@ -1,9 +1,15 @@
 import { DataworksCommand } from "../../lib/command.js";
+import { CliError } from "../../lib/errors.js";
+export declare function channelRequiredError(): CliError;
 export default class EventsSubscribe extends DataworksCommand {
     static description: string;
+    static examples: {
+        description: string;
+        command: string;
+    }[];
     static flags: {
         "api-key": import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        channel: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        channel: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/events/subscribe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../src/commands/events/subscribe.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,gBAAgB;IAC3D,OAAgB,WAAW,SAAqD;IAChF,OAAgB,KAAK;;;;MAInB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAQlC"}
+{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../../src/commands/events/subscribe.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C,wBAAgB,oBAAoB,IAAI,QAAQ,CAqC/C;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,gBAAgB;IAC3D,OAAgB,WAAW,SACgE;IAC3F,OAAgB,QAAQ;;;QAatB;IACF,OAAgB,KAAK;;;;MAOnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CASlC"}

package/dist/commands/events/subscribe.js

@@ -2,16 +2,69 @@ import { Flags } from "@oclif/core";
 import { DataworksCommand } from "../../lib/command.js";
 import { subscribeEvents } from "../../lib/http-transport.js";
 import { writeResult } from "../../lib/output.js";
+import { CliError } from "../../lib/errors.js";
+const channelExamples = ["dataworks/1/1/*", "dataworks/1/1/heartrate"];
+export function channelRequiredError() {
+    const examples = [
+        `dw events subscribe --channel ${channelExamples[0]}`,
+        `dw events subscribe --channel ${channelExamples[1]}`,
+        `dw events subscribe --channel ${channelExamples[1]} --json`,
+    ];
+    return new CliError([
+        "Missing required flag --channel.",
+        "",
+        "Channel format:",
+        "  dataworks/<dataset-datasource-id>/<event-id>/<metric-or-*>",
+        "",
+        "Examples:",
+        ...examples.map((example) => `  ${example}`),
+        "",
+        "Use * for all metrics, a metric name such as heartrate to filter, and --json for NDJSON output.",
+        "A leading slash is optional.",
+        "",
+        "More help: dw events subscribe --help",
+    ].join("\n"), "ARGUMENT_REQUIRED", 2, {
+        command: "dw events subscribe",
+        requiredArguments: [
+            {
+                flag: "--channel",
+                type: "channel path",
+                description: "dataworks/<dataset-datasource-id>/<event-id>/<metric-or-*>",
+                example: channelExamples[0],
+            },
+        ],
+        examples,
+        help: "dw events subscribe --help",
+    });
+}
 export default class EventsSubscribe extends DataworksCommand {
-    static description = "Subscribe to a Dataworks AppSync Events channel";
+    static description = "Subscribe to live Dataworks metrics on an AppSync Events channel; press Ctrl+C to stop";
+    static examples = [
+        {
+            description: "Watch all metrics for dataset-datasource 1 and event 1 as tables",
+            command: `dw events subscribe --channel ${channelExamples[0]}`,
+        },
+        {
+            description: "Watch only heart-rate metrics",
+            command: `dw events subscribe --channel ${channelExamples[1]}`,
+        },
+        {
+            description: "Emit heart-rate events as NDJSON for scripts and agents",
+            command: `dw events subscribe --channel ${channelExamples[1]} --json`,
+        },
+    ];
     static flags = {
         "api-key": Flags.string({ description: "AppSync Events API key" }),
-        channel: Flags.string({ required: true, description: "Channel path" }),
+        channel: Flags.string({
+            description: "Channel: dataworks/<dataset-datasource-id>/<event-id>/<metric-or-*>",
+        }),
         json: Flags.boolean({ description: "Emit NDJSON events" }),
     };
     async run() {
         const { flags } = await this.parse(EventsSubscribe);
-        await subscribeEvents(flags.channel, (data) => writeResult(data, { stream: true }), flags["api-key"]);
+        if (!flags.channel)
+            throw channelRequiredError();
+        await subscribeEvents(flags.channel, (data) => writeResult(data, { json: flags.json, stream: true }), flags["api-key"]);
     }
 }
 //# sourceMappingURL=subscribe.js.map

package/dist/commands/events/subscribe.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../src/commands/events/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,gBAAgB;IAC3D,MAAM,CAAU,WAAW,GAAG,iDAAiD,CAAC;IAChF,MAAM,CAAU,KAAK,GAAG;QACtB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;QAClE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;QACtE,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;KAC3D,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,eAAe,CACnB,KAAK,CAAC,OAAO,EACb,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAC7C,KAAK,CAAC,SAAS,CAAC,CACjB,CAAC;IACJ,CAAC"}
+{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../../src/commands/events/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,MAAM,eAAe,GAAG,CAAC,iBAAiB,EAAE,yBAAyB,CAAU,CAAC;AAEhF,MAAM,UAAU,oBAAoB;IAClC,MAAM,QAAQ,GAAG;QACf,iCAAiC,eAAe,CAAC,CAAC,CAAC,EAAE;QACrD,iCAAiC,eAAe,CAAC,CAAC,CAAC,EAAE;QACrD,iCAAiC,eAAe,CAAC,CAAC,CAAC,SAAS;KAC7D,CAAC;IACF,OAAO,IAAI,QAAQ,CACjB;QACE,kCAAkC;QAClC,EAAE;QACF,iBAAiB;QACjB,8DAA8D;QAC9D,EAAE;QACF,WAAW;QACX,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,OAAO,EAAE,CAAC;QAC5C,EAAE;QACF,iGAAiG;QACjG,8BAA8B;QAC9B,EAAE;QACF,uCAAuC;KACxC,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,mBAAmB,EACnB,CAAC,EACD;QACE,OAAO,EAAE,qBAAqB;QAC9B,iBAAiB,EAAE;YACjB;gBACE,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,cAAc;gBACpB,WAAW,EAAE,4DAA4D;gBACzE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;aAC5B;SACF;QACD,QAAQ;QACR,IAAI,EAAE,4BAA4B;KACnC,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,gBAAgB;IAC3D,MAAM,CAAU,WAAW,GACzB,wFAAwF,CAAC;IAC3F,MAAM,CAAU,QAAQ,GAAG;QACzB;YACE,WAAW,EAAE,kEAAkE;YAC/E,OAAO,EAAE,iCAAiC,eAAe,CAAC,CAAC,CAAC,EAAE;SAC/D;QACD;YACE,WAAW,EAAE,+BAA+B;YAC5C,OAAO,EAAE,iCAAiC,eAAe,CAAC,CAAC,CAAC,EAAE;SAC/D;QACD;YACE,WAAW,EAAE,yDAAyD;YACtE,OAAO,EAAE,iCAAiC,eAAe,CAAC,CAAC,CAAC,SAAS;SACtE;KACF,CAAC;IACF,MAAM,CAAU,KAAK,GAAG;QACtB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;QAClE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,WAAW,EACT,qEAAqE;SACxE,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;KAC3D,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,MAAM,oBAAoB,EAAE,CAAC;QACjD,MAAM,eAAe,CACnB,KAAK,CAAC,OAAO,EACb,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAC/D,KAAK,CAAC,SAAS,CAAC,CACjB,CAAC;IACJ,CAAC"}

package/dist/commands/ingest.d.ts

@@ -1,13 +1,41 @@
 import { DataworksCommand } from "../lib/command.js";
+import { CliError } from "../lib/errors.js";
+declare const requiredIngestFlags: {
+    readonly event: {
+        readonly flag: "--event";
+        readonly type: "event public ID";
+        readonly description: "Event associated with the metrics";
+        readonly example: "event-123";
+    };
+    readonly "dataset-datasource": {
+        readonly flag: "--dataset-datasource";
+        readonly type: "dataset-datasource public ID";
+        readonly description: "Dataset-datasource receiving the metrics";
+        readonly example: "ds-456";
+    };
+    readonly metrics: {
+        readonly flag: "--metrics";
+        readonly type: "JSON input";
+        readonly description: "Metric array, {metrics:[...]} object, @file, or -";
+        readonly example: "@metrics.json";
+    };
+};
+type RequiredIngestFlag = keyof typeof requiredIngestFlags;
+export declare function ingestRequiredError(missing: RequiredIngestFlag[]): CliError;
 export default class Ingest extends DataworksCommand {
     static description: string;
+    static examples: {
+        description: string;
+        command: string;
+    }[];
     static flags: {
         "best-effort": import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        "dataset-datasource": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        event: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        "dataset-datasource": import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        event: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        metrics: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        metrics: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=ingest.d.ts.map

package/dist/commands/ingest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ingest.d.ts","sourceRoot":"","sources":["../../src/commands/ingest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAOrD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,gBAAgB;IAClD,OAAgB,WAAW,SAAqC;IAChE,OAAgB,KAAK;;;;;;MAcnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBlC"}
+{"version":3,"file":"ingest.d.ts","sourceRoot":"","sources":["../../src/commands/ingest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAKrD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAK5C,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;CAmBf,CAAC;AAEX,KAAK,kBAAkB,GAAG,MAAM,OAAO,mBAAmB,CAAC;AAE3D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,QAAQ,CA0B3E;AAED,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,gBAAgB;IAClD,OAAgB,WAAW,SACoC;IAC/D,OAAgB,QAAQ;;;QAgBtB;IACF,OAAgB,KAAK;;;;;;MAgBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgClC"}

package/dist/commands/ingest.js

@@ -4,26 +4,86 @@ import { readJsonAny } from "../lib/io.js";
 import { ingestMetrics } from "../lib/http-transport.js";
 import { writeResult } from "../lib/output.js";
 import { CliError } from "../lib/errors.js";
+const ingestExample = 'dw ingest --event event-123 --dataset-datasource ds-456 --metrics \'[{"athletePublicId":"ath-1","metric":"heartrate_calculated","value":172,"timestamp":1700000000}]\'';
+const requiredIngestFlags = {
+    event: {
+        flag: "--event",
+        type: "event public ID",
+        description: "Event associated with the metrics",
+        example: "event-123",
+    },
+    "dataset-datasource": {
+        flag: "--dataset-datasource",
+        type: "dataset-datasource public ID",
+        description: "Dataset-datasource receiving the metrics",
+        example: "ds-456",
+    },
+    metrics: {
+        flag: "--metrics",
+        type: "JSON input",
+        description: "Metric array, {metrics:[...]} object, @file, or -",
+        example: "@metrics.json",
+    },
+};
+export function ingestRequiredError(missing) {
+    const requiredArguments = missing.map((name) => requiredIngestFlags[name]);
+    return new CliError([
+        "Missing required flags for `dw ingest`.",
+        "",
+        "Required:",
+        ...requiredArguments.map(({ flag, type, description, example }) => `  ${flag} <${type}>  ${description}; for example: ${example}`),
+        "",
+        "Example:",
+        `  ${ingestExample}`,
+        "",
+        "More help: dw ingest --help",
+    ].join("\n"), "ARGUMENT_REQUIRED", 2, {
+        command: "dw ingest",
+        requiredArguments,
+        example: ingestExample,
+        help: "dw ingest --help",
+    });
+}
 export default class Ingest extends DataworksCommand {
-    static description = "Validate and ingest metric data";
+    static description = "Validate and ingest athlete metrics into a Dataworks event";
+    static examples = [
+        {
+            description: "Ingest a strict batch from a JSON file",
+            command: "dw ingest --event event-123 --dataset-datasource ds-456 --metrics @metrics.json",
+        },
+        {
+            description: "Read a JSON array or {metrics: [...]} object from standard input",
+            command: "dw ingest --event event-123 --dataset-datasource ds-456 --metrics -",
+        },
+        {
+            description: "Send valid metrics and report invalid metrics instead of rejecting the batch",
+            command: "dw ingest --event event-123 --dataset-datasource ds-456 --metrics @metrics.json --best-effort --json",
+        },
+    ];
     static flags = {
         "best-effort": Flags.boolean({
-            description: "Drop invalid metrics and send the remainder",
+            description: "Drop invalid metrics and send the remainder; default rejects the entire batch",
         }),
         "dataset-datasource": Flags.string({
-            required: true,
-            description: "Dataset-datasource public ID",
+            description: "Required dataset-datasource public ID receiving the metrics",
+        }),
+        event: Flags.string({
+            description: "Required event public ID associated with the metrics",
         }),
-        event: Flags.string({ required: true, description: "Event public ID" }),
         json: Flags.boolean({ description: "Emit stable JSON output" }),
         metrics: Flags.string({
-            required: true,
-            description: "Metrics JSON, @file, or - for stdin",
+            description: "Required JSON array, {metrics:[...]} object, @file, or -; each metric requires athletePublicId, metric, value, and timestamp",
         }),
     };
     async run() {
         const { flags } = await this.parse(Ingest);
-        const parsed = await readJsonAny(flags.metrics);
+        const event = flags.event;
+        const datasetDatasource = flags["dataset-datasource"];
+        const metricsInput = flags.metrics;
+        const missing = Object.keys(requiredIngestFlags).filter((name) => !flags[name]);
+        if (missing.length > 0)
+            throw ingestRequiredError(missing);
+        const parsed = await readJsonAny(metricsInput);
         const metrics = Array.isArray(parsed?.metrics)
             ? parsed.metrics
             : Array.isArray(parsed)
@@ -32,7 +92,7 @@ export default class Ingest extends DataworksCommand {
         if (!metrics) {
             throw new CliError("Metrics must be a JSON array or an object with a metrics array", "METRICS_INVALID", 2);
         }
-        writeResult(await ingestMetrics(metrics, flags.event, flags["dataset-datasource"], flags["best-effort"]), { json: flags.json });
+        writeResult(await ingestMetrics(metrics, event, datasetDatasource, flags["best-effort"]), { json: flags.json });
     }
 }
 //# sourceMappingURL=ingest.js.map

package/dist/commands/ingest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ingest.js","sourceRoot":"","sources":["../../src/commands/ingest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,gBAAgB;IAClD,MAAM,CAAU,WAAW,GAAG,iCAAiC,CAAC;IAChE,MAAM,CAAU,KAAK,GAAG;QACtB,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC;YAC3B,WAAW,EAAE,6CAA6C;SAC3D,CAAC;QACF,oBAAoB,EAAE,KAAK,CAAC,MAAM,CAAC;YACjC,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,8BAA8B;SAC5C,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QACvE,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;QAC/D,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qCAAqC;SACnD,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAE,MAAc,EAAE,OAAO,CAAC;YACrD,CAAC,CAAE,MAAc,CAAC,OAAO;YACzB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;gBACrB,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,QAAQ,CAChB,gEAAgE,EAChE,iBAAiB,EACjB,CAAC,CACF,CAAC;QACJ,CAAC;QACD,WAAW,CACT,MAAM,aAAa,CACjB,OAAmB,EACnB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,oBAAoB,CAAC,EAC3B,KAAK,CAAC,aAAa,CAAC,CACrB,EACD,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CACrB,CAAC;IACJ,CAAC"}
+{"version":3,"file":"ingest.js","sourceRoot":"","sources":["../../src/commands/ingest.ts"],"names":[],"mappings":"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"}

package/dist/commands/tenant/list.d.ts

@@ -0,0 +1,13 @@
+import { DataworksCommand } from "../../lib/command.js";
+export default class TenantList extends DataworksCommand {
+    static description: string;
+    static examples: {
+        description: string;
+        command: string;
+    }[];
+    static flags: {
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=list.d.ts.map

package/dist/commands/tenant/list.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/tenant/list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAKxD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,gBAAgB;IACtD,OAAgB,WAAW,SACkD;IAC7E,OAAgB,QAAQ;;;QAStB;IACF,OAAgB,KAAK;;MAEnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA8BlC"}

package/dist/commands/tenant/list.js

@@ -0,0 +1,45 @@
+import { Flags } from "@oclif/core";
+import { DataworksCommand } from "../../lib/command.js";
+import { writeResult } from "../../lib/output.js";
+import { requireSession } from "../../lib/session.js";
+import { listAvailableTenants } from "../../lib/tenants.js";
+export default class TenantList extends DataworksCommand {
+    static description = "List the tenants available to your account and show the active selection";
+    static examples = [
+        {
+            description: "List tenant IDs, friendly names, and the active tenant",
+            command: "dw tenant list",
+        },
+        {
+            description: "Return the available tenants for a script or agent",
+            command: "dw tenant list --json",
+        },
+    ];
+    static flags = {
+        json: Flags.boolean({ description: "Emit stable JSON output" }),
+    };
+    async run() {
+        const { flags } = await this.parse(TenantList);
+        const session = await requireSession();
+        const authorizedTenantIds = session.authorizedTenants?.length
+            ? session.authorizedTenants
+            : session.tenant
+                ? [session.tenant]
+                : [];
+        const tenants = (await listAvailableTenants(authorizedTenantIds)).map((tenant) => ({
+            selected: tenant.id === session.tenant,
+            name: tenant.name,
+            id: tenant.id,
+        }));
+        if (flags.json) {
+            writeResult({ tenants, selectedTenant: session.tenant }, { json: true, meta: { environment: session.environment } });
+            return;
+        }
+        writeResult(tenants.map((tenant) => ({
+            active: tenant.selected ? "✓" : "",
+            name: tenant.name ?? "—",
+            id: tenant.id,
+        })));
+    }
+}
+//# sourceMappingURL=list.js.map

package/dist/commands/tenant/list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/tenant/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,gBAAgB;IACtD,MAAM,CAAU,WAAW,GACzB,0EAA0E,CAAC;IAC7E,MAAM,CAAU,QAAQ,GAAG;QACzB;YACE,WAAW,EAAE,wDAAwD;YACrE,OAAO,EAAE,gBAAgB;SAC1B;QACD;YACE,WAAW,EAAE,oDAAoD;YACjE,OAAO,EAAE,uBAAuB;SACjC;KACF,CAAC;IACF,MAAM,CAAU,KAAK,GAAG;QACtB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;KAChE,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAC;QACvC,MAAM,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,EAAE,MAAM;YAC3D,CAAC,CAAC,OAAO,CAAC,iBAAiB;YAC3B,CAAC,CAAC,OAAO,CAAC,MAAM;gBACd,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;gBAClB,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,OAAO,GAAG,CAAC,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACjF,QAAQ,EAAE,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,MAAM;YACtC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,EAAE,EAAE,MAAM,CAAC,EAAE;SACd,CAAC,CAAC,CAAC;QAEJ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,WAAW,CACT,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,MAAM,EAAE,EAC3C,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,CAC3D,CAAC;YACF,OAAO;QACT,CAAC;QAED,WAAW,CACT,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACvB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAClC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,GAAG;YACxB,EAAE,EAAE,MAAM,CAAC,EAAE;SACd,CAAC,CAAC,CACJ,CAAC;IACJ,CAAC"}

package/dist/commands/tenant/select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/commands/tenant/select.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAYxD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,gBAAgB;IACxD,OAAgB,WAAW,SACiC;IAC5D,OAAgB,QAAQ;;;QAatB;IACF,OAAgB,IAAI;;MAKlB;IACF,OAAgB,KAAK;;MAEnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqElC"}
+{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/commands/tenant/select.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAcxD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,gBAAgB;IACxD,OAAgB,WAAW,SACiC;IAC5D,OAAgB,QAAQ;;;QAatB;IACF,OAAgB,IAAI;;MAKlB;IACF,OAAgB,KAAK;;MAEnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0ElC"}

package/dist/commands/tenant/select.js

@@ -6,8 +6,10 @@ import { writeResult } from "../../lib/output.js";
 import { selectOption } from "../../lib/prompts.js";
 import { requireSession } from "../../lib/session.js";
 import { listAvailableTenants } from "../../lib/tenants.js";
-function optionLabel(tenant) {
-    return tenant.name ? `${tenant.name} (${tenant.id})` : tenant.id;
+function optionLabel(tenant, selectedTenant) {
+    const name = tenant.name ?? "Unnamed tenant";
+    const current = tenant.id === selectedTenant ? " — current" : "";
+    return `${name} — ${tenant.id}${current}`;
 }
 export default class TenantSelect extends DataworksCommand {
     static description = "Select the tenant used by subsequent Dataworks commands";
@@ -22,7 +24,7 @@ export default class TenantSelect extends DataworksCommand {
         },
         {
             description: "List available tenants without prompting",
-            command: "dw tenant select --json",
+            command: "dw tenant list",
         },
     ];
     static args = {
@@ -37,7 +39,12 @@ export default class TenantSelect extends DataworksCommand {
     async run() {
         const { args, flags } = await this.parse(TenantSelect);
         const session = await requireSession();
-        const tenants = await listAvailableTenants();
+        const authorizedTenantIds = session.authorizedTenants?.length
+            ? session.authorizedTenants
+            : session.tenant
+                ? [session.tenant]
+                : [];
+        const tenants = await listAvailableTenants(authorizedTenantIds);
         if (!args.id && (flags.json || !process.stdin.isTTY || !process.stdout.isTTY)) {
             writeResult({
                 tenants: tenants.map((tenant) => ({
@@ -53,7 +60,7 @@ export default class TenantSelect extends DataworksCommand {
         }
         const tenantId = args.id ??
             (await selectOption("Select a tenant", tenants.map((tenant) => ({
-                label: optionLabel(tenant),
+                label: optionLabel(tenant, session.tenant),
                 value: tenant.id,
             })), Math.max(0, tenants.findIndex((tenant) => tenant.id === session.tenant))));
         const tenant = tenants.find((candidate) => candidate.id === tenantId);