@dereekb/dbx-cli 13.11.13 → 13.11.15

package/index.cjs.js

@@ -411,7 +411,13 @@ var _timeoutMs;
                     fetchImpl = fetcher !== null && fetcher !== void 0 ? fetcher : fetch;
                     timeoutMs = _timeoutMs;
                     method = (_ref = init === null || init === void 0 ? void 0 : init.method) !== null && _ref !== void 0 ? _ref : 'GET';
-                    url = typeof input === 'string' ? input : _instanceof$6(input, URL) ? input.toString() : input.url;
+                    if (typeof input === 'string') {
+                        url = input;
+                    } else if (_instanceof$6(input, URL)) {
+                        url = input.toString();
+                    } else {
+                        url = input.url;
+                    }
                     verboseLog("".concat(method, " ").concat(url));
                     finalInit = init;
                     if (timeoutMs != null && (init === null || init === void 0 ? void 0 : init.signal) == null) {
@@ -420,7 +426,7 @@ var _timeoutMs;
                         timeoutHandle = setTimeout(function() {
                             return localController.abort();
                         }, timeoutMs);
-                        finalInit = _object_spread_props$a(_object_spread$e({}, init !== null && init !== void 0 ? init : {}), {
+                        finalInit = _object_spread_props$a(_object_spread$e({}, init), {
                             signal: localController.signal
                         });
                     }
@@ -547,18 +553,21 @@ var _timeoutMs;
  * @__NO_SIDE_EFFECTS__
  */ function buildDumpFilePath(extension, suffix) {
     var dumpDir = _outputOptions.dumpDir, commandPath = _outputOptions.commandPath;
-    if (!dumpDir) {
-        return undefined;
-    }
-    if (!node_fs.existsSync(dumpDir)) {
-        node_fs.mkdirSync(dumpDir, {
-            recursive: true
-        });
+    var result;
+    if (dumpDir) {
+        if (!node_fs.existsSync(dumpDir)) {
+            node_fs.mkdirSync(dumpDir, {
+                recursive: true
+            });
+        }
+        var prefix = (commandPath === null || commandPath === void 0 ? void 0 : commandPath.length) ? commandPath.join('_') : 'response';
+        var stamp = dumpTimestamp();
+        var base = suffix ? "".concat(prefix, "_").concat(stamp, "_").concat(suffix) : "".concat(prefix, "_").concat(stamp);
+        result = node_path.join(dumpDir, "".concat(base, ".").concat(extension));
+    } else {
+        result = undefined;
     }
-    var prefix = (commandPath === null || commandPath === void 0 ? void 0 : commandPath.length) ? commandPath.join('_') : 'response';
-    var stamp = dumpTimestamp();
-    var base = suffix ? "".concat(prefix, "_").concat(stamp, "_").concat(suffix) : "".concat(prefix, "_").concat(stamp);
-    return node_path.join(dumpDir, "".concat(base, ".").concat(extension));
+    return result;
 }
 function dumpResponse(data, meta) {
     var filePath = buildDumpFilePath('json');
@@ -583,42 +592,47 @@ function dumpResponse(data, meta) {
     var fields = pick.split(',').map(function(f) {
         return f.trim();
     });
+    var result;
     if (Array.isArray(data)) {
-        return data.map(function(item) {
+        result = data.map(function(item) {
             return pickFromObject(item, fields);
         });
+    } else if (data != null && (typeof data === "undefined" ? "undefined" : _type_of$3(data)) === 'object') {
+        result = pickFromObject(data, fields);
+    } else {
+        result = data;
     }
-    if (data != null && (typeof data === "undefined" ? "undefined" : _type_of$3(data)) === 'object') {
-        return pickFromObject(data, fields);
-    }
-    return data;
+    return result;
 }
 function pickFromObject(obj, fields) {
+    var result;
     if (obj == null || (typeof obj === "undefined" ? "undefined" : _type_of$3(obj)) !== 'object') {
-        return obj;
-    }
-    var result = {};
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = fields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var field = _step.value;
-            if (field in obj) {
-                result[field] = obj[field];
-            }
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
+        result = obj;
+    } else {
+        var picked = {};
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
+            for(var _iterator = fields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var field = _step.value;
+                if (field in obj) {
+                    picked[field] = obj[field];
+                }
             }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
         } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
         }
+        result = picked;
     }
     return result;
 }
@@ -689,33 +703,32 @@ function stringifyEnvelope(value) {
  * @returns The structured {@link CliErrorOutput}.
  * @__NO_SIDE_EFFECTS__
  */ function buildErrorOutput(error) {
-    if (_errorMapper) {
-        var mapped = _errorMapper(error);
-        if (mapped) {
-            return mapped;
-        }
-    }
-    if (_instanceof$6(error, CliError)) {
-        return _object_spread$e({
+    var mapped = _errorMapper ? _errorMapper(error) : undefined;
+    var result;
+    if (mapped) {
+        result = mapped;
+    } else if (_instanceof$6(error, CliError)) {
+        result = _object_spread$e({
             ok: false,
             error: sanitizeString(error.message),
             code: error.code
         }, error.suggestion ? {
             suggestion: error.suggestion
         } : {});
-    }
-    if (_instanceof$6(error, Error)) {
-        return {
+    } else if (_instanceof$6(error, Error)) {
+        result = {
             ok: false,
             error: sanitizeString(error.message),
             code: 'ERROR'
         };
+    } else {
+        result = {
+            ok: false,
+            error: sanitizeString(String(error)),
+            code: 'UNKNOWN_ERROR'
+        };
     }
-    return {
-        ok: false,
-        error: sanitizeString(String(error)),
-        code: 'UNKNOWN_ERROR'
-    };
+    return result;
 }
 
 function _array_like_to_array$b(arr, len) {
@@ -1124,21 +1137,22 @@ var MAX_MODEL_ACCESS_MULTI_READ_KEYS = 50;
 }
 function requestJson(input) {
     return _async_to_generator$l(function() {
-        var init, res, _ref, ok, body, fallbackMessage;
+        var hasJsonBody, init, res, _ref, ok, body, fallbackMessage;
         return _ts_generator$l(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    hasJsonBody = input.jsonBody !== undefined;
                     init = _object_spread$d({
                         method: input.method,
                         headers: _object_spread$d({
                             Accept: 'application/json',
                             Authorization: "Bearer ".concat(input.accessToken)
-                        }, input.jsonBody !== undefined ? {
+                        }, hasJsonBody ? {
                             'Content-Type': 'application/json'
-                        } : {})
-                    }, input.jsonBody !== undefined ? {
+                        } : null)
+                    }, hasJsonBody ? {
                         body: JSON.stringify(input.jsonBody)
-                    } : {});
+                    } : null);
                     return [
                         4,
                         tracedFetch(input.fetcher, input.url, init)
@@ -1203,13 +1217,23 @@ function extractMessage(body, fallback, res) {
     return messageString !== null && messageString !== void 0 ? messageString : fallback || "".concat(res.status, " ").concat(res.statusText);
 }
 function codeForStatus(status) {
-    if (status === 401) return 'AUTH_UNAUTHORIZED';
-    if (status === 403) return 'AUTH_FORBIDDEN';
-    if (status === 404) return 'NOT_FOUND';
-    if (status === 422) return 'VALIDATION_ERROR';
-    if (status === 429) return 'RATE_LIMITED';
-    if (status >= 500) return 'SERVER_ERROR';
-    return 'API_ERROR';
+    var result;
+    if (status === 401) {
+        result = 'AUTH_UNAUTHORIZED';
+    } else if (status === 403) {
+        result = 'AUTH_FORBIDDEN';
+    } else if (status === 404) {
+        result = 'NOT_FOUND';
+    } else if (status === 422) {
+        result = 'VALIDATION_ERROR';
+    } else if (status === 429) {
+        result = 'RATE_LIMITED';
+    } else if (status >= 500) {
+        result = 'SERVER_ERROR';
+    } else {
+        result = 'API_ERROR';
+    }
+    return result;
 }
 function trimSlash$1(url) {
     return url.endsWith('/') ? url.slice(0, -1) : url;
@@ -2281,26 +2305,32 @@ function _processPage(input) {
 }
 function _computeEffectiveLimit(totalItemsLimit, limitPerPage, totalItems) {
     var remainingBudget = totalItemsLimit == null ? undefined : totalItemsLimit - totalItems;
+    var result;
     if (limitPerPage != null && remainingBudget != null) {
-        return Math.min(limitPerPage, remainingBudget);
+        result = Math.min(limitPerPage, remainingBudget);
+    } else {
+        result = limitPerPage !== null && limitPerPage !== void 0 ? limitPerPage : remainingBudget;
     }
-    return limitPerPage !== null && limitPerPage !== void 0 ? limitPerPage : remainingBudget;
+    return result;
 }
 function _evaluateLoopExit(input) {
     var totalItemsLimit = input.totalItemsLimit, maxPages = input.maxPages, totalItems = input.totalItems, pageIndex = input.pageIndex, hasMore = input.hasMore, cursorDocumentKey = input.cursorDocumentKey;
     var reachedItemsLimit = totalItemsLimit != null && totalItems >= totalItemsLimit;
     var reachedPagesLimit = maxPages != null && pageIndex >= maxPages;
+    var result;
     if (reachedItemsLimit || reachedPagesLimit) {
-        return {
+        result = {
             stop: true,
             hitLimit: true
         };
+    } else {
+        var exhausted = hasMore === false || cursorDocumentKey == null;
+        result = {
+            stop: exhausted,
+            hitLimit: false
+        };
     }
-    var exhausted = hasMore === false || cursorDocumentKey == null;
-    return {
-        stop: exhausted,
-        hitLimit: false
-    };
+    return result;
 }
 /**
  * Iterates a paginated `callModel` endpoint, exhausting (or stopping at the configured limit) all pages.
@@ -2313,6 +2343,9 @@ function _evaluateLoopExit(input) {
  * Concurrency: pages are fetched serially (cursor dependency); items within a page can run
  * in parallel via `maxParallelPerPage` (forwarded to `performAsyncTasks`).
  *
+ * @param config - Iterator configuration.
+ * @returns The aggregate result.
+ *
  * @example
  * ```ts
  * // Exhaust every published Guestbook entry for a single Guestbook.
@@ -2322,7 +2355,6 @@ function _evaluateLoopExit(input) {
  *   params: { guestbook: 'gb/abc', published: true }
  * });
  * ```
- *
  * @example
  * ```ts
  * // Fan out to a child action per Guestbook, with 4-way parallelism per page.
@@ -2334,9 +2366,6 @@ function _evaluateLoopExit(input) {
  *   iterateItem: ({ context, key }) => queryGuestbookEntriesForGuestbook({ context, guestbook: key, published: true })
  * });
  * ```
- *
- * @param config - Iterator configuration.
- * @returns The aggregate result.
  */ function iterateDbxCliCallModel(config) {
     return _async_to_generator$i(function() {
         var context, modelType, call, specifier, params, _config_buildRequestData, buildRequestData, _config_responseAdapter, responseAdapter, limitPerPage, totalItemsLimit, maxPages, iterateItem, iteratePage, itemPerformTasksConfig, maxParallelPerPage, _config_collectItems, collectItems, _config_collectItemResults, collectItemResults, _config_collectPageResults, collectPageResults, allItems, allItemResults, allPageResults, pageIndex, totalItems, cursorDocumentKey, hitLimit, keepGoing, collectItemsForPage, collectItemResultsForPage, collectPageResultsForPage, effectiveLimit, data, raw, pageOutcome, _allItems, _allItemResults, exit, result;
@@ -3276,7 +3305,7 @@ function _ts_generator$f(thisArg, body) {
  *
  * Provides direct access to the demo-api's typed model dispatch without typed wrappers — useful
  * for ad-hoc admin tasks, scripting, and the MVP demo CLI before model-specific commands ship.
- */ var callPassthroughCommand = {
+ */ var CALL_PASSTHROUGH_COMMAND = {
     command: 'call <model> <verb> [specifier]',
     describe: 'POST a typed model call: { modelType, call, specifier?, data } — generic passthrough',
     builder: function builder(yargs) {
@@ -3412,9 +3441,10 @@ function _unsupported_iterable_to_array$8(o, minLen) {
  * `modelType` first, then falls back to `identityConst` and `collectionPrefix`
  * so callers can pass any of the three forms a user might type at the CLI.
  *
- * @param modelType - identifier to look up.
- * @param manifest - generated model manifest.
- * @returns the matching entry, or `undefined` when none exists.
+ * @param modelType - Identifier to look up.
+ * @param manifest - Generated model manifest.
+ * @returns The matching entry, or `undefined` when none exists.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function findCliModelManifestEntry(modelType, manifest) {
     var result;
@@ -3453,95 +3483,108 @@ function _unsupported_iterable_to_array$8(o, minLen) {
  * Unknown keys, primitives, `Date`, `null`, and `undefined` pass through
  * unchanged.
  *
- * @param modelType - the model identifier (`modelType`, `identityConst`,
+ * @param modelType - The model identifier (`modelType`, `identityConst`,
  *   or `collectionPrefix`) used to look up the rewrite map.
- * @param data - the value to rewrite (typically a `read`/`query` response
+ * @param data - The value to rewrite (typically a `read`/`query` response
  *   payload).
- * @param manifest - generated model manifest.
- * @returns the rewritten value, or `data` unchanged when no rewrite applies.
+ * @param manifest - Generated model manifest.
+ * @returns The rewritten value, or `data` unchanged when no rewrite applies.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function expandModelKeys(modelType, data, manifest) {
     var entry = findCliModelManifestEntry(modelType, manifest);
-    if (!entry) return data;
-    return rewriteWithFields(data, entry.fields);
+    return entry ? rewriteWithFields(data, entry.fields) : data;
 }
 function rewriteWithFields(value, fields) {
+    var result;
     if (Array.isArray(value)) {
-        return value.map(function(item) {
+        result = value.map(function(item) {
             return rewriteWithFields(item, fields);
         });
-    }
-    if (!isPlainObject(value)) return value;
-    var fieldByName = new Map();
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = fields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var field = _step.value;
-            fieldByName.set(field.name, field);
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
+    } else if (isPlainObject(value)) {
+        var fieldByName = new Map();
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
+            for(var _iterator = fields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var field = _step.value;
+                fieldByName.set(field.name, field);
             }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
         } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    var out = {};
-    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
-    try {
-        for(var _iterator1 = Object.entries(value)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-            var _step_value = _sliced_to_array$4(_step1.value, 2), key = _step_value[0], raw = _step_value[1];
-            var field1 = fieldByName.get(key);
-            if (!field1) {
-                out[key] = raw;
-                continue;
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
-            var longKey = field1.longName.length > 0 ? field1.longName : key;
-            out[longKey] = rewriteFieldValue(raw, field1);
         }
-    } catch (err) {
-        _didIteratorError1 = true;
-        _iteratorError1 = err;
-    } finally{
+        var out = {};
+        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
         try {
-            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                _iterator1.return();
+            for(var _iterator1 = Object.entries(value)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                var _step_value = _sliced_to_array$4(_step1.value, 2), key = _step_value[0], raw = _step_value[1];
+                var field1 = fieldByName.get(key);
+                if (field1) {
+                    var longKey = field1.longName.length > 0 ? field1.longName : key;
+                    out[longKey] = rewriteFieldValue(raw, field1);
+                } else {
+                    out[key] = raw;
+                }
             }
+        } catch (err) {
+            _didIteratorError1 = true;
+            _iteratorError1 = err;
         } finally{
-            if (_didIteratorError1) {
-                throw _iteratorError1;
+            try {
+                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                    _iterator1.return();
+                }
+            } finally{
+                if (_didIteratorError1) {
+                    throw _iteratorError1;
+                }
             }
         }
+        result = out;
+    } else {
+        result = value;
     }
-    return out;
+    return result;
 }
 function rewriteFieldValue(value, field) {
     var nested = field.nestedFields;
-    if (!nested || nested.length === 0) return value;
-    if (field.nestedIsArray) {
-        if (!Array.isArray(value)) return value;
-        return value.map(function(item) {
+    var result;
+    if (!nested || nested.length === 0) {
+        result = value;
+    } else if (field.nestedIsArray) {
+        result = Array.isArray(value) ? value.map(function(item) {
             return rewriteWithFields(item, nested);
-        });
+        }) : value;
+    } else if (isPlainObject(value)) {
+        result = rewriteWithFields(value, nested);
+    } else {
+        result = value;
     }
-    if (!isPlainObject(value)) return value;
-    return rewriteWithFields(value, nested);
+    return result;
 }
 function isPlainObject(value) {
-    if (value === null || (typeof value === "undefined" ? "undefined" : _type_of$1(value)) !== 'object') return false;
-    if (Array.isArray(value)) return false;
-    if (_instanceof$4(value, Date)) return false;
-    // Objects from JSON.parse have Object.prototype as their proto. Anything
-    // exotic (Map, Set, Buffer, class instances) we leave untouched.
-    var proto = Object.getPrototypeOf(value);
-    return proto === Object.prototype || proto === null;
+    var result;
+    if (value === null || (typeof value === "undefined" ? "undefined" : _type_of$1(value)) !== 'object') {
+        result = false;
+    } else if (Array.isArray(value) || _instanceof$4(value, Date)) {
+        result = false;
+    } else {
+        // Objects from JSON.parse have Object.prototype as their proto. Anything
+        // exotic (Map, Set, Buffer, class instances) we leave untouched.
+        var proto = Object.getPrototypeOf(value);
+        result = proto === Object.prototype || proto === null;
+    }
+    return result;
 }
 
 function _array_like_to_array$7(arr, len) {
@@ -3626,6 +3669,8 @@ function runHandler$1(manifest, argv) {
  * @param rawKey - The Firestore key string.
  * @param manifest - The generated model manifest.
  * @returns The decoded key with leaf, ancestors, and any unresolved prefixes.
+ * @throws {CliError} When `rawKey` is empty or does not parse into an even number of `prefix/id` segments.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function decodeFirestoreModelKey(rawKey, manifest) {
     var trimmed = rawKey.trim();
@@ -3666,13 +3711,7 @@ function runHandler$1(manifest, argv) {
     };
 }
 function toSegment(prefix, id, entry) {
-    if (!entry) {
-        return {
-            prefix: prefix,
-            id: id
-        };
-    }
-    return {
+    var result = entry ? {
         prefix: prefix,
         id: id,
         modelName: entry.modelName,
@@ -3682,15 +3721,20 @@ function toSegment(prefix, id, entry) {
         parentIdentityConst: entry.parentIdentityConst,
         sourcePackage: entry.sourcePackage,
         sourceFile: entry.sourceFile
+    } : {
+        prefix: prefix,
+        id: id
     };
+    return result;
 }
 /**
  * Renders a {@link DecodedKey} as a human-readable text block. Mirrors the
  * MCP `dbx_model_decode` key-mode output for consistency between agent and
  * shell consumers.
  *
- * @param decoded - the decoded key returned by {@link decodeFirestoreModelKey}.
- * @returns the formatted block with a trailing newline.
+ * @param decoded - The decoded key returned by {@link decodeFirestoreModelKey}.
+ * @returns The formatted block with a trailing newline.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function renderDecodedKey(decoded) {
     var lines = _to_consumable_array$5(renderLeafLines(decoded.leaf));
@@ -3708,32 +3752,31 @@ function toSegment(prefix, id, entry) {
     return lines.join('\n') + '\n';
 }
 function renderLeafLines(leaf) {
-    if (!leaf.modelName) {
-        return [
+    var lines;
+    if (leaf.modelName) {
+        lines = [
+            "Model: ".concat(leaf.modelName)
+        ];
+        if (leaf.identityConst) lines.push("identityConst: ".concat(leaf.identityConst));
+        if (leaf.modelType) lines.push("modelType: ".concat(leaf.modelType));
+        lines.push("prefix: ".concat(leaf.prefix), "id: ".concat(leaf.id));
+        if (leaf.modelGroup) lines.push("modelGroup: ".concat(leaf.modelGroup));
+        if (leaf.parentIdentityConst) lines.push("parentIdentityConst: ".concat(leaf.parentIdentityConst));
+        if (leaf.sourcePackage) {
+            var sourceSuffix = leaf.sourceFile ? " (".concat(leaf.sourceFile, ")") : '';
+            lines.push("source: ".concat(leaf.sourcePackage).concat(sourceSuffix));
+        }
+    } else {
+        lines = [
             "Model: <unknown — prefix '".concat(leaf.prefix, "' not in manifest>"),
             "prefix: ".concat(leaf.prefix),
             "id: ".concat(leaf.id)
         ];
     }
-    var lines = [
-        "Model: ".concat(leaf.modelName)
-    ];
-    if (leaf.identityConst) lines.push("identityConst: ".concat(leaf.identityConst));
-    if (leaf.modelType) lines.push("modelType: ".concat(leaf.modelType));
-    lines.push("prefix: ".concat(leaf.prefix), "id: ".concat(leaf.id));
-    if (leaf.modelGroup) lines.push("modelGroup: ".concat(leaf.modelGroup));
-    if (leaf.parentIdentityConst) lines.push("parentIdentityConst: ".concat(leaf.parentIdentityConst));
-    if (leaf.sourcePackage) {
-        var sourceSuffix = leaf.sourceFile ? " (".concat(leaf.sourceFile, ")") : '';
-        lines.push("source: ".concat(leaf.sourcePackage).concat(sourceSuffix));
-    }
     return lines;
 }
 function renderAncestorLine(ancestor) {
-    if (ancestor.modelName) {
-        return "- ".concat(ancestor.modelName, " — prefix ").concat(ancestor.prefix, ", id ").concat(ancestor.id);
-    }
-    return "- <unknown> — prefix ".concat(ancestor.prefix, ", id ").concat(ancestor.id);
+    return ancestor.modelName ? "- ".concat(ancestor.modelName, " — prefix ").concat(ancestor.prefix, ", id ").concat(ancestor.id) : "- <unknown> — prefix ".concat(ancestor.prefix, ", id ").concat(ancestor.id);
 }
 
 function _array_like_to_array$6(arr, len) {
@@ -3807,10 +3850,13 @@ function _unsupported_iterable_to_array$6(o, minLen) {
  *    {@link CliError} if the manifest is missing, the prefix is unresolved, or the leaf
  *    has no `modelType`.
  *
+ * @param input - Positionals captured by yargs plus the optional model manifest.
  * @param input.modelOrKey - The first positional from yargs.
  * @param input.key - The optional second positional from yargs.
  * @param input.manifest - The generated model manifest (for prefix lookup).
  * @returns The parsed `{ modelType, key }` pair.
+ * @throws {CliError} When `modelOrKey` is missing, when no manifest is wired but inference is required, when the bare positional is not a full key, or when the manifest cannot resolve the key's prefix.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function parseGetArgs(input) {
     var _input_modelOrKey;
@@ -3823,37 +3869,40 @@ function _unsupported_iterable_to_array$6(o, minLen) {
         });
     }
     var explicitKey = (_input_key = input.key) === null || _input_key === void 0 ? void 0 : _input_key.trim();
+    var result;
     if (explicitKey != null && explicitKey.length > 0) {
-        return {
+        result = {
             modelType: modelOrKey,
             key: explicitKey
         };
+    } else {
+        if (!modelOrKey.includes('/')) {
+            throw new CliError({
+                message: "get: '".concat(modelOrKey, "' looks like a bare doc id. Provide a full key (e.g. 'jws/abc123') or use 'get <model> <key>'."),
+                code: 'INVALID_ARGUMENT'
+            });
+        }
+        var manifest = input.manifest;
+        if (!manifest || manifest.length === 0) {
+            throw new CliError({
+                message: 'get: cannot infer modelType — no model manifest is wired into the CLI. Pass `modelManifest` to `runCli`, or use `get <model> <key>` explicitly.',
+                code: 'INVALID_ARGUMENT'
+            });
+        }
+        var decoded = decodeFirestoreModelKey(modelOrKey, manifest);
+        if (decoded.unresolvedPrefixes.length > 0 || !decoded.leaf.modelType) {
+            throw new CliError({
+                message: "get: unable to resolve modelType for key '".concat(modelOrKey, "'. Unknown prefix: ").concat(decoded.unresolvedPrefixes.join(', ') || decoded.leaf.prefix, ". Known prefixes: ").concat(manifestPrefixList(manifest), "."),
+                code: 'INVALID_ARGUMENT',
+                suggestion: "Run `<cli> model-decode '<key>'` to inspect a key, or use `get <model> <key>` explicitly."
+            });
+        }
+        result = {
+            modelType: decoded.leaf.modelType,
+            key: modelOrKey
+        };
     }
-    if (!modelOrKey.includes('/')) {
-        throw new CliError({
-            message: "get: '".concat(modelOrKey, "' looks like a bare doc id. Provide a full key (e.g. 'jws/abc123') or use 'get <model> <key>'."),
-            code: 'INVALID_ARGUMENT'
-        });
-    }
-    var manifest = input.manifest;
-    if (!manifest || manifest.length === 0) {
-        throw new CliError({
-            message: 'get: cannot infer modelType — no model manifest is wired into the CLI. Pass `modelManifest` to `runCli`, or use `get <model> <key>` explicitly.',
-            code: 'INVALID_ARGUMENT'
-        });
-    }
-    var decoded = decodeFirestoreModelKey(modelOrKey, manifest);
-    if (decoded.unresolvedPrefixes.length > 0 || !decoded.leaf.modelType) {
-        throw new CliError({
-            message: "get: unable to resolve modelType for key '".concat(modelOrKey, "'. Unknown prefix: ").concat(decoded.unresolvedPrefixes.join(', ') || decoded.leaf.prefix, ". Known prefixes: ").concat(manifestPrefixList(manifest), "."),
-            code: 'INVALID_ARGUMENT',
-            suggestion: "Run `<cli> model-decode '<key>'` to inspect a key, or use `get <model> <key>` explicitly."
-        });
-    }
-    return {
-        modelType: decoded.leaf.modelType,
-        key: modelOrKey
-    };
+    return result;
 }
 /**
  * Parses the positionals for the top-level `get-many <firstArg> [rest..]` command.
@@ -3866,10 +3915,13 @@ function _unsupported_iterable_to_array$6(o, minLen) {
  *
  * Always rejects empty key lists and lists exceeding 50 keys.
  *
+ * @param input - Positionals captured by yargs plus the optional model manifest.
  * @param input.firstArg - The first positional from yargs.
  * @param input.rest - The remaining positionals from yargs.
  * @param input.manifest - The generated model manifest (used only in the inferred-key branch).
  * @returns The parsed `{ modelType, keys }` pair.
+ * @throws {CliError} When positionals are missing, when an inferred-key call lacks a manifest, when one or more keys cannot be resolved, or when the keys span multiple `modelType`s.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function parseGetManyArgs(input) {
     var _input_firstArg, _input_rest;
@@ -3885,22 +3937,25 @@ function _unsupported_iterable_to_array$6(o, minLen) {
             code: 'INVALID_ARGUMENT'
         });
     }
+    var result;
     if (firstArg.includes('/')) {
         var keys = [
             firstArg
         ].concat(_to_consumable_array$4(rest));
-        return inferModelTypeFromKeys(keys, input.manifest);
-    }
-    if (rest.length === 0) {
-        throw new CliError({
-            message: "get-many: '".concat(firstArg, "' has no '/' so it was treated as a model name, but no keys were supplied. Usage: 'get-many <model> <key...>'."),
-            code: 'INVALID_ARGUMENT'
-        });
+        result = inferModelTypeFromKeys(keys, input.manifest);
+    } else {
+        if (rest.length === 0) {
+            throw new CliError({
+                message: "get-many: '".concat(firstArg, "' has no '/' so it was treated as a model name, but no keys were supplied. Usage: 'get-many <model> <key...>'."),
+                code: 'INVALID_ARGUMENT'
+            });
+        }
+        result = {
+            modelType: firstArg,
+            keys: rest
+        };
     }
-    return {
-        modelType: firstArg,
-        keys: rest
-    };
+    return result;
 }
 function inferModelTypeFromKeys(keys, manifest) {
     if (!manifest || manifest.length === 0) {
@@ -4098,7 +4153,7 @@ function _ts_generator$e(thisArg, body) {
  * explicit `modelType` straight through.
  *
  * Backend: `GET <apiBaseUrl>/model/<modelType>/get?key=<key>` (ModelApiController.getOne).
- */ var getCommand = {
+ */ var GET_COMMAND = {
     command: 'get <modelOrKey> [key]',
     describe: 'Read a document by key. ModelType is inferred from the key prefix when only one positional is supplied.',
     builder: function builder(yargs) {
@@ -4278,7 +4333,7 @@ function _ts_generator$d(thisArg, body) {
  * (e.g. `cat keys.txt | <cli> get-many -`).
  *
  * Backend: `POST <apiBaseUrl>/model/<modelType>/get` with body `{ keys }` (ModelApiController.getMany).
- */ var getManyCommand = {
+ */ var GET_MANY_COMMAND = {
     command: 'get-many <firstArg> [rest..]',
     describe: 'Read documents by key (auto-chunks beyond 50). Pass `-` to read keys from stdin.',
     builder: function builder(yargs) {
@@ -4605,34 +4660,38 @@ function _ts_generator$c(thisArg, body) {
     };
 }
 function mergeOutputCommandsConfig(existing, updates) {
-    if (!('commands' in updates)) {
-        return existing;
-    }
-    if (!updates.commands) {
-        return undefined;
-    }
-    var merged = _object_spread$9({}, existing);
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = Object.keys(updates.commands)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var key = _step.value;
-            merged[key] = _object_spread$9({}, existing === null || existing === void 0 ? void 0 : existing[key], updates.commands[key]);
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
+    var result;
+    if ('commands' in updates) {
+        if (updates.commands) {
+            var merged = _object_spread$9({}, existing);
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+            try {
+                for(var _iterator = Object.keys(updates.commands)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                    var key = _step.value;
+                    merged[key] = _object_spread$9({}, existing === null || existing === void 0 ? void 0 : existing[key], updates.commands[key]);
+                }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
             }
+            result = merged;
+        } else {
+            result = undefined;
         }
+    } else {
+        result = existing;
     }
-    return merged;
+    return result;
 }
 /**
  * Resolves output settings for a given command path.
@@ -4663,13 +4722,15 @@ function mergeOutputCommandsConfig(existing, updates) {
  * @param value - The string to mask. `null`/`undefined` are returned unchanged.
  * @returns The masked string (`***` when the input is 4 chars or shorter), or the input unchanged when nullish.
  */ function maskSecret(value) {
+    var result;
     if (value == null) {
-        return value;
-    }
-    if (value.length <= 4) {
-        return '***';
+        result = value;
+    } else if (value.length <= 4) {
+        result = '***';
+    } else {
+        result = value.substring(0, 4) + '***';
     }
-    return value.substring(0, 4) + '***';
+    return result;
 }
 
 /**
@@ -4767,8 +4828,6 @@ function nonEmpty(value) {
  * @param input.env - The base {@link CliEnvConfig} to overlay env-var values on top of.
  * @returns The merged {@link CliEnvConfig}, or `undefined` when both the stored env and every override are empty.
  */ function applyEnvVarOverrides(input) {
-    var _ref, _ref1;
-    var _input_env, _input_env1, _input_env2, _input_env3, _input_env4, _input_env5, _input_env6;
     var prefix = input.cliName.replaceAll('-', '_').toUpperCase();
     var apiBaseUrl = process.env["".concat(prefix, "_API_BASE_URL")];
     var oidcIssuer = process.env["".concat(prefix, "_OIDC_ISSUER")];
@@ -4778,18 +4837,22 @@ function nonEmpty(value) {
     var redirectUri = process.env["".concat(prefix, "_REDIRECT_URI")];
     var scopes = process.env["".concat(prefix, "_SCOPES")];
     var hasOverrides = apiBaseUrl || oidcIssuer || appClientUrl || clientId || clientSecret || redirectUri || scopes;
+    var result;
     if (!input.env && !hasOverrides) {
-        return undefined;
-    }
-    var result = {
-        apiBaseUrl: (_ref = apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : (_input_env = input.env) === null || _input_env === void 0 ? void 0 : _input_env.apiBaseUrl) !== null && _ref !== void 0 ? _ref : '',
-        oidcIssuer: (_ref1 = oidcIssuer !== null && oidcIssuer !== void 0 ? oidcIssuer : (_input_env1 = input.env) === null || _input_env1 === void 0 ? void 0 : _input_env1.oidcIssuer) !== null && _ref1 !== void 0 ? _ref1 : '',
-        appClientUrl: appClientUrl !== null && appClientUrl !== void 0 ? appClientUrl : (_input_env2 = input.env) === null || _input_env2 === void 0 ? void 0 : _input_env2.appClientUrl,
-        clientId: clientId !== null && clientId !== void 0 ? clientId : (_input_env3 = input.env) === null || _input_env3 === void 0 ? void 0 : _input_env3.clientId,
-        clientSecret: clientSecret !== null && clientSecret !== void 0 ? clientSecret : (_input_env4 = input.env) === null || _input_env4 === void 0 ? void 0 : _input_env4.clientSecret,
-        redirectUri: redirectUri !== null && redirectUri !== void 0 ? redirectUri : (_input_env5 = input.env) === null || _input_env5 === void 0 ? void 0 : _input_env5.redirectUri,
-        scopes: scopes !== null && scopes !== void 0 ? scopes : (_input_env6 = input.env) === null || _input_env6 === void 0 ? void 0 : _input_env6.scopes
-    };
+        result = undefined;
+    } else {
+        var _ref, _ref1;
+        var _input_env, _input_env1, _input_env2, _input_env3, _input_env4, _input_env5, _input_env6;
+        result = {
+            apiBaseUrl: (_ref = apiBaseUrl !== null && apiBaseUrl !== void 0 ? apiBaseUrl : (_input_env = input.env) === null || _input_env === void 0 ? void 0 : _input_env.apiBaseUrl) !== null && _ref !== void 0 ? _ref : '',
+            oidcIssuer: (_ref1 = oidcIssuer !== null && oidcIssuer !== void 0 ? oidcIssuer : (_input_env1 = input.env) === null || _input_env1 === void 0 ? void 0 : _input_env1.oidcIssuer) !== null && _ref1 !== void 0 ? _ref1 : '',
+            appClientUrl: appClientUrl !== null && appClientUrl !== void 0 ? appClientUrl : (_input_env2 = input.env) === null || _input_env2 === void 0 ? void 0 : _input_env2.appClientUrl,
+            clientId: clientId !== null && clientId !== void 0 ? clientId : (_input_env3 = input.env) === null || _input_env3 === void 0 ? void 0 : _input_env3.clientId,
+            clientSecret: clientSecret !== null && clientSecret !== void 0 ? clientSecret : (_input_env4 = input.env) === null || _input_env4 === void 0 ? void 0 : _input_env4.clientSecret,
+            redirectUri: redirectUri !== null && redirectUri !== void 0 ? redirectUri : (_input_env5 = input.env) === null || _input_env5 === void 0 ? void 0 : _input_env5.redirectUri,
+            scopes: scopes !== null && scopes !== void 0 ? scopes : (_input_env6 = input.env) === null || _input_env6 === void 0 ? void 0 : _input_env6.scopes
+        };
+    }
     return result;
 }
 /**
@@ -5825,6 +5888,8 @@ function _ts_generator$9(thisArg, body) {
  * @param input.state - The opaque OAuth state token used for CSRF protection.
  * @param input.codeChallenge - The PKCE code challenge derived from the verifier.
  * @returns The full authorization URL with all OAuth params merged in.
+ * @throws {CliError} When `requestedSessionTtlSeconds` is provided but is not a positive integer.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function buildAuthorizationUrl(input) {
     var _input_scopes;
@@ -5895,6 +5960,9 @@ function _ts_generator$9(thisArg, body) {
  *
  * Returns `undefined` when none is set or every candidate fails to parse; the caller should then
  * use the discovered endpoint unchanged.
+ *
+ * @param input - The candidate URLs in priority order.
+ * @returns The selected origin, or `undefined` when no candidate yields one.
  */ function resolveAuthorizationRebaseOrigin(input) {
     var result;
     if (input.appClientUrl) {
@@ -6031,6 +6099,7 @@ function parseUrlRedirect(trimmed, expectedState) {
  * @param input.pasted - The redirect URL or bare authorization code pasted by the user.
  * @param input.expectedState - Optional state value to assert against `state` when present in the URL.
  * @returns The {@link ParsedRedirect} containing `code` and (when present) `state`.
+ * @throws {CliError} When `pasted` is empty, when the URL contains no `code` parameter, or when `expectedState` does not match the URL's `state`.
  */ function parsePastedRedirect(input) {
     var trimmed = input.pasted.trim();
     if (!trimmed) {
@@ -6039,10 +6108,8 @@ function parseUrlRedirect(trimmed, expectedState) {
             code: 'AUTH_NO_CODE'
         });
     }
-    if (trimmed.startsWith('http://') || trimmed.startsWith('https://') || trimmed.startsWith('urn:')) {
-        return parseUrlRedirect(trimmed, input.expectedState);
-    }
-    return {
+    var isUrl = trimmed.startsWith('http://') || trimmed.startsWith('https://') || trimmed.startsWith('urn:');
+    return isUrl ? parseUrlRedirect(trimmed, input.expectedState) : {
         code: trimmed
     };
 }
@@ -6071,80 +6138,83 @@ var KEY_DEL = ''; // DEL
  * @param input.mask - When `true`, characters are echoed as `*` and Ctrl-C cancels the prompt.
  * @returns The line entered by the user (without the trailing newline).
  */ function promptLine(input) {
-    if (!input.mask) {
-        var rl = node_readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: false
-        });
-        return new Promise(function(resolve) {
-            rl.question(input.question, function(answer) {
-                rl.close();
-                resolve(answer);
-            });
-        });
-    }
-    return new Promise(function(resolve, reject) {
-        var _process_stdin_setRawMode, _process_stdin;
-        var stdout = process.stdout;
-        stdout.write(input.question);
-        var buffer = '';
-        var onData = function onData1(chunk) {
-            var value = chunk.toString('utf8');
-            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-            try {
-                for(var _iterator = value[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                    var char = _step.value;
-                    if (char === '\n' || char === '\r' || char === KEY_EOT) {
-                        var _process_stdin_setRawMode, _process_stdin;
-                        stdout.write('\n');
-                        process.stdin.removeListener('data', onData);
-                        (_process_stdin_setRawMode = (_process_stdin = process.stdin).setRawMode) === null || _process_stdin_setRawMode === void 0 ? void 0 : _process_stdin_setRawMode.call(_process_stdin, false);
-                        process.stdin.pause();
-                        resolve(buffer);
-                        return;
-                    }
-                    if (char === KEY_ETX) {
-                        var _process_stdin_setRawMode1, _process_stdin1;
-                        stdout.write('\n');
-                        process.stdin.removeListener('data', onData);
-                        (_process_stdin_setRawMode1 = (_process_stdin1 = process.stdin).setRawMode) === null || _process_stdin_setRawMode1 === void 0 ? void 0 : _process_stdin_setRawMode1.call(_process_stdin1, false);
-                        process.stdin.pause();
-                        reject(new CliError({
-                            message: 'Prompt cancelled.',
-                            code: PROMPT_CANCELLED_ERROR_CODE
-                        }));
-                        return;
-                    }
-                    if (char === KEY_BS || char === KEY_DEL) {
-                        if (buffer.length > 0) {
-                            buffer = buffer.slice(0, -1);
-                            stdout.write('\b \b');
-                        }
-                        continue;
-                    }
-                    buffer += char;
-                    stdout.write('*');
-                }
-            } catch (err) {
-                _didIteratorError = true;
-                _iteratorError = err;
-            } finally{
+    var result;
+    if (input.mask) {
+        result = new Promise(function(resolve, reject) {
+            var _process_stdin_setRawMode, _process_stdin;
+            var stdout = process.stdout;
+            stdout.write(input.question);
+            var buffer = '';
+            var onData = function onData1(chunk) {
+                var value = chunk.toString('utf8');
+                var done = false;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                 try {
-                    if (!_iteratorNormalCompletion && _iterator.return != null) {
-                        _iterator.return();
+                    for(var _iterator = value[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var char = _step.value;
+                        if (done) break;
+                        if (char === '\n' || char === '\r' || char === KEY_EOT) {
+                            var _process_stdin_setRawMode, _process_stdin;
+                            stdout.write('\n');
+                            process.stdin.removeListener('data', onData);
+                            (_process_stdin_setRawMode = (_process_stdin = process.stdin).setRawMode) === null || _process_stdin_setRawMode === void 0 ? void 0 : _process_stdin_setRawMode.call(_process_stdin, false);
+                            process.stdin.pause();
+                            resolve(buffer);
+                            done = true;
+                        } else if (char === KEY_ETX) {
+                            var _process_stdin_setRawMode1, _process_stdin1;
+                            stdout.write('\n');
+                            process.stdin.removeListener('data', onData);
+                            (_process_stdin_setRawMode1 = (_process_stdin1 = process.stdin).setRawMode) === null || _process_stdin_setRawMode1 === void 0 ? void 0 : _process_stdin_setRawMode1.call(_process_stdin1, false);
+                            process.stdin.pause();
+                            reject(new CliError({
+                                message: 'Prompt cancelled.',
+                                code: PROMPT_CANCELLED_ERROR_CODE
+                            }));
+                            done = true;
+                        } else if (char === KEY_BS || char === KEY_DEL) {
+                            if (buffer.length > 0) {
+                                buffer = buffer.slice(0, -1);
+                                stdout.write('\b \b');
+                            }
+                        } else {
+                            buffer += char;
+                            stdout.write('*');
+                        }
                     }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
                 } finally{
-                    if (_didIteratorError) {
-                        throw _iteratorError;
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
                     }
                 }
-            }
-        };
-        (_process_stdin_setRawMode = (_process_stdin = process.stdin).setRawMode) === null || _process_stdin_setRawMode === void 0 ? void 0 : _process_stdin_setRawMode.call(_process_stdin, true);
-        process.stdin.resume();
-        process.stdin.on('data', onData);
-    });
+            };
+            (_process_stdin_setRawMode = (_process_stdin = process.stdin).setRawMode) === null || _process_stdin_setRawMode === void 0 ? void 0 : _process_stdin_setRawMode.call(_process_stdin, true);
+            process.stdin.resume();
+            process.stdin.on('data', onData);
+        });
+    } else {
+        var rl = node_readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+            terminal: false
+        });
+        result = new Promise(function(resolve) {
+            rl.question(input.question, function(answer) {
+                rl.close();
+                resolve(answer);
+            });
+        });
+    }
+    return result;
 }
 
 function asyncGeneratorStep$8(gen, resolve, reject, _next, _throw, key, arg) {
@@ -6322,6 +6392,53 @@ function _ts_generator$8(thisArg, body) {
         };
     }
 }
+function resolveAuthSetupPrompt(input) {
+    return _async_to_generator$8(function() {
+        var argvValue, existingValue, prompt, mask, result, answer;
+        return _ts_generator$8(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    argvValue = input.argvValue, existingValue = input.existingValue, prompt = input.prompt, mask = input.mask;
+                    if (!argvValue) return [
+                        3,
+                        1
+                    ];
+                    result = argvValue;
+                    return [
+                        3,
+                        4
+                    ];
+                case 1:
+                    if (!existingValue) return [
+                        3,
+                        2
+                    ];
+                    result = existingValue;
+                    return [
+                        3,
+                        4
+                    ];
+                case 2:
+                    return [
+                        4,
+                        promptLine({
+                            question: prompt,
+                            mask: mask
+                        })
+                    ];
+                case 3:
+                    answer = _state.sent().trim();
+                    result = answer.length > 0 ? answer : existingValue;
+                    _state.label = 4;
+                case 4:
+                    return [
+                        2,
+                        result
+                    ];
+            }
+        });
+    })();
+}
 /**
  * Factory for the built-in `auth` command tree.
  *
@@ -6380,38 +6497,6 @@ function _ts_generator$8(thisArg, body) {
         handler: wrapCommandHandler(function(argv) {
             return _async_to_generator$8(function() {
                 var _ref, _ref1, _argv_env, _ref2, _ref3, _argv_appClientUrl, _ref4, _ref5, _argv_scopes, _config_envs, _findCliEnvDefault, config, envName, stored, defaultEnv, existing, apiBaseUrl, oidcIssuer, appClientUrl, clientId, clientSecret, redirectUri, scopes, nextEnv, merged;
-                function resolve(promptInput) {
-                    return _async_to_generator$8(function() {
-                        var argvValue, existingValue, prompt, mask, answer;
-                        return _ts_generator$8(this, function(_state) {
-                            switch(_state.label){
-                                case 0:
-                                    argvValue = promptInput.argvValue, existingValue = promptInput.existingValue, prompt = promptInput.prompt, mask = promptInput.mask;
-                                    if (argvValue) return [
-                                        2,
-                                        argvValue
-                                    ];
-                                    if (existingValue) return [
-                                        2,
-                                        existingValue
-                                    ];
-                                    return [
-                                        4,
-                                        promptLine({
-                                            question: prompt,
-                                            mask: mask
-                                        })
-                                    ];
-                                case 1:
-                                    answer = _state.sent().trim();
-                                    return [
-                                        2,
-                                        answer.length > 0 ? answer : existingValue
-                                    ];
-                            }
-                        });
-                    })();
-                }
                 return _ts_generator$8(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -6441,7 +6526,7 @@ function _ts_generator$8(thisArg, body) {
                             });
                             return [
                                 4,
-                                resolve({
+                                resolveAuthSetupPrompt({
                                     argvValue: argv.apiBaseUrl,
                                     existingValue: existing === null || existing === void 0 ? void 0 : existing.apiBaseUrl,
                                     prompt: "API base URL [".concat((_ref2 = existing === null || existing === void 0 ? void 0 : existing.apiBaseUrl) !== null && _ref2 !== void 0 ? _ref2 : '', "]: ")
@@ -6451,7 +6536,7 @@ function _ts_generator$8(thisArg, body) {
                             apiBaseUrl = _state.sent();
                             return [
                                 4,
-                                resolve({
+                                resolveAuthSetupPrompt({
                                     argvValue: argv.oidcIssuer,
                                     existingValue: existing === null || existing === void 0 ? void 0 : existing.oidcIssuer,
                                     prompt: "OIDC issuer [".concat((_ref3 = existing === null || existing === void 0 ? void 0 : existing.oidcIssuer) !== null && _ref3 !== void 0 ? _ref3 : '', "]: ")
@@ -6462,7 +6547,7 @@ function _ts_generator$8(thisArg, body) {
                             appClientUrl = (_argv_appClientUrl = argv.appClientUrl) !== null && _argv_appClientUrl !== void 0 ? _argv_appClientUrl : existing === null || existing === void 0 ? void 0 : existing.appClientUrl;
                             return [
                                 4,
-                                resolve({
+                                resolveAuthSetupPrompt({
                                     argvValue: argv.clientId,
                                     existingValue: existing === null || existing === void 0 ? void 0 : existing.clientId,
                                     prompt: 'Client ID: '
@@ -6472,7 +6557,7 @@ function _ts_generator$8(thisArg, body) {
                             clientId = _state.sent();
                             return [
                                 4,
-                                resolve({
+                                resolveAuthSetupPrompt({
                                     argvValue: argv.clientSecret,
                                     existingValue: existing === null || existing === void 0 ? void 0 : existing.clientSecret,
                                     prompt: 'Client secret: ',
@@ -6483,7 +6568,7 @@ function _ts_generator$8(thisArg, body) {
                             clientSecret = _state.sent();
                             return [
                                 4,
-                                resolve({
+                                resolveAuthSetupPrompt({
                                     argvValue: argv.redirectUri,
                                     existingValue: existing === null || existing === void 0 ? void 0 : existing.redirectUri,
                                     prompt: "Redirect URI [".concat((_ref5 = existing === null || existing === void 0 ? void 0 : existing.redirectUri) !== null && _ref5 !== void 0 ? _ref5 : DEFAULT_CLI_REDIRECT_URI, "]: ")
@@ -6823,16 +6908,10 @@ function _ts_generator$8(thisArg, body) {
                             ];
                         case 2:
                             entry = _state.sent();
-                            if (!entry) {
-                                outputResult({
-                                    env: envName,
-                                    authenticated: false,
-                                    suggestion: "Run: ".concat(cliName, " auth login --env ").concat(envName)
-                                });
-                                return [
-                                    2
-                                ];
-                            }
+                            if (!entry) return [
+                                3,
+                                7
+                            ];
                             expired = isTokenExpired(entry);
                             return [
                                 4,
@@ -6844,18 +6923,10 @@ function _ts_generator$8(thisArg, body) {
                         case 3:
                             meta = _state.sent();
                             userinfoEndpoint = meta.userinfo_endpoint;
-                            if (!userinfoEndpoint) {
-                                outputResult({
-                                    env: envName,
-                                    authenticated: !expired,
-                                    expiresAt: entry.expiresAt,
-                                    expired: expired,
-                                    scope: entry.scope
-                                });
-                                return [
-                                    2
-                                ];
-                            }
+                            if (!userinfoEndpoint) return [
+                                3,
+                                5
+                            ];
                             return [
                                 4,
                                 fetchUserInfo({
@@ -6874,6 +6945,32 @@ function _ts_generator$8(thisArg, body) {
                                 sub: claims.sub,
                                 claims: claims
                             });
+                            return [
+                                3,
+                                6
+                            ];
+                        case 5:
+                            outputResult({
+                                env: envName,
+                                authenticated: !expired,
+                                expiresAt: entry.expiresAt,
+                                expired: expired,
+                                scope: entry.scope
+                            });
+                            _state.label = 6;
+                        case 6:
+                            return [
+                                3,
+                                8
+                            ];
+                        case 7:
+                            outputResult({
+                                env: envName,
+                                authenticated: false,
+                                suggestion: "Run: ".concat(cliName, " auth login --env ").concat(envName)
+                            });
+                            _state.label = 8;
+                        case 8:
                             return [
                                 2
                             ];
@@ -7260,20 +7357,14 @@ function _ts_generator$7(thisArg, body) {
         function(param) {
             var env = param.env;
             return _async_to_generator$7(function() {
-                var candidates, meta, e;
+                var result, candidates, meta, e;
                 return _ts_generator$7(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            if (!(env === null || env === void 0 ? void 0 : env.oidcIssuer)) {
-                                return [
-                                    2,
-                                    {
-                                        name: 'oidc-issuer-set',
-                                        ok: false,
-                                        suggestion: 'Set `oidcIssuer` via `<cli> auth setup`.'
-                                    }
-                                ];
-                            }
+                            if (!(env === null || env === void 0 ? void 0 : env.oidcIssuer)) return [
+                                3,
+                                5
+                            ];
                             candidates = buildOidcDiscoveryCandidates({
                                 issuer: env.oidcIssuer,
                                 fallbackBaseUrl: env.apiBaseUrl
@@ -7295,35 +7386,50 @@ function _ts_generator$7(thisArg, body) {
                             ];
                         case 2:
                             meta = _state.sent();
-                            return [
-                                2,
-                                {
-                                    name: 'oidc-discovery-reachable',
-                                    ok: true,
-                                    detail: {
-                                        candidates: candidates,
-                                        authorization_endpoint: meta.authorization_endpoint,
-                                        token_endpoint: meta.token_endpoint
-                                    }
+                            result = {
+                                name: 'oidc-discovery-reachable',
+                                ok: true,
+                                detail: {
+                                    candidates: candidates,
+                                    authorization_endpoint: meta.authorization_endpoint,
+                                    token_endpoint: meta.token_endpoint
                                 }
+                            };
+                            return [
+                                3,
+                                4
                             ];
                         case 3:
                             e = _state.sent();
+                            result = {
+                                name: 'oidc-discovery-reachable',
+                                ok: false,
+                                detail: {
+                                    candidates: candidates,
+                                    error: _instanceof$2(e, Error) ? e.message : String(e)
+                                },
+                                suggestion: 'Verify the env oidcIssuer URL and that the API is running.'
+                            };
                             return [
-                                2,
-                                {
-                                    name: 'oidc-discovery-reachable',
-                                    ok: false,
-                                    detail: {
-                                        candidates: candidates,
-                                        error: _instanceof$2(e, Error) ? e.message : String(e)
-                                    },
-                                    suggestion: 'Verify the env oidcIssuer URL and that the API is running.'
-                                }
+                                3,
+                                4
                             ];
                         case 4:
                             return [
-                                2
+                                3,
+                                6
+                            ];
+                        case 5:
+                            result = {
+                                name: 'oidc-issuer-set',
+                                ok: false,
+                                suggestion: 'Set `oidcIssuer` via `<cli> auth setup`.'
+                            };
+                            _state.label = 6;
+                        case 6:
+                            return [
+                                2,
+                                result
                             ];
                     }
                 });
@@ -7332,20 +7438,14 @@ function _ts_generator$7(thisArg, body) {
         function(param) {
             var cliName = param.cliName, envName = param.envName, env = param.env;
             return _async_to_generator$7(function() {
-                var paths, tokens, entry, expired;
+                var result, paths, tokens, entry, expired;
                 return _ts_generator$7(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            if (!envName || !env) {
-                                return [
-                                    2,
-                                    {
-                                        name: 'token-cache-fresh',
-                                        ok: false,
-                                        suggestion: 'No env to check.'
-                                    }
-                                ];
-                            }
+                            if (!(envName && env)) return [
+                                3,
+                                2
+                            ];
                             paths = buildCliPaths({
                                 cliName: cliName
                             });
@@ -7358,20 +7458,9 @@ function _ts_generator$7(thisArg, body) {
                             ];
                         case 1:
                             entry = _state.sent();
-                            if (!entry) {
-                                return [
-                                    2,
-                                    {
-                                        name: 'token-cache-fresh',
-                                        ok: false,
-                                        suggestion: "Run `".concat(cliName, " auth login --env ").concat(envName, "`.")
-                                    }
-                                ];
-                            }
-                            expired = isTokenExpired(entry);
-                            return [
-                                2,
-                                _object_spread$6({
+                            if (entry) {
+                                expired = isTokenExpired(entry);
+                                result = _object_spread$6({
                                     name: 'token-cache-fresh',
                                     ok: !expired,
                                     detail: {
@@ -7380,7 +7469,29 @@ function _ts_generator$7(thisArg, body) {
                                     }
                                 }, expired ? {
                                     suggestion: "Run `".concat(cliName, " auth check --env ").concat(envName, "` to refresh.")
-                                } : {})
+                                } : {});
+                            } else {
+                                result = {
+                                    name: 'token-cache-fresh',
+                                    ok: false,
+                                    suggestion: "Run `".concat(cliName, " auth login --env ").concat(envName, "`.")
+                                };
+                            }
+                            return [
+                                3,
+                                3
+                            ];
+                        case 2:
+                            result = {
+                                name: 'token-cache-fresh',
+                                ok: false,
+                                suggestion: 'No env to check.'
+                            };
+                            _state.label = 3;
+                        case 3:
+                            return [
+                                2,
+                                result
                             ];
                     }
                 });
@@ -7389,20 +7500,24 @@ function _ts_generator$7(thisArg, body) {
         function(param) {
             var cliName = param.cliName, envName = param.envName, env = param.env;
             return _async_to_generator$7(function() {
-                var paths, tokens, entry, meta, e;
+                var result, paths, tokens, entry, meta, e;
                 return _ts_generator$7(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            if (!envName || !(env === null || env === void 0 ? void 0 : env.clientId) || !(env === null || env === void 0 ? void 0 : env.clientSecret)) {
-                                return [
-                                    2,
-                                    {
-                                        name: 'token-refresh-round-trip',
-                                        ok: false,
-                                        suggestion: 'Env credentials are incomplete.'
-                                    }
-                                ];
-                            }
+                            if (!(!envName || !(env === null || env === void 0 ? void 0 : env.clientId) || !(env === null || env === void 0 ? void 0 : env.clientSecret))) return [
+                                3,
+                                1
+                            ];
+                            result = {
+                                name: 'token-refresh-round-trip',
+                                ok: false,
+                                suggestion: 'Env credentials are incomplete.'
+                            };
+                            return [
+                                3,
+                                9
+                            ];
+                        case 1:
                             paths = buildCliPaths({
                                 cliName: cliName
                             });
@@ -7413,28 +7528,19 @@ function _ts_generator$7(thisArg, body) {
                                 4,
                                 tokens.get(envName)
                             ];
-                        case 1:
-                            entry = _state.sent();
-                            if (!(entry === null || entry === void 0 ? void 0 : entry.refreshToken)) {
-                                return [
-                                    2,
-                                    {
-                                        name: 'token-refresh-round-trip',
-                                        ok: false,
-                                        detail: {
-                                            reason: 'no-refresh-token'
-                                        },
-                                        suggestion: 'No refresh token cached for env "'.concat(envName, '". Run `').concat(cliName, " auth login --env ").concat(envName, "` — if the env's scopes omit `offline_access`, the OIDC provider may not issue one.")
-                                    }
-                                ];
-                            }
-                            _state.label = 2;
                         case 2:
+                            entry = _state.sent();
+                            if (!(entry === null || entry === void 0 ? void 0 : entry.refreshToken)) return [
+                                3,
+                                8
+                            ];
+                            _state.label = 3;
+                        case 3:
                             _state.trys.push([
-                                2,
-                                5,
+                                3,
+                                6,
                                 ,
-                                6
+                                7
                             ]);
                             return [
                                 4,
@@ -7443,7 +7549,7 @@ function _ts_generator$7(thisArg, body) {
                                     fallbackBaseUrl: env.apiBaseUrl
                                 })
                             ];
-                        case 3:
+                        case 4:
                             meta = _state.sent();
                             return [
                                 4,
@@ -7454,31 +7560,49 @@ function _ts_generator$7(thisArg, body) {
                                     refreshToken: entry.refreshToken
                                 })
                             ];
-                        case 4:
+                        case 5:
                             _state.sent();
+                            result = {
+                                name: 'token-refresh-round-trip',
+                                ok: true
+                            };
                             return [
-                                2,
-                                {
-                                    name: 'token-refresh-round-trip',
-                                    ok: true
-                                }
+                                3,
+                                7
                             ];
-                        case 5:
+                        case 6:
                             e = _state.sent();
+                            result = {
+                                name: 'token-refresh-round-trip',
+                                ok: false,
+                                detail: {
+                                    error: _instanceof$2(e, Error) ? e.message : String(e)
+                                },
+                                suggestion: "Run `".concat(cliName, " auth login --env ").concat(envName, "`.")
+                            };
                             return [
-                                2,
-                                {
-                                    name: 'token-refresh-round-trip',
-                                    ok: false,
-                                    detail: {
-                                        error: _instanceof$2(e, Error) ? e.message : String(e)
-                                    },
-                                    suggestion: "Run `".concat(cliName, " auth login --env ").concat(envName, "`.")
-                                }
+                                3,
+                                7
                             ];
-                        case 6:
+                        case 7:
                             return [
-                                2
+                                3,
+                                9
+                            ];
+                        case 8:
+                            result = {
+                                name: 'token-refresh-round-trip',
+                                ok: false,
+                                detail: {
+                                    reason: 'no-refresh-token'
+                                },
+                                suggestion: 'No refresh token cached for env "'.concat(envName, '". Run `').concat(cliName, " auth login --env ").concat(envName, "` — if the env's scopes omit `offline_access`, the OIDC provider may not issue one.")
+                            };
+                            _state.label = 9;
+                        case 9:
+                            return [
+                                2,
+                                result
                             ];
                     }
                 });
@@ -7487,20 +7611,14 @@ function _ts_generator$7(thisArg, body) {
         function(param) {
             var env = param.env;
             return _async_to_generator$7(function() {
-                var url, res, e;
+                var result, url, res, e;
                 return _ts_generator$7(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            if (!(env === null || env === void 0 ? void 0 : env.apiBaseUrl)) {
-                                return [
-                                    2,
-                                    {
-                                        name: 'api-base-url-reachable',
-                                        ok: false,
-                                        suggestion: 'Set `apiBaseUrl` via `<cli> auth setup`.'
-                                    }
-                                ];
-                            }
+                            if (!(env === null || env === void 0 ? void 0 : env.apiBaseUrl)) return [
+                                3,
+                                5
+                            ];
                             url = "".concat(env.apiBaseUrl.replace(/\/+$/, '')).concat(CALL_MODEL_API_PATH);
                             _state.label = 1;
                         case 1:
@@ -7518,34 +7636,49 @@ function _ts_generator$7(thisArg, body) {
                             ];
                         case 2:
                             res = _state.sent();
-                            return [
-                                2,
-                                {
-                                    name: 'api-base-url-reachable',
-                                    ok: res.status < 500,
-                                    detail: {
-                                        url: url,
-                                        status: res.status
-                                    }
+                            result = {
+                                name: 'api-base-url-reachable',
+                                ok: res.status < 500,
+                                detail: {
+                                    url: url,
+                                    status: res.status
                                 }
+                            };
+                            return [
+                                3,
+                                4
                             ];
                         case 3:
                             e = _state.sent();
+                            result = {
+                                name: 'api-base-url-reachable',
+                                ok: false,
+                                detail: {
+                                    url: url,
+                                    error: _instanceof$2(e, Error) ? e.message : String(e)
+                                },
+                                suggestion: 'Verify the API is running at apiBaseUrl.'
+                            };
                             return [
-                                2,
-                                {
-                                    name: 'api-base-url-reachable',
-                                    ok: false,
-                                    detail: {
-                                        url: url,
-                                        error: _instanceof$2(e, Error) ? e.message : String(e)
-                                    },
-                                    suggestion: 'Verify the API is running at apiBaseUrl.'
-                                }
+                                3,
+                                4
                             ];
                         case 4:
                             return [
-                                2
+                                3,
+                                6
+                            ];
+                        case 5:
+                            result = {
+                                name: 'api-base-url-reachable',
+                                ok: false,
+                                suggestion: 'Set `apiBaseUrl` via `<cli> auth setup`.'
+                            };
+                            _state.label = 6;
+                        case 6:
+                            return [
+                                2,
+                                result
                             ];
                     }
                 });
@@ -8328,9 +8461,10 @@ function _unsupported_iterable_to_array$2(o, minLen) {
  * Re-exports {@link findCliModelManifestEntry} under a more descriptive name
  * for the model-info command.
  *
- * @param manifest - the generated model manifest.
- * @param query - identifier to look up.
- * @returns the matching entry or `undefined`.
+ * @param manifest - The generated model manifest.
+ * @param query - Identifier to look up.
+ * @returns The matching entry or `undefined`.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function resolveCliModel(manifest, query) {
     return findCliModelManifestEntry(query, manifest);
@@ -8338,41 +8472,46 @@ function _unsupported_iterable_to_array$2(o, minLen) {
 /**
  * Produces a column-aligned summary table of every model in the manifest.
  *
- * @param manifest - the generated model manifest.
- * @returns the formatted table as a single string with a trailing newline.
+ * @param manifest - The generated model manifest.
+ * @returns The formatted table as a single string with a trailing newline.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function renderModelManifestList(manifest) {
+    var result;
     if (manifest.length === 0) {
-        return 'No models found in the generated manifest.\n';
-    }
-    var rows = [
-        [
-            'MODEL',
-            'PREFIX',
-            'GROUP',
-            'FIELDS',
-            'PACKAGE',
-            'IDENTITY'
-        ]
-    ].concat(_to_consumable_array$2(manifest.map(function(m) {
-        var _m_modelGroup;
-        return [
-            m.modelType,
-            m.collectionPrefix,
-            (_m_modelGroup = m.modelGroup) !== null && _m_modelGroup !== void 0 ? _m_modelGroup : '',
-            String(m.fields.length),
-            m.sourcePackage,
-            m.identityConst
-        ];
-    })));
-    return renderTable(rows);
+        result = 'No models found in the generated manifest.\n';
+    } else {
+        var rows = [
+            [
+                'MODEL',
+                'PREFIX',
+                'GROUP',
+                'FIELDS',
+                'PACKAGE',
+                'IDENTITY'
+            ]
+        ].concat(_to_consumable_array$2(manifest.map(function(m) {
+            var _m_modelGroup;
+            return [
+                m.modelType,
+                m.collectionPrefix,
+                (_m_modelGroup = m.modelGroup) !== null && _m_modelGroup !== void 0 ? _m_modelGroup : '',
+                String(m.fields.length),
+                m.sourcePackage,
+                m.identityConst
+            ];
+        })));
+        result = renderTable(rows);
+    }
+    return result;
 }
 /**
  * Produces a human-readable summary of one model entry: header, description,
  * and an indented field tree (recursing into `nestedFields`).
  *
- * @param entry - the manifest entry to render.
- * @returns the formatted summary as a single string with a trailing newline.
+ * @param entry - The manifest entry to render.
+ * @returns The formatted summary as a single string with a trailing newline.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function renderModelManifestEntry(entry) {
     var groupSuffix = entry.modelGroup ? " \xb7 group ".concat(entry.modelGroup) : '';
@@ -8393,8 +8532,9 @@ function _unsupported_iterable_to_array$2(o, minLen) {
  * Produces the field-table portion of {@link renderModelManifestEntry} on its
  * own, used by the `--fields` flag of the `model-info` command.
  *
- * @param entry - the manifest entry whose fields should be rendered.
- * @returns the formatted field tree as a single string with a trailing newline.
+ * @param entry - The manifest entry whose fields should be rendered.
+ * @returns The formatted field tree as a single string with a trailing newline.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function renderModelManifestFields(entry) {
     return renderFieldsTree(entry.fields, 0) + '\n';
@@ -8445,58 +8585,72 @@ function buildFieldRow(field, includeConverter) {
 }
 function renderNestedFieldBlock(field, indent) {
     var nested = field.nestedFields;
-    if (!nested || nested.length === 0) return [];
-    var label = field.nestedIsArray ? 'array element' : 'sub-object';
-    var plural = nested.length === 1 ? '' : 's';
-    return [
-        indentLines$1("↳ ".concat(field.name, " (").concat(label, ", ").concat(nested.length, " field").concat(plural, ")"), indent + 2),
-        renderFieldsTree(nested, indent + 4)
-    ];
+    var result;
+    if (!nested || nested.length === 0) {
+        result = [];
+    } else {
+        var label = field.nestedIsArray ? 'array element' : 'sub-object';
+        var plural = nested.length === 1 ? '' : 's';
+        result = [
+            indentLines$1("↳ ".concat(field.name, " (").concat(label, ", ").concat(nested.length, " field").concat(plural, ")"), indent + 2),
+            renderFieldsTree(nested, indent + 4)
+        ];
+    }
+    return result;
 }
 function renderTable(rows) {
-    if (rows.length === 0) return '';
-    var widths = [];
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = rows[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var row = _step.value;
-            row.forEach(function(cell, i) {
-                var _widths_i;
-                var cellWidth = cell.length;
-                widths[i] = Math.max((_widths_i = widths[i]) !== null && _widths_i !== void 0 ? _widths_i : 0, cellWidth);
-            });
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
+    var result;
+    if (rows.length === 0) {
+        result = '';
+    } else {
+        var widths = [];
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
+            for(var _iterator = rows[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var row = _step.value;
+                row.forEach(function(cell, i) {
+                    var _widths_i;
+                    var cellWidth = cell.length;
+                    widths[i] = Math.max((_widths_i = widths[i]) !== null && _widths_i !== void 0 ? _widths_i : 0, cellWidth);
+                });
             }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
         } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
         }
+        result = rows.map(function(row) {
+            return row.map(function(cell, i) {
+                var _widths_i;
+                return i === row.length - 1 ? cell : cell.padEnd((_widths_i = widths[i]) !== null && _widths_i !== void 0 ? _widths_i : 0);
+            }).join('  ').replace(/\s+$/, '');
+        }).join('\n');
     }
-    return rows.map(function(row) {
-        return row.map(function(cell, i) {
-            var _widths_i;
-            return i === row.length - 1 ? cell : cell.padEnd((_widths_i = widths[i]) !== null && _widths_i !== void 0 ? _widths_i : 0);
-        }).join('  ').replace(/\s+$/, '');
-    }).join('\n');
+    return result;
 }
 function truncate(text, max) {
-    if (text.length <= max) return text;
-    return text.slice(0, max - 1) + '…';
+    return text.length <= max ? text : text.slice(0, max - 1) + '…';
 }
 function indentLines$1(text, indent) {
-    if (indent <= 0) return text;
-    var pad = ' '.repeat(indent);
-    return text.split('\n').map(function(line) {
-        return line.length > 0 ? pad + line : line;
-    }).join('\n');
+    var result;
+    if (indent <= 0) {
+        result = text;
+    } else {
+        var pad = ' '.repeat(indent);
+        result = text.split('\n').map(function(line) {
+            return line.length > 0 ? pad + line : line;
+        }).join('\n');
+    }
+    return result;
 }
 
 /**
@@ -8548,30 +8702,26 @@ function indentLines$1(text, indent) {
 }
 function runHandler(manifest, argv) {
     var query = typeof argv.model === 'string' && argv.model.length > 0 ? argv.model : undefined;
-    if (!query) {
+    if (query) {
+        var entry = resolveCliModel(manifest, query);
+        if (!entry) {
+            throw new CliError({
+                message: "No model matches '".concat(query, "'. Run `model-info` without an argument to list available models."),
+                code: 'MODEL_INFO_NOT_FOUND'
+            });
+        }
         if (argv.json) {
-            outputResult(manifest);
-            return;
+            outputResult(entry);
+        } else if (argv.fields) {
+            process.stdout.write(renderModelManifestFields(entry));
+        } else {
+            process.stdout.write(renderModelManifestEntry(entry));
         }
+    } else if (argv.json) {
+        outputResult(manifest);
+    } else {
         process.stdout.write(renderModelManifestList(manifest));
-        return;
-    }
-    var entry = resolveCliModel(manifest, query);
-    if (!entry) {
-        throw new CliError({
-            message: "No model matches '".concat(query, "'. Run `model-info` without an argument to list available models."),
-            code: 'MODEL_INFO_NOT_FOUND'
-        });
-    }
-    if (argv.json) {
-        outputResult(entry);
-        return;
-    }
-    if (argv.fields) {
-        process.stdout.write(renderModelManifestFields(entry));
-        return;
     }
-    process.stdout.write(renderModelManifestEntry(entry));
 }
 
 function asyncGeneratorStep$5(gen, resolve, reject, _next, _throw, key, arg) {
@@ -8895,11 +9045,12 @@ function _ts_generator$5(thisArg, body) {
  * Test-only middleware that skips OIDC discovery, disk token loading, and token refresh, attaching
  * a pre-built {@link CliContext} directly via {@link setCliContext}.
  *
- * @internal Intended for use by `@dereekb/dbx-cli/test`. Not for production wiring.
- *
  * @param input - The pre-built context to attach on every invocation.
  * @param input.cliContext - The {@link CliContext} that will be attached via {@link setCliContext}.
  * @returns A yargs middleware function that always sets the provided context.
+ *
+ * @internal Intended for use by `@dereekb/dbx-cli/test`. Not for production wiring.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function createPassthroughAuthMiddleware(input) {
     return function() {
@@ -9864,10 +10015,10 @@ function _ts_generator$2(thisArg, body) {
     }
     var allConfigCommands = _to_consumable_array$1(builtInConfigCommands).concat(_to_consumable_array$1((_input_configCommands = input.configCommands) !== null && _input_configCommands !== void 0 ? _input_configCommands : []));
     var builtInApiCommands = input.disableCallPassthrough ? [] : [
-        callPassthroughCommand
+        CALL_PASSTHROUGH_COMMAND
     ];
     if (input.disableModelGet !== true) {
-        builtInApiCommands.push(getCommand, getManyCommand);
+        builtInApiCommands.push(GET_COMMAND, GET_MANY_COMMAND);
     }
     var actionCommands = buildActionCommands((_input_actionCommands = input.actionCommands) !== null && _input_actionCommands !== void 0 ? _input_actionCommands : []);
     var allApiCommands = _to_consumable_array$1(builtInApiCommands).concat(_to_consumable_array$1((_input_apiCommands = input.apiCommands) !== null && _input_apiCommands !== void 0 ? _input_apiCommands : []), _to_consumable_array$1(actionCommands));
@@ -9941,10 +10092,10 @@ function _ts_generator$2(thisArg, body) {
             skipCommands: skipCommandNames
         })
     ], true).command(allConfigCommands).command(allApiCommands).demandCommand(1, 'Please specify a command. Use --help for available commands.').strict().fail(false).help().alias('help', 'h').wrap(Math.min(120, process.stdout.columns || 80));
-    if (input.version != null) {
-        parser = parser.version(input.version);
-    } else {
+    if (input.version == null) {
         parser = parser.version(false);
+    } else {
+        parser = parser.version(input.version);
     }
     if (input.completionCommandName !== false) {
         var _input_completionCommandName;
@@ -9998,13 +10149,15 @@ function _ts_generator$2(thisArg, body) {
 }
 function commandName(cmd) {
     var raw = cmd.command;
+    var result;
     if (typeof raw === 'string') {
-        return raw.split(' ')[0];
-    }
-    if (Array.isArray(raw) && raw.length > 0) {
-        return raw[0].split(' ')[0];
+        result = raw.split(' ')[0];
+    } else if (Array.isArray(raw) && raw.length > 0) {
+        result = raw[0].split(' ')[0];
+    } else {
+        result = '';
     }
-    return '';
+    return result;
 }
 
 function _array_like_to_array(arr, len) {
@@ -10298,7 +10451,6 @@ var DATA_HELP_FLAG = '--data-help';
  *   when the manifest has no callable entries.
  * @__NO_SIDE_EFFECTS__
  */ function buildManifestCommands(manifest, options) {
-    var _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
     var callable = manifest.filter(function(e) {
         return !SKIPPED_VERBS.has(e.verb);
     });
@@ -10330,64 +10482,68 @@ var DATA_HELP_FLAG = '--data-help';
             }
         }
     }
+    var result;
     if (byModel.size === 0) {
-        return [];
-    }
-    var argv = (_ref = options === null || options === void 0 ? void 0 : options.argv) !== null && _ref !== void 0 ? _ref : process.argv;
-    var dataHelpFormat = (_ref1 = options === null || options === void 0 ? void 0 : options.dataHelpFormat) !== null && _ref1 !== void 0 ? _ref1 : detectDataHelpFormat(argv);
-    var helpMode = (_ref2 = options === null || options === void 0 ? void 0 : options.helpMode) !== null && _ref2 !== void 0 ? _ref2 : detectHelpMode(argv);
-    var focusHelp = ((_ref3 = options === null || options === void 0 ? void 0 : options.focusHelpOnDataHelp) !== null && _ref3 !== void 0 ? _ref3 : true) && hasDataHelpFlag(argv) && !hasAllHelpFlag(argv);
-    var hideOnFocus = focusHelp ? (_ref4 = options === null || options === void 0 ? void 0 : options.hiddenWhenFocused) !== null && _ref4 !== void 0 ? _ref4 : STANDARD_GLOBAL_OPTION_NAMES : [];
-    var modelCommandName = (_ref5 = options === null || options === void 0 ? void 0 : options.modelCommandName) !== null && _ref5 !== void 0 ? _ref5 : DEFAULT_MANIFEST_MODEL_COMMAND_NAME;
-    var sortedModels = _to_consumable_array(byModel.entries()).sort(function(param, param1) {
-        var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
-        return a.localeCompare(b);
-    });
-    var context = {
-        dataHelpFormat: dataHelpFormat,
-        helpMode: helpMode,
-        hideOnFocus: hideOnFocus,
-        modelManifest: options === null || options === void 0 ? void 0 : options.modelManifest
-    };
-    return [
-        {
-            command: "".concat(modelCommandName, " <model>"),
-            describe: "Call typed model APIs (".concat(byModel.size, " model").concat(byModel.size === 1 ? '' : 's', "). Use `").concat(modelCommandName, " --help` to list them."),
-            builder: function builder(yargs) {
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = sortedModels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var _step_value = _sliced_to_array(_step.value, 2), model = _step_value[0], entries = _step_value[1];
-                        yargs.command(buildModelCommand(model, entries, context));
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
+        result = [];
+    } else {
+        var _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
+        var argv = (_ref = options === null || options === void 0 ? void 0 : options.argv) !== null && _ref !== void 0 ? _ref : process.argv;
+        var dataHelpFormat = (_ref1 = options === null || options === void 0 ? void 0 : options.dataHelpFormat) !== null && _ref1 !== void 0 ? _ref1 : detectDataHelpFormat(argv);
+        var helpMode = (_ref2 = options === null || options === void 0 ? void 0 : options.helpMode) !== null && _ref2 !== void 0 ? _ref2 : detectHelpMode(argv);
+        var focusHelp = ((_ref3 = options === null || options === void 0 ? void 0 : options.focusHelpOnDataHelp) !== null && _ref3 !== void 0 ? _ref3 : true) && hasDataHelpFlag(argv) && !hasAllHelpFlag(argv);
+        var hideOnFocus = focusHelp ? (_ref4 = options === null || options === void 0 ? void 0 : options.hiddenWhenFocused) !== null && _ref4 !== void 0 ? _ref4 : STANDARD_GLOBAL_OPTION_NAMES : [];
+        var modelCommandName = (_ref5 = options === null || options === void 0 ? void 0 : options.modelCommandName) !== null && _ref5 !== void 0 ? _ref5 : DEFAULT_MANIFEST_MODEL_COMMAND_NAME;
+        var sortedModels = _to_consumable_array(byModel.entries()).sort(function(param, param1) {
+            var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
+            return a.localeCompare(b);
+        });
+        var context = {
+            dataHelpFormat: dataHelpFormat,
+            helpMode: helpMode,
+            hideOnFocus: hideOnFocus,
+            modelManifest: options === null || options === void 0 ? void 0 : options.modelManifest
+        };
+        result = [
+            {
+                command: "".concat(modelCommandName, " <model>"),
+                describe: "Call typed model APIs (".concat(byModel.size, " model").concat(byModel.size === 1 ? '' : 's', "). Use `").concat(modelCommandName, " --help` to list them."),
+                builder: function builder(yargs) {
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                     try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
+                        for(var _iterator = sortedModels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var _step_value = _sliced_to_array(_step.value, 2), model = _step_value[0], entries = _step_value[1];
+                            yargs.command(buildModelCommand(model, entries, context));
                         }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
                     } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
                         }
                     }
+                    hideGlobalOptions(yargs, hideOnFocus);
+                    return yargs.demandCommand(1, 'Please specify a model.');
+                },
+                handler: function handler() {
+                    return undefined;
                 }
-                hideGlobalOptions(yargs, hideOnFocus);
-                return yargs.demandCommand(1, 'Please specify a model.');
-            },
-            handler: function handler() {
-                return undefined;
             }
-        }
-    ];
+        ];
+    }
+    return result;
 }
 /**
  * Returns true if `--data-help` (with or without a value) appears anywhere in
  * the supplied argv. Used to opt into focused help mode.
  *
- * @param argv - argv to scan (defaults to `process.argv`).
+ * @param argv - Argv to scan (defaults to `process.argv`).
  * @returns Whether the user passed `--data-help`.
  */ function hasDataHelpFlag() {
     var argv = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.argv;
@@ -10400,7 +10556,7 @@ var DATA_HELP_FLAG = '--data-help';
  * as an explicit opt-out of focused help mode — `--data-help --all-help`
  * shows the schema sections AND the full options table.
  *
- * @param argv - argv to scan (defaults to `process.argv`).
+ * @param argv - Argv to scan (defaults to `process.argv`).
  * @returns Whether the user passed `--all-help`.
  */ function hasAllHelpFlag() {
     var argv = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.argv;
@@ -10416,7 +10572,7 @@ var DATA_HELP_FLAG = '--data-help';
  * value is needed when each command's builder runs — which is before yargs
  * parses argv. Unrecognized values fall back to the default.
  *
- * @param argv - argv to inspect (defaults to `process.argv`).
+ * @param argv - Argv to inspect (defaults to `process.argv`).
  * @returns The detected format, or {@link DEFAULT_MANIFEST_HELP_DATA_FORMAT}.
  */ function detectDataHelpFormat() {
     var argv = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.argv;
@@ -10448,7 +10604,7 @@ function parseDataHelpFormat(value) {
  * value is needed when each command's builder runs — which is before yargs
  * parses argv.
  *
- * @param argv - argv to inspect (defaults to `process.argv`).
+ * @param argv - Argv to inspect (defaults to `process.argv`).
  * @returns The detected mode, or {@link DEFAULT_MANIFEST_HELP_MODE}.
  */ function detectHelpMode() {
     var argv = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.argv;
@@ -10525,6 +10681,8 @@ function buildModelCommand(model, entries, context) {
  * @param manifest - The generated model manifest used to look up the model's `collectionPrefix`
  *   and `parentIdentityConst`. When omitted, the key passes through unchanged.
  * @returns The resolved Firestore model key ready for `context.getModel(model, key)`.
+ * @throws {CliError} When `model` resolves to a subcollection entry and only a bare doc id is supplied.
+ *
  * @__NO_SIDE_EFFECTS__
  */ function resolvePerModelGetKey(model, key, manifest) {
     var result = key;
@@ -10643,7 +10801,7 @@ function buildEntryCommand(entry, context) {
         },
         handler: wrapCommandHandler(function(argv) {
             return _async_to_generator$1(function() {
-                var rawData, _tmp, _tmp1;
+                var rawData, _tmp;
                 return _ts_generator$1(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -10660,25 +10818,18 @@ function buildEntryCommand(entry, context) {
                                 readAllStdin()
                             ];
                         case 1:
-                            _tmp1 = _state.sent().trim();
+                            _tmp = _state.sent().trim();
                             return [
                                 3,
                                 3
                             ];
                         case 2:
-                            _tmp1 = argv.data;
+                            _tmp = argv.data;
                             _state.label = 3;
                         case 3:
-                            _tmp = _tmp1;
-                            return [
-                                3,
-                                5
-                            ];
-                        case 4:
-                            _tmp = undefined;
-                            _state.label = 5;
-                        case 5:
                             rawData = _tmp;
+                            _state.label = 4;
+                        case 4:
                             return [
                                 4,
                                 callEntry(entry, rawData, {
@@ -10686,7 +10837,7 @@ function buildEntryCommand(entry, context) {
                                     modelManifest: context.modelManifest
                                 })
                             ];
-                        case 6:
+                        case 5:
                             _state.sent();
                             return [
                                 2
@@ -10698,10 +10849,15 @@ function buildEntryCommand(entry, context) {
     };
 }
 function oneLineDescription(description) {
-    var _description_split_;
-    if (!description) return undefined;
-    var firstLine = (_description_split_ = description.split('\n', 1)[0]) === null || _description_split_ === void 0 ? void 0 : _description_split_.trim();
-    return firstLine && firstLine.length > 0 ? firstLine : undefined;
+    var result;
+    if (description) {
+        var _description_split_;
+        var firstLine = (_description_split_ = description.split('\n', 1)[0]) === null || _description_split_ === void 0 ? void 0 : _description_split_.trim();
+        if (firstLine && firstLine.length > 0) {
+            result = firstLine;
+        }
+    }
+    return result;
 }
 function hideGlobalOptions(yargs, names) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -10775,88 +10931,89 @@ function hideGlobalOptions(yargs, names) {
     return sections.length > 0 ? sections.join('\n\n') : undefined;
 }
 function buildActionSection(entry) {
-    if (!entry.description) return undefined;
-    return "About:\n".concat(indentLines(entry.description, '  '));
+    return entry.description ? "About:\n".concat(indentLines(entry.description, '  ')) : undefined;
 }
 function buildParamsSection(entry) {
-    if (!entry.paramsTypeName && !entry.paramsTypeDescription && !(entry.paramsFields && entry.paramsFields.length > 0)) {
-        return undefined;
-    }
-    var lines = [];
-    if (entry.paramsTypeName) {
-        lines.push("Params: ".concat(entry.paramsTypeName));
-    }
-    if (entry.paramsTypeDescription) {
-        lines.push(indentLines(entry.paramsTypeDescription, '  '));
-    }
-    if (entry.paramsFields && entry.paramsFields.length > 0) {
-        lines.push('', 'Fields:');
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for(var _iterator = entry.paramsFields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var field = _step.value;
-                var header = "  - ".concat(field.name, ": ").concat(field.typeText);
-                lines.push(header);
-                if (field.description) {
-                    lines.push(indentLines(field.description, '      '));
-                }
-            }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
+    var result;
+    if (entry.paramsTypeName || entry.paramsTypeDescription || entry.paramsFields && entry.paramsFields.length > 0) {
+        var lines = [];
+        if (entry.paramsTypeName) {
+            lines.push("Params: ".concat(entry.paramsTypeName));
+        }
+        if (entry.paramsTypeDescription) {
+            lines.push(indentLines(entry.paramsTypeDescription, '  '));
+        }
+        if (entry.paramsFields && entry.paramsFields.length > 0) {
+            lines.push('', 'Fields:');
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
             try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
+                for(var _iterator = entry.paramsFields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                    var field = _step.value;
+                    var header = "  - ".concat(field.name, ": ").concat(field.typeText);
+                    lines.push(header);
+                    if (field.description) {
+                        lines.push(indentLines(field.description, '      '));
+                    }
                 }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
             } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
                 }
             }
         }
+        result = lines.join('\n');
     }
-    return lines.join('\n');
+    return result;
 }
 function buildResultSection(entry) {
-    if (!entry.resultTypeDescription && !(entry.resultFields && entry.resultFields.length > 0)) {
-        return undefined;
-    }
-    var lines = [];
-    if (entry.resultTypeName) {
-        lines.push("Result: ".concat(entry.resultTypeName));
-    }
-    if (entry.resultTypeDescription) {
-        lines.push(indentLines(entry.resultTypeDescription, '  '));
-    }
-    if (entry.resultFields && entry.resultFields.length > 0) {
-        lines.push('', 'Fields:');
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for(var _iterator = entry.resultFields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var field = _step.value;
-                var header = "  - ".concat(field.name, ": ").concat(field.typeText);
-                lines.push(header);
-                if (field.description) {
-                    lines.push(indentLines(field.description, '      '));
-                }
-            }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
+    var result;
+    if (entry.resultTypeDescription || entry.resultFields && entry.resultFields.length > 0) {
+        var lines = [];
+        if (entry.resultTypeName) {
+            lines.push("Result: ".concat(entry.resultTypeName));
+        }
+        if (entry.resultTypeDescription) {
+            lines.push(indentLines(entry.resultTypeDescription, '  '));
+        }
+        if (entry.resultFields && entry.resultFields.length > 0) {
+            lines.push('', 'Fields:');
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
             try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
+                for(var _iterator = entry.resultFields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                    var field = _step.value;
+                    var header = "  - ".concat(field.name, ": ").concat(field.typeText);
+                    lines.push(header);
+                    if (field.description) {
+                        lines.push(indentLines(field.description, '      '));
+                    }
                 }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
             } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
                 }
             }
         }
+        result = lines.join('\n');
     }
-    return lines.join('\n');
+    return result;
 }
 function indentLines(text, indent) {
     return text.split('\n').map(function(line) {
@@ -10865,75 +11022,73 @@ function indentLines(text, indent) {
 }
 function renderParamsSchemaSections(entry, dataHelpFormat) {
     var sections = [];
-    if (!entry.paramsValidator) {
-        return sections;
-    }
-    if (dataHelpFormat === 'jsonschema' || dataHelpFormat === 'both') {
-        var jsonSchemaSection = renderJsonSchemaSection(entry);
-        if (jsonSchemaSection) {
-            sections.push(jsonSchemaSection);
+    if (entry.paramsValidator) {
+        if (dataHelpFormat === 'jsonschema' || dataHelpFormat === 'both') {
+            var jsonSchemaSection = renderJsonSchemaSection(entry);
+            if (jsonSchemaSection) {
+                sections.push(jsonSchemaSection);
+            }
         }
-    }
-    if (dataHelpFormat === 'arktype' || dataHelpFormat === 'both') {
-        var arktypeSection = renderArktypeExpressionSection(entry);
-        if (arktypeSection) {
-            sections.push(arktypeSection);
+        if (dataHelpFormat === 'arktype' || dataHelpFormat === 'both') {
+            var arktypeSection = renderArktypeExpressionSection(entry);
+            if (arktypeSection) {
+                sections.push(arktypeSection);
+            }
         }
-    }
-    if (sections.length === 0) {
-        // Last-ditch fallback when the requested format produced nothing usable
-        // (e.g. arktype was requested but the bound validator has no expression).
-        var expression = readArktypeExpression(entry);
-        if (expression) {
-            sections.push("Params Schema (arktype): ".concat(expression));
+        if (sections.length === 0) {
+            // Last-ditch fallback when the requested format produced nothing usable
+            // (e.g. arktype was requested but the bound validator has no expression).
+            var expression = readArktypeExpression(entry);
+            if (expression) {
+                sections.push("Params Schema (arktype): ".concat(expression));
+            }
         }
     }
     return sections;
 }
 function renderJsonSchemaSection(entry) {
-    if (!entry.paramsValidator) {
-        return undefined;
-    }
     var result;
-    try {
-        // arktype's default `toJsonSchema` throws on any sub-schema that has no
-        // JSON Schema equivalent (custom predicates, morphs, `undefined`/symbol/
-        // bigint units or domains, etc.). Provide targeted fallbacks so help
-        // output stays useful:
-        //   - `predicate` / `morph`: drop the lossy part, keep the JSON-shaped
-        //     base — e.g. `string > 0 & narrow(isFirestoreModelKey)` becomes
-        //     `{ type: 'string', minLength: 1 }`.
-        //   - everything else (e.g. the `undefined` unit in `clearable(T)`):
-        //     return `false` (matches nothing). It's a no-op inside `anyOf`, and
-        //     we strip it below so `T | null | undefined` reads as `T | null`.
-        var raw = entry.paramsValidator.toJsonSchema({
-            fallback: {
-                predicate: function predicate(ctx) {
-                    return ctx.base;
-                },
-                morph: function morph(ctx) {
-                    return ctx.base;
-                },
-                // `false` is a valid JSON Schema value ("matches nothing"), but
-                // arktype's TS types reject `false` for the fallback return — cast
-                // through `unknown` to keep the runtime behavior we want.
-                default: function _default() {
-                    return false;
+    if (entry.paramsValidator) {
+        try {
+            // arktype's default `toJsonSchema` throws on any sub-schema that has no
+            // JSON Schema equivalent (custom predicates, morphs, `undefined`/symbol/
+            // bigint units or domains, etc.). Provide targeted fallbacks so help
+            // output stays useful:
+            //   - `predicate` / `morph`: drop the lossy part, keep the JSON-shaped
+            //     base — e.g. `string > 0 & narrow(isFirestoreModelKey)` becomes
+            //     `{ type: 'string', minLength: 1 }`.
+            //   - everything else (e.g. the `undefined` unit in `clearable(T)`):
+            //     return `false` (matches nothing). It's a no-op inside `anyOf`, and
+            //     we strip it below so `T | null | undefined` reads as `T | null`.
+            var raw = entry.paramsValidator.toJsonSchema({
+                fallback: {
+                    predicate: function predicate(ctx) {
+                        return ctx.base;
+                    },
+                    morph: function morph(ctx) {
+                        return ctx.base;
+                    },
+                    // `false` is a valid JSON Schema value ("matches nothing"), but
+                    // arktype's TS types reject `false` for the fallback return — cast
+                    // through `unknown` to keep the runtime behavior we want.
+                    default: function _default() {
+                        return false;
+                    }
                 }
+            });
+            // arktype's fallback returns boxed schema nodes (objects with a `toJSON()`
+            // method that emits the bare JSON Schema value, e.g. `false`). Round-trip
+            // through JSON to invoke those `toJSON()` callbacks before pruning;
+            // `structuredClone` would not call them.
+            // NOSONAR (typescript:S7784): structuredClone bypasses toJSON()
+            var normalized = JSON.parse(JSON.stringify(raw));
+            var pruned = pruneFalseUnionBranches(normalized);
+            result = "Params Schema (JSON Schema):\n".concat(JSON.stringify(pruned, null, 2));
+        } catch (unused) {
+            var expression = readArktypeExpression(entry);
+            if (expression) {
+                result = "Params Schema (arktype): ".concat(expression);
             }
-        });
-        // arktype's fallback returns boxed schema nodes (objects with a `toJSON()`
-        // method that emits the bare JSON Schema value, e.g. `false`). Round-trip
-        // through JSON to invoke those `toJSON()` callbacks before pruning;
-        // `structuredClone` would not call them.
-        // NOSONAR (typescript:S7784): structuredClone bypasses toJSON()
-        var normalized = JSON.parse(JSON.stringify(raw));
-        var pruned = pruneFalseUnionBranches(normalized);
-        result = "Params Schema (JSON Schema):\n".concat(JSON.stringify(pruned, null, 2));
-    } catch (unused) {
-        var expression = readArktypeExpression(entry);
-        if (expression) {
-            result = "Params Schema (arktype): ".concat(expression);
         }
     }
     return result;
@@ -11028,31 +11183,37 @@ function callEntry(entry, rawData, options) {
 }
 function parseAndValidate(entry, rawData) {
     var parsed = parseJsonData(rawData);
-    if (!entry.paramsValidator) {
-        return parsed;
-    }
-    var validated = entry.paramsValidator(parsed);
-    if (_instanceof(validated, Error)) {
-        var action = entry.specifier && entry.specifier !== '_' ? "".concat(entry.verb, "-").concat(entry.specifier) : entry.verb;
-        throw new CliError({
-            message: "Invalid --data for ".concat(entry.model, " ").concat(action, ": ").concat(validated.message),
-            code: 'VALIDATION_ERROR'
-        });
+    var result;
+    if (entry.paramsValidator) {
+        var validated = entry.paramsValidator(parsed);
+        if (_instanceof(validated, Error)) {
+            var action = entry.specifier && entry.specifier !== '_' ? "".concat(entry.verb, "-").concat(entry.specifier) : entry.verb;
+            throw new CliError({
+                message: "Invalid --data for ".concat(entry.model, " ").concat(action, ": ").concat(validated.message),
+                code: 'VALIDATION_ERROR'
+            });
+        }
+        result = validated;
+    } else {
+        result = parsed;
     }
-    return validated;
+    return result;
 }
 function parseJsonData(rawData) {
+    var result;
     if (typeof rawData !== 'string' || rawData.length === 0) {
-        return {};
-    }
-    try {
-        return JSON.parse(rawData);
-    } catch (e) {
-        throw new CliError({
-            message: "--data must be valid JSON: ".concat(_instanceof(e, Error) ? e.message : String(e)),
-            code: 'INVALID_DATA_JSON'
-        });
+        result = {};
+    } else {
+        try {
+            result = JSON.parse(rawData);
+        } catch (e) {
+            throw new CliError({
+                message: "--data must be valid JSON: ".concat(_instanceof(e, Error) ? e.message : String(e)),
+                code: 'INVALID_DATA_JSON'
+            });
+        }
     }
+    return result;
 }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -11246,8 +11407,96 @@ function _ts_generator(thisArg, body) {
     var ext = dumpOutput === 'raw' ? 'json' : 'ndjson';
     var mainPath = buildDumpFilePath(ext);
     var pickPath = pick ? buildDumpFilePath(ext, 'pick') : undefined;
-    if (!mainPath) {
-        return {
+    var dump;
+    if (mainPath) {
+        var pagesWritten = 0;
+        var applyPickToPage = function applyPickToPage(result) {
+            var mapped;
+            if (pick) {
+                var pickedData = pickFields(result.data, pick);
+                mapped = _object_spread_props(_object_spread({}, result), {
+                    data: pickedData
+                });
+            } else {
+                mapped = result;
+            }
+            return mapped;
+        };
+        var writeBoth = function writeBoth(input) {
+            var flagFn = input.append ? node_fs.appendFileSync : node_fs.writeFileSync;
+            flagFn(mainPath, input.mainContent);
+            if (pickPath && input.pickContent !== undefined) {
+                flagFn(pickPath, input.pickContent);
+            }
+        };
+        var writeRawPage = function writeRawPage(result, append) {
+            var mainContent = JSON.stringify(result, null, 2);
+            var pickContent = pickPath ? JSON.stringify(applyPickToPage(result), null, 2) : undefined;
+            writeBoth({
+                mainContent: mainContent,
+                pickContent: pickContent,
+                append: append
+            });
+        };
+        var writeLinePage = function writeLinePage(result, append) {
+            var mainContent = JSON.stringify(result) + '\n';
+            var pickContent = pickPath ? JSON.stringify(applyPickToPage(result)) + '\n' : undefined;
+            writeBoth({
+                mainContent: mainContent,
+                pickContent: pickContent,
+                append: append
+            });
+        };
+        var writeDataByLinePage = function writeDataByLinePage(result, append) {
+            var _result_data;
+            // data_by_line — one record per line. For `replace` mode, truncate on first record then append the rest.
+            var records = (_result_data = result.data) !== null && _result_data !== void 0 ? _result_data : [];
+            var pickedRecords = pickPath ? pickFields(records, pick) : undefined;
+            if (records.length === 0) {
+                // Still ensure file is created/truncated on first iteration even when empty.
+                if (!append) {
+                    writeBoth({
+                        mainContent: '',
+                        pickContent: pickPath ? '' : undefined,
+                        append: false
+                    });
+                }
+            } else {
+                records.forEach(function(record, index) {
+                    var recordAppend = append || index > 0;
+                    var mainContent = JSON.stringify(record) + '\n';
+                    var pickContent = pickPath && pickedRecords ? JSON.stringify(pickedRecords[index]) + '\n' : undefined;
+                    writeBoth({
+                        mainContent: mainContent,
+                        pickContent: pickContent,
+                        append: recordAppend
+                    });
+                });
+            }
+        };
+        var writePage = function writePage(result) {
+            var isFirst = pagesWritten === 0;
+            // For `replace` mode every iteration truncates; for `concat` mode only the first page truncates.
+            var append = dumpMerge === 'concat' && !isFirst;
+            if (dumpOutput === 'raw') {
+                writeRawPage(result, append);
+            } else if (dumpOutput === 'page_by_line') {
+                writeLinePage(result, append);
+            } else {
+                writeDataByLinePage(result, append);
+            }
+            pagesWritten += 1;
+        };
+        dump = {
+            mainPath: mainPath,
+            pickPath: pickPath,
+            writePage: writePage,
+            close: function close() {
+                return undefined;
+            }
+        };
+    } else {
+        dump = {
             mainPath: undefined,
             pickPath: undefined,
             writePage: function writePage() {
@@ -11258,91 +11507,7 @@ function _ts_generator(thisArg, body) {
             }
         };
     }
-    var pagesWritten = 0;
-    function applyPickToPage(result) {
-        if (!pick) {
-            return result;
-        }
-        var pickedData = pickFields(result.data, pick);
-        return _object_spread_props(_object_spread({}, result), {
-            data: pickedData
-        });
-    }
-    function writeBoth(input) {
-        var flagFn = input.append ? node_fs.appendFileSync : node_fs.writeFileSync;
-        if (mainPath) {
-            flagFn(mainPath, input.mainContent);
-        }
-        if (pickPath && input.pickContent !== undefined) {
-            flagFn(pickPath, input.pickContent);
-        }
-    }
-    function writeRawPage(result, append) {
-        var mainContent = JSON.stringify(result, null, 2);
-        var pickContent = pickPath ? JSON.stringify(applyPickToPage(result), null, 2) : undefined;
-        writeBoth({
-            mainContent: mainContent,
-            pickContent: pickContent,
-            append: append
-        });
-    }
-    function writeLinePage(result, append) {
-        var mainContent = JSON.stringify(result) + '\n';
-        var pickContent = pickPath ? JSON.stringify(applyPickToPage(result)) + '\n' : undefined;
-        writeBoth({
-            mainContent: mainContent,
-            pickContent: pickContent,
-            append: append
-        });
-    }
-    function writeDataByLinePage(result, append) {
-        var _result_data;
-        // data_by_line — one record per line. For `replace` mode, truncate on first record then append the rest.
-        var records = (_result_data = result.data) !== null && _result_data !== void 0 ? _result_data : [];
-        var pickedRecords = pickPath ? pickFields(records, pick) : undefined;
-        if (records.length === 0) {
-            // Still ensure file is created/truncated on first iteration even when empty.
-            if (!append) {
-                writeBoth({
-                    mainContent: '',
-                    pickContent: pickPath ? '' : undefined,
-                    append: false
-                });
-            }
-        } else {
-            records.forEach(function(record, index) {
-                var recordAppend = append || index > 0;
-                var mainContent = JSON.stringify(record) + '\n';
-                var pickContent = pickPath && pickedRecords ? JSON.stringify(pickedRecords[index]) + '\n' : undefined;
-                writeBoth({
-                    mainContent: mainContent,
-                    pickContent: pickContent,
-                    append: recordAppend
-                });
-            });
-        }
-    }
-    function writePage(result) {
-        var isFirst = pagesWritten === 0;
-        // For `replace` mode every iteration truncates; for `concat` mode only the first page truncates.
-        var append = dumpMerge === 'concat' && !isFirst;
-        if (dumpOutput === 'raw') {
-            writeRawPage(result, append);
-        } else if (dumpOutput === 'page_by_line') {
-            writeLinePage(result, append);
-        } else {
-            writeDataByLinePage(result, append);
-        }
-        pagesWritten += 1;
-    }
-    return {
-        mainPath: mainPath,
-        pickPath: pickPath,
-        writePage: writePage,
-        close: function close() {
-            return undefined;
-        }
-    };
+    return dump;
 }
 function runFetchLoop(input) {
     return _async_to_generator(function() {
@@ -11477,7 +11642,7 @@ function printPaginatedOutput(input) {
  * @returns `{ handled: false, result }` for single-page mode, otherwise `{ handled: true }` after the loop prints its own response.
  */ function runPaginatedList(params) {
     return _async_to_generator(function() {
-        var _stream_mainPath, initialInput, fetchPage, adapter, multiplePagesOutput, dumpOutput, dumpMerge, requestedPages, result, outputOptions, stream, state, summaryMeta;
+        var initialInput, fetchPage, adapter, multiplePagesOutput, dumpOutput, dumpMerge, requestedPages, outcome, result, _stream_mainPath, outputOptions, stream, state, summaryMeta;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -11493,12 +11658,13 @@ function printPaginatedOutput(input) {
                     ];
                 case 1:
                     result = _state.sent();
+                    outcome = {
+                        handled: false,
+                        result: result
+                    };
                     return [
-                        2,
-                        {
-                            handled: false,
-                            result: result
-                        }
+                        3,
+                        7
                     ];
                 case 2:
                     outputOptions = getOutputOptions();
@@ -11557,11 +11723,14 @@ function printPaginatedOutput(input) {
                         adapter: adapter,
                         pickFilter: outputOptions.pick
                     });
+                    outcome = {
+                        handled: true
+                    };
+                    _state.label = 7;
+                case 7:
                     return [
                         2,
-                        {
-                            handled: true
-                        }
+                        outcome
                     ];
             }
         });
@@ -11573,6 +11742,7 @@ Object.defineProperty(exports, "CALL_MODEL_APP_FUNCTION_KEY", {
     get: function () { return firebase.CALL_MODEL_APP_FUNCTION_KEY; }
 });
 exports.CALL_MODEL_API_PATH = CALL_MODEL_API_PATH;
+exports.CALL_PASSTHROUGH_COMMAND = CALL_PASSTHROUGH_COMMAND;
 exports.CLI_EXIT_CODE_AUTH = CLI_EXIT_CODE_AUTH;
 exports.CLI_EXIT_CODE_HANDLER = CLI_EXIT_CODE_HANDLER;
 exports.CliError = CliError;
@@ -11587,6 +11757,8 @@ exports.DEFAULT_MODEL_DECODE_COMMAND_NAME = DEFAULT_MODEL_DECODE_COMMAND_NAME;
 exports.DEFAULT_MODEL_INFO_COMMAND_NAME = DEFAULT_MODEL_INFO_COMMAND_NAME;
 exports.DUMP_MERGE_MODES = DUMP_MERGE_MODES;
 exports.DUMP_OUTPUT_MODES = DUMP_OUTPUT_MODES;
+exports.GET_COMMAND = GET_COMMAND;
+exports.GET_MANY_COMMAND = GET_MANY_COMMAND;
 exports.MAX_MODEL_ACCESS_MULTI_READ_KEYS = MAX_MODEL_ACCESS_MULTI_READ_KEYS;
 exports.MODEL_WRITE_OIDC_SCOPES = MODEL_WRITE_OIDC_SCOPES;
 exports.MULTIPLE_PAGES_OUTPUT_MODES = MULTIPLE_PAGES_OUTPUT_MODES;
@@ -11603,7 +11775,6 @@ exports.buildModelDecodeCommand = buildModelDecodeCommand;
 exports.buildModelInfoCommand = buildModelInfoCommand;
 exports.buildOidcDiscoveryCandidates = buildOidcDiscoveryCandidates;
 exports.callModelOverHttp = callModelOverHttp;
-exports.callPassthroughCommand = callPassthroughCommand;
 exports.configureCliErrorMapper = configureCliErrorMapper;
 exports.configureCliSecretPatterns = configureCliSecretPatterns;
 exports.configureOutputOptions = configureOutputOptions;
@@ -11637,8 +11808,6 @@ exports.generatePkceMaterial = generatePkceMaterial;
 exports.getCliContext = getCliContext;
 exports.getCliEnvVarName = getCliEnvVarName;
 exports.getCliTimeoutMs = getCliTimeoutMs;
-exports.getCommand = getCommand;
-exports.getManyCommand = getManyCommand;
 exports.getModelOverHttp = getModelOverHttp;
 exports.getMultipleModelsOverHttp = getMultipleModelsOverHttp;
 exports.getMultipleModelsOverHttpChunked = getMultipleModelsOverHttpChunked;