primitive-admin 1.0.61 → 1.0.62

package/dist/src/commands/config.d.ts

@@ -0,0 +1,46 @@
+/**
+ * `primitive config` — the whole TOML configuration tree (issues #2645, #2759).
+ *
+ * #2645 replaced the eleven config-setting flags with three local verbs:
+ * `fields` documents the surface that per-flag `--help` used to, `create`
+ * scaffolds an object, and `set` edits one key from a script. It put them under
+ * `config` rather than under `sync` because none of them touches the network.
+ *
+ * #2759 removed the other side of that line. Splitting by "does this call the
+ * API?" is a transport distinction, not one users think in: authoring was
+ * `config` and applying was `sync`, so every real workflow crossed the boundary
+ * and this group's own help had to end its example sequence by switching nouns.
+ * `config` now carries the reconciliation verbs too (`init`, `pull`, `push`,
+ * `diff`, `revert`, `migrate-toml`, `migrate-v2`), registered onto the group
+ * returned below by `registerConfigSyncCommands` in `sync.ts` — that module
+ * keeps its name and exports; only where its verbs hang changed.
+ *
+ * The split that remains is the one users do think in: the per-surface groups
+ * (`workflows`, `webhooks`, …) read and operate on live objects, `config` owns
+ * the files that define them.
+ */
+import { Command } from "commander";
+import { type ConfigObjectDescriptor } from "../lib/config-object-descriptor.js";
+/**
+ * Why `value` cannot be what `path` declares, or `null` when it can.
+ *
+ * `config set` used to check only that a path was DECLARED, so
+ * `integration.timeoutMs=fast` wrote a string into a number field and the
+ * mistake surfaced as a server error on the next push. The descriptor exists to
+ * carry what per-flag `--help` used to carry (criterion 7), and that has to
+ * include the type — otherwise removing the flags traded a fast local error for
+ * a slow remote one.
+ *
+ * Deliberately silent about anything it cannot judge: an undeclared path (the
+ * declared-path check owns that message — two errors for one mistake is worse
+ * than one), the interior of a `table` / `table[]` / `json` field, and a var
+ * file's own keys. Those shapes belong to the server, and mirroring them here
+ * would be a second copy that goes stale.
+ */
+export declare function fieldTypeMismatch(descriptor: ConfigObjectDescriptor, path: string, value: string | number | boolean): string | null;
+/**
+ * Register the `config` group and its local authoring verbs, and return the
+ * group so `registerConfigSyncCommands` can hang the server-reconciling verbs
+ * off the same noun (issue #2759).
+ */
+export declare function registerConfigCommands(program: Command): Command;

package/dist/src/commands/config.js

@@ -0,0 +1,479 @@
+/**
+ * `primitive config` — the whole TOML configuration tree (issues #2645, #2759).
+ *
+ * #2645 replaced the eleven config-setting flags with three local verbs:
+ * `fields` documents the surface that per-flag `--help` used to, `create`
+ * scaffolds an object, and `set` edits one key from a script. It put them under
+ * `config` rather than under `sync` because none of them touches the network.
+ *
+ * #2759 removed the other side of that line. Splitting by "does this call the
+ * API?" is a transport distinction, not one users think in: authoring was
+ * `config` and applying was `sync`, so every real workflow crossed the boundary
+ * and this group's own help had to end its example sequence by switching nouns.
+ * `config` now carries the reconciliation verbs too (`init`, `pull`, `push`,
+ * `diff`, `revert`, `migrate-toml`, `migrate-v2`), registered onto the group
+ * returned below by `registerConfigSyncCommands` in `sync.ts` — that module
+ * keeps its name and exports; only where its verbs hang changed.
+ *
+ * The split that remains is the one users do think in: the per-surface groups
+ * (`workflows`, `webhooks`, …) read and operate on live objects, `config` owns
+ * the files that define them.
+ */
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { join, basename } from "path";
+import chalk from "chalk";
+import { resolveAppId } from "../lib/config.js";
+import { resolveSyncDir, isAutoResolvedSyncDir } from "../lib/sync-paths.js";
+import { CONFIG_OBJECT_DESCRIPTORS, getConfigObjectDescriptor, } from "../lib/config-object-descriptor.js";
+import { PUSH_PRUNE_SPECS, isSafeSyncFilename, } from "../lib/sync-resource-types.js";
+import { configAuthoringError } from "../lib/platform-owned.js";
+import { filesDeclaringKey } from "../lib/sync-selectors.js";
+import { setTomlScalar, parseScalarLiteral, TomlEditError, } from "../lib/toml-scalar-edit.js";
+import { success, error, info, keyValue, divider, json } from "../lib/output.js";
+function ensureDir(dirPath) {
+    if (!existsSync(dirPath)) {
+        mkdirSync(dirPath, { recursive: true });
+    }
+}
+/**
+ * The config slot for a LOCAL command (issue #2645).
+ *
+ * `config create`, `config set` and `config fields` never call the API, so an
+ * explicit `--dir` is enough on its own — resolving an app id first would make
+ * them require a login they do not need. Without `--dir` they fall back to the
+ * same per-environment slot every other `config` command uses.
+ */
+function resolveLocalSyncDir(appId, options) {
+    if (options.dir)
+        return options.dir;
+    // Outside a project there is no per-app slot: `resolveSyncDir` answers
+    // `./config` whatever the app id is. Resolving one anyway would exit these
+    // commands with "No app specified" for want of a login they never use — and
+    // scaffolding a file before you have an app is exactly the order the
+    // TOML-only path asks for (`config create`, edit, `config push`).
+    if (!isAutoResolvedSyncDir(undefined)) {
+        return resolveSyncDir({ appId: "", userDir: undefined });
+    }
+    const resolvedAppId = resolveAppId(appId, options);
+    const configDir = resolveSyncDir({ appId: resolvedAppId, userDir: undefined });
+    info(`Using per-environment config directory: ${configDir}`);
+    return configDir;
+}
+/**
+ * The `--only` selector key for a file — the key `config push` itself derives.
+ *
+ * Not always the file name: a metadata-category config lives at
+ * `<resourceType>.<category>.toml` but is keyed by the `resourceType#category`
+ * pair, so telling the user to push `--only metadata-category-config/<basename>`
+ * would print a command that resolves to nothing.
+ */
+function pushSelectorKey(descriptor, filePath) {
+    const spec = PUSH_PRUNE_SPECS.find((s) => s.resourceType.label === descriptor.type);
+    return spec ? spec.keyFromFile(filePath) : basename(filePath, ".toml");
+}
+/** Every configurable type name, for an error message. */
+function configTypeList() {
+    return CONFIG_OBJECT_DESCRIPTORS.map((d) => d.type).join(", ");
+}
+function requireConfigDescriptor(type) {
+    const descriptor = getConfigObjectDescriptor(type);
+    if (!descriptor) {
+        error(`Unknown configuration type '${type}'. Configurable types: ${configTypeList()}`);
+        process.exit(1);
+    }
+    return descriptor;
+}
+/**
+ * Whether `path` names something the type declares.
+ *
+ * An exact field match is obvious. A declared `table` / `table[]` / `json`
+ * field also covers everything BELOW it — `requestConfig.method`,
+ * `verification.jwt.header`, `vars.API_BASE_URL` — because those subtrees are
+ * free-form by design and enumerating them would be a second, always-stale
+ * copy of the server's shape.
+ */
+function isDeclaredFieldPath(descriptor, path) {
+    // `vars.toml` is a flat table of the app's own keys — every root-level key is
+    // legitimate, and the key format is validated by the push preflight.
+    if (descriptor.freeFormRootKeys && !path.includes("."))
+        return true;
+    for (const field of descriptor.fields) {
+        if (field.path === path)
+            return true;
+        if ((field.type === "table" || field.type === "table[]" || field.type === "json") &&
+            path.startsWith(`${field.path}.`)) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Why `value` cannot be what `path` declares, or `null` when it can.
+ *
+ * `config set` used to check only that a path was DECLARED, so
+ * `integration.timeoutMs=fast` wrote a string into a number field and the
+ * mistake surfaced as a server error on the next push. The descriptor exists to
+ * carry what per-flag `--help` used to carry (criterion 7), and that has to
+ * include the type — otherwise removing the flags traded a fast local error for
+ * a slow remote one.
+ *
+ * Deliberately silent about anything it cannot judge: an undeclared path (the
+ * declared-path check owns that message — two errors for one mistake is worse
+ * than one), the interior of a `table` / `table[]` / `json` field, and a var
+ * file's own keys. Those shapes belong to the server, and mirroring them here
+ * would be a second copy that goes stale.
+ */
+export function fieldTypeMismatch(descriptor, path, value) {
+    const field = descriptor.fields.find((f) => f.path === path);
+    if (!field)
+        return null;
+    const expected = field.type === "number" || field.type === "boolean" || field.type === "string"
+        ? field.type
+        : null;
+    if (!expected || typeof value === expected)
+        return null;
+    return (`'${path}' is declared ${expected}, but '${value}' is a ${typeof value}. ` +
+        `Run 'primitive config fields ${descriptor.type}' to see the surface.`);
+}
+/**
+ * Resolve a `config set` target to the file it edits.
+ *
+ * Accepts `<type>/<key>` for the 13 per-entity types, plus the two root
+ * singletons by name: `app` (`app.toml`) and `vars` (`vars.toml`, whose keys
+ * are addressed as `vars.<KEY>`).
+ *
+ * The key is resolved the way `config push --only` resolves it — by the identity
+ * the local files DECLARE, falling back to the conventional file name when no
+ * file declares it. `config set` and the push that follows it have to agree about
+ * which object `<type>/<key>` is; resolving by file name alone meant a renamed
+ * file (`custom.toml` declaring `workflow.key = "greeting"`) could not be
+ * edited as `workflow/greeting` at all, while `workflow/custom` edited a file
+ * push would apply under a different key (issue #2645, review follow-up).
+ */
+function resolveSetTarget(selector, configDir) {
+    if (selector === "app") {
+        return {
+            descriptor: requireConfigDescriptor("app"),
+            filePath: join(configDir, "app.toml"),
+        };
+    }
+    if (selector === "vars" || selector === "var") {
+        return {
+            descriptor: requireConfigDescriptor("var"),
+            filePath: join(configDir, "vars.toml"),
+        };
+    }
+    const slash = selector.indexOf("/");
+    if (slash === -1) {
+        error(`'${selector}' is not a configuration object. Use <type>/<key>, app, or vars. Types: ${configTypeList()}`);
+        process.exit(1);
+    }
+    const type = selector.slice(0, slash);
+    const key = selector.slice(slash + 1);
+    const descriptor = requireConfigDescriptor(type);
+    if (!descriptor.resourceType) {
+        error(`'${type}' is a single file — use '${type === "app" ? "app" : "vars"}' with no key`);
+        process.exit(1);
+    }
+    if (!key) {
+        error(`'${selector}': name the object, e.g. ${type}/<key>`);
+        process.exit(1);
+    }
+    const refusal = configAuthoringError(type, key);
+    if (refusal) {
+        error(refusal);
+        process.exit(1);
+    }
+    const filename = descriptor.resourceType.fileFromKey(key);
+    // The key is a command-line argument, so it must never be able to steer the
+    // edit out of the type's directory — `workflow/../app` would otherwise let
+    // `config set` rewrite a file the operator did not name. Same guard `config create`
+    // applies before a write and prune applies before an unlink. Checked before
+    // the directory scan below so a traversing key never reaches the filesystem.
+    if (!isSafeSyncFilename(filename)) {
+        error(`'${key}' is not a usable key — it would edit outside ${descriptor.resourceType.dir}/.`);
+        process.exit(1);
+    }
+    const declaring = filesDeclaringKey(configDir, descriptor.type, key);
+    if (declaring.length > 1) {
+        error(`'${selector}' is declared by ${declaring.length} files (${declaring
+            .map((p) => basename(p))
+            .join(", ")}) — one key, one file. Remove or re-key the duplicates, then retry.`);
+        process.exit(1);
+    }
+    // No local file declares the key: fall back to the conventional path, so the
+    // "no local file at …" error names where `config pull` / `config create` would put it.
+    const filePath = declaring[0] ?? join(configDir, descriptor.resourceType.dir, filename);
+    // A file may declare a key other than its name, including a platform-owned
+    // one. Push skips those (#1660), so editing one is an edit that can never be
+    // applied — refuse it by the key the file DECLARES, not only by the one the
+    // operator typed.
+    const declaredKey = pushSelectorKey(descriptor, filePath);
+    const declaredRefusal = declaredKey === key
+        ? null
+        : configAuthoringError(descriptor.type, declaredKey);
+    if (declaredRefusal) {
+        error(declaredRefusal);
+        process.exit(1);
+    }
+    return { descriptor, filePath };
+}
+/**
+ * Register the `config` group and its local authoring verbs, and return the
+ * group so `registerConfigSyncCommands` can hang the server-reconciling verbs
+ * off the same noun (issue #2759).
+ */
+export function registerConfigCommands(program) {
+    const config = program
+        .command("config")
+        .description("Manage app configuration as TOML files — author locally, then pull/diff/push against the server")
+        .addHelpText("after", `
+Configuration is authored in TOML and applied with 'primitive config push'.
+'fields', 'create' and 'set' only read and write local files — nothing there
+contacts the server, so they work before you have an app, and a script can edit
+a file without a login. 'init', 'pull', 'push', 'diff' and 'revert' reconcile
+those files with the server.
+
+Examples:
+  $ primitive config fields workflow
+  $ primitive config create workflow order-intake
+  $ primitive config set workflow/order-intake workflow.description="Intake"
+  $ primitive config push --only workflow/order-intake
+
+Availability is not configuration: a workflow's status is server-owned, so it
+is not a settable key here. Take one out of service with
+'primitive workflows disable' (and back with 'enable').
+
+Directory Structure:
+  config/
+    .primitive-sync.json            # Sync state (auto-managed)
+    app.toml                        # App settings
+    integrations/*.toml             # Integration configs
+    integrations/{key}.tests/*.toml # Integration test cases
+    webhooks/*.toml                 # Webhook configs
+    cron-triggers/*.toml             # Cron trigger configs
+    blob-buckets/*.toml             # Blob bucket configs
+    prompts/*.toml                  # Prompt configs
+    prompts/{key}.tests/*.toml      # Prompt test cases
+    workflows/*.toml                # Workflow definitions
+    workflows/{key}.tests/*.toml    # Workflow test cases
+    transforms/*.rhai               # Rhai transform bodies
+    transforms/{name}.tests/*.toml  # Transform test cases
+    database-type-configs/*.toml    # Database type configs + operations
+    rule-sets/*.toml                # Access rule sets
+    group-type-configs/*.toml       # Group type configs
+    collection-type-configs/*.toml  # Collection type configs
+    metadata-category-configs/*.toml # Resource-metadata category configs
+    email-templates/*.toml          # Email template overrides
+`);
+    // ── The TOML authoring surface (issue #2645) ─────────────────────────────
+    //
+    // Server-side configuration is authored in TOML and applied with
+    // `config push`. These three commands are what replaced the config-setting
+    // flags: `fields` documents the surface that per-flag `--help` used to,
+    // `create` scaffolds an object without an API call, and `set` edits one key
+    // from a script. None of them touches the network.
+    config
+        .command("fields")
+        .description("List a configuration type's TOML keys, types, required and default")
+        .argument("<type>", `Configuration type (${CONFIG_OBJECT_DESCRIPTORS.length} available)`)
+        .option("--json", "Output as JSON")
+        .addHelpText("after", `
+Types:
+  ${CONFIG_OBJECT_DESCRIPTORS.map((d) => `${d.type} — ${d.description}`).join("\n  ")}
+
+Examples:
+  $ primitive config fields workflow
+  $ primitive config fields webhook --json
+`)
+        .action(async (type, options) => {
+        const descriptor = requireConfigDescriptor(type);
+        const asJson = (f) => ({
+            path: f.path,
+            type: f.type,
+            required: f.required,
+            default: f.default ?? null,
+            description: f.description,
+        });
+        if (options.json) {
+            json({
+                type: descriptor.type,
+                file: descriptor.fileHint,
+                description: descriptor.description,
+                identity: descriptor.identity ?? null,
+                fields: descriptor.fields.map(asJson),
+                // A type authored across more than one file reports the other files
+                // too — the workflow's named-config sidecars are the whole of what
+                // the removed `workflows configs` verbs used to set (issue #2645).
+                companionFiles: (descriptor.companionFiles ?? []).map((companion) => ({
+                    file: companion.fileHint,
+                    description: companion.description,
+                    fields: companion.fields.map(asJson),
+                })),
+            });
+            return;
+        }
+        keyValue("Type", descriptor.type);
+        keyValue("File", descriptor.fileHint);
+        keyValue("About", descriptor.description);
+        divider();
+        if (descriptor.freeFormRootKeys) {
+            info(`${descriptor.fileHint} is a flat table of your own keys — KEY = "value" at the root, matching ^[A-Z][A-Z0-9_]{0,63}$. There is no fixed field surface.`);
+            return;
+        }
+        if (descriptor.fields.length === 0) {
+            info(`${descriptor.fileHint} is a script body, not a table of keys — there is no field surface to list.`);
+            return;
+        }
+        const printField = (field) => {
+            const flags = [
+                field.required ? "required" : "optional",
+                field.default === undefined ? null : `default ${JSON.stringify(field.default)}`,
+            ]
+                .filter(Boolean)
+                .join(", ");
+            console.log(`  ${chalk.cyan(field.path)}  ${chalk.dim(field.type)}  ${chalk.dim(`(${flags})`)}`);
+            console.log(`      ${field.description}`);
+        };
+        for (const field of descriptor.fields) {
+            printField(field);
+        }
+        // The rest of the object's surface, where it spans more than one file.
+        // `config set` addresses the main file only, so these are listed rather
+        // than folded in — but leaving them out would under-report exactly what
+        // the removed `workflows configs` flags used to document (issue #2645).
+        for (const companion of descriptor.companionFiles ?? []) {
+            divider();
+            keyValue("File", companion.fileHint);
+            info(companion.description);
+            for (const field of companion.fields) {
+                printField(field);
+            }
+        }
+        divider();
+        info(`Edit ${descriptor.fileHint}, then run 'primitive config push'.`);
+    });
+    config
+        .command("create")
+        .description("Scaffold a configuration file locally (no API call)")
+        .argument("<type>", "Configuration type — see 'primitive config fields'")
+        .argument("<key>", "The object's key; it becomes the file name")
+        .option("--app <app-id>", "App ID")
+        .option("--dir <path>", "Config directory (overrides the auto-resolved per-env path)")
+        .addHelpText("after", `
+Creates the file from the type's defaults and stops there — nothing is sent to
+the server until you edit the file and run 'primitive config push'.
+
+Examples:
+  $ primitive config create workflow order-intake
+  $ primitive config create webhook stripe-events
+  $ primitive config push --only workflow/order-intake
+`)
+        .action(async (type, key, options) => {
+        const descriptor = requireConfigDescriptor(type);
+        if (!descriptor.resourceType) {
+            error(`${descriptor.type} is a root singleton (${descriptor.fileHint}) — it is not created per key. Run 'primitive config pull' to write it.`);
+            process.exit(1);
+        }
+        const refusal = configAuthoringError(descriptor.type, key);
+        if (refusal) {
+            error(refusal);
+            process.exit(1);
+        }
+        const configDir = resolveLocalSyncDir(undefined, options);
+        const dir = join(configDir, descriptor.resourceType.dir);
+        const filename = descriptor.resourceType.fileFromKey(key);
+        // The key comes from the command line, so it must never be able to steer
+        // a write out of the slot — the same guard the prune path applies before
+        // an unlink.
+        if (!isSafeSyncFilename(filename)) {
+            error(`'${key}' is not a usable key — it would write outside ${dir}.`);
+            process.exit(1);
+        }
+        const filePath = join(dir, filename);
+        if (existsSync(filePath)) {
+            error(`${descriptor.resourceType.dir}/${descriptor.resourceType.fileFromKey(key)} already exists — edit it, or pick another key.`);
+            process.exit(1);
+        }
+        ensureDir(dir);
+        writeFileSync(filePath, descriptor.scaffold(key));
+        success(`Created ${filePath}`);
+        info(`Next: edit it, then 'primitive config push --only ${descriptor.type}/${pushSelectorKey(descriptor, filePath)}'.`);
+    });
+    config
+        .command("set")
+        .description("Set a field in a configuration file locally (no API call)")
+        .argument("<object>", "<type>/<key>, app, or vars")
+        .argument("<assignments...>", "One or more <path>=<value>, e.g. workflow.description=\"Intake\"")
+        .option("--app <app-id>", "App ID")
+        .option("--dir <path>", "Config directory (overrides the auto-resolved per-env path)")
+        .addHelpText("after", `
+Edits the file in place, preserving comments and key order, and writes nothing
+to the server. Only scalars are settable — a table or an array is edited in the
+file directly.
+
+'true'/'false' and numeric values are written with those types; wrap a value in
+double quotes to force a string.
+
+Examples:
+  $ primitive config set workflow/order-intake workflow.description="Intake"
+  $ primitive config push --only workflow/order-intake
+
+A server-owned key such as status is not settable: availability is changed
+with 'primitive <noun> enable|disable', never through a file.
+`)
+        .action(async (object, assignments, options) => {
+        const configDir = resolveLocalSyncDir(undefined, options);
+        const { descriptor, filePath } = resolveSetTarget(object, configDir);
+        if (!existsSync(filePath)) {
+            error(`No local file at ${filePath}. Run 'primitive config pull' to fetch it, or 'primitive config create ${descriptor.type} <key>' to create one.`);
+            process.exit(1);
+        }
+        let text = readFileSync(filePath, "utf-8");
+        const applied = [];
+        for (const assignment of assignments) {
+            const eq = assignment.indexOf("=");
+            if (eq <= 0) {
+                error(`'${assignment}' is not <path>=<value>, e.g. workflow.name="Order intake"`);
+                process.exit(1);
+            }
+            const path = assignment.slice(0, eq).trim();
+            const raw = assignment.slice(eq + 1);
+            if (!isDeclaredFieldPath(descriptor, path)) {
+                error(`'${path}' is not a ${descriptor.type} field. Run 'primitive config fields ${descriptor.type}' to see the surface.`);
+                process.exit(1);
+            }
+            const value = parseScalarLiteral(raw);
+            const typeError = fieldTypeMismatch(descriptor, path, value);
+            if (typeError) {
+                error(typeError);
+                process.exit(1);
+            }
+            try {
+                text = setTomlScalar(text, path, value);
+            }
+            catch (e) {
+                if (e instanceof TomlEditError) {
+                    error(`${filePath}: ${e.message}`);
+                    process.exit(1);
+                }
+                throw e;
+            }
+            applied.push(path);
+        }
+        writeFileSync(filePath, text);
+        success(`Updated ${filePath} (${applied.join(", ")})`);
+        // The follow-up has to be a command that actually runs: `--only` takes
+        // `app`, `var/<KEY>` per var, or `<type>/<key>` where the key is the one
+        // push derives from the file — for a metadata-category config that is the
+        // `resourceType#category` pair, not the file name.
+        const pushTargets = descriptor.type === "app"
+            ? ["app"]
+            : descriptor.type === "var"
+                ? applied.map((path) => `var/${path}`)
+                : [`${descriptor.type}/${pushSelectorKey(descriptor, filePath)}`];
+        info(`Next: 'primitive config push --only ${pushTargets.join(",")}' to apply it.`);
+    });
+    return config;
+}
+//# sourceMappingURL=config.js.map

package/dist/src/commands/config.js.map

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

package/dist/src/commands/connections.js

@@ -1,6 +1,8 @@
+import { Option } from "commander";
 import { ApiClient } from "../lib/api-client.js";
 import { resolveAppId } from "../lib/config.js";
 import { error, info, formatTable, formatDate, json, } from "../lib/output.js";
+import { resolveUserSelector } from "../lib/user-selector.js";
 export function registerConnectionsCommands(program) {
     const connections = program
         .command("connections")
@@ -15,32 +17,35 @@ user notification channel).
 
 Examples:
   $ primitive connections list --document 01HXY...
-  $ primitive connections list --user 01HXY...
+  $ primitive connections list --user-id 01HXY...
   $ primitive connections list --database 01HXY... --limit 50
-  $ primitive connections list --user 01HXY... --json
+  $ primitive connections list --user-id 01HXY... --json
 `);
     connections
         .command("list")
         .description("List live connections for exactly one of a document, user, or database")
         .option("--app <app-id>", "App ID (uses current app if not specified)")
         .option("--document <document-id>", "List connections for this document")
-        .option("--user <user-id>", "List connections for this user")
+        .option("--user-id <user-id>", "List connections for this user")
+        // Deprecated alias of --user-id, kept accepted but out of --help (#2357).
+        .addOption(new Option("--user <user-id>", "Deprecated alias of --user-id").hideHelp())
         .option("--database <database-id>", "List database subscriptions for this database")
         .option("--limit <n>", "Maximum rows to return (default 25, max 100)")
         .option("--cursor <cursor>", "Pagination cursor from a previous page")
         .option("--json", "Output as JSON")
         .action(async (options) => {
+        const userId = resolveUserSelector(options, "connections list");
         const selectors = [
             options.document ? "document" : null,
-            options.user ? "user" : null,
+            userId ? "user" : null,
             options.database ? "database" : null,
         ].filter(Boolean);
         if (selectors.length === 0) {
-            error("Provide exactly one selector: --document, --user, or --database.");
+            error("Provide exactly one selector: --document, --user-id, or --database.");
             process.exit(1);
         }
         if (selectors.length > 1) {
-            error("Provide only one selector: --document, --user, or --database (not more than one).");
+            error("Provide only one selector: --document, --user-id, or --database (not more than one).");
             process.exit(1);
         }
         const resolvedAppId = resolveAppId(undefined, options);
@@ -53,7 +58,7 @@ Examples:
         try {
             const { items, nextCursor } = await client.listConnections(resolvedAppId, {
                 documentId: options.document,
-                userId: options.user,
+                userId,
                 databaseId: options.database,
             }, { limit, cursor: options.cursor });
             if (options.json) {

package/dist/src/commands/connections.js.map

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