@xano/cli 1.0.6-beta.2 → 1.0.6-beta.20

package/dist/commands/ephemeral/push/index.js

@@ -2,6 +2,7 @@ import { Args, Flags } from '@oclif/core';
 import * as fs from 'node:fs';
 import { resolve } from 'node:path';
 import BaseCommand from '../../../base-command.js';
+import { isAwaited, waitForMicroservices, } from '../../../utils/microservice-wait.js';
 import { executePush } from '../../../utils/multidoc-push.js';
 export default class EphemeralPush extends BaseCommand {
     static args = {
@@ -88,6 +89,17 @@ Skip preview and push immediately
             description: '[CRITICAL] STOP and confirm with the user; this truncates live tables before importing.',
             required: false,
         }),
+        wait: Flags.boolean({
+            default: false,
+            description: 'After pushing, wait for auto-deployed microservices (tenant_deploy="auto") to become ready. Exits non-zero if any fails to deploy or the wait times out. Ignored with --dry-run.',
+            required: false,
+        }),
+        'wait-timeout': Flags.integer({
+            default: 300,
+            description: 'Seconds to wait for microservices to become ready when --wait is set (default 300).',
+            min: 1,
+            required: false,
+        }),
         workspace: Flags.string({
             char: 'w',
             description: 'Workspace ID (uses profile workspace if not provided)',
@@ -140,5 +152,70 @@ Skip preview and push immediately
             inputDir,
             verboseFetch: this.verboseFetch.bind(this),
         }, target, pushFlags);
+        // --wait: after a real push, poll the tenant's live microservice status until
+        // every auto-deployed microservice (tenant_deploy="auto") is ready or the
+        // wait times out. Skipped on --dry-run (nothing was deployed).
+        if (flags.wait && !flags['dry-run']) {
+            await this.waitForDeploy(baseUrl, profile.access_token, tenantName, flags['wait-timeout'], flags.verbose);
+        }
+    }
+    /**
+     * Poll GET .../tenant/{name}/microservice until auto microservices settle.
+     * Renders a one-line-per-microservice progress view that updates in place, then
+     * exits non-zero if any auto microservice failed or the wait timed out.
+     */
+    async waitForDeploy(baseUrl, accessToken, tenantName, timeoutSeconds, verbose) {
+        this.log('');
+        this.log(`Waiting for microservices to deploy (timeout ${timeoutSeconds}s)…`);
+        const icon = (e) => {
+            if (!isAwaited(e))
+                return '➖';
+            switch (e.status) {
+                case 'error': {
+                    return '❌';
+                }
+                case 'ok': {
+                    return '✅';
+                }
+                default: {
+                    return '⏳';
+                }
+            }
+        };
+        const line = (e) => {
+            const detail = isAwaited(e) ? e.detail || e.status : `skipped (${e.tenant_deploy ?? 'manual'})`;
+            return `  ${icon(e)} ${e.name.padEnd(24)} ${detail}`;
+        };
+        const result = await waitForMicroservices({
+            accessToken,
+            onPoll: (entries) => {
+                // Re-render the block: move the cursor up over the previous render (if any)
+                // and rewrite. Falls back to plain appends when not a TTY.
+                if (process.stdout.isTTY && this.lastRenderLines > 0) {
+                    process.stdout.write(`[${this.lastRenderLines}A`);
+                }
+                const lines = entries.map((e) => line(e));
+                for (const l of lines)
+                    this.log(l);
+                this.lastRenderLines = process.stdout.isTTY ? lines.length : 0;
+            },
+            statusUrl: `${baseUrl}/microservice`,
+            timeoutMs: timeoutSeconds * 1000,
+            verbose,
+            verboseFetch: this.verboseFetch.bind(this),
+        });
+        const awaited = result.entries.filter((e) => isAwaited(e));
+        const ready = awaited.filter((e) => e.status === 'ok').length;
+        if (result.timedOut) {
+            this.error(`Timed out after ${timeoutSeconds}s waiting for microservices (${ready}/${awaited.length} ready). ` +
+                `Check status with the Xano dashboard or re-run with a larger --wait-timeout.`);
+        }
+        if (result.hadError) {
+            const failed = awaited.filter((e) => e.status === 'error').map((e) => `${e.name} (${e.detail || 'error'})`);
+            this.error(`Microservice deploy failed: ${failed.join(', ')}`);
+        }
+        this.log(`All microservices ready (${ready}/${awaited.length}).`);
     }
+    /** Number of lines the last progress render wrote (for in-place TTY updates). */
+    lastRenderLines = 0;
 }

package/dist/commands/ephemeral/static_host/build/list/index.d.ts

@@ -6,11 +6,10 @@ export default class EphemeralStaticHostBuildList extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
-        per_page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         'static-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         config: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/ephemeral/static_host/build/list/index.js

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import BaseCommand from '../../../../../base-command.js';
+import { buildPagingJson, buildPagingParams, formatPagingFooter, normalizeListResponse, pagingFlags } from '../../../../../utils/paging.js';
 export default class EphemeralStaticHostBuildList extends BaseCommand {
     static args = {
         tenant_name: Args.string({
@@ -20,13 +21,16 @@ Available builds:
   - staging (ID: 2) - Status: completed
 `,
         `$ xano ephemeral static_host build list e4f2-9ab1-xyz1 -H default -w 40 --output json
-[
-  {
-    "id": 1,
-    "name": "v1.0.0",
-    "status": "completed"
-  }
-]
+{
+  "count": 1,
+  "page": 1,
+  "total": 12,
+  "items": [
+    {
+      "id": 52
+    }
+  ]
+}
 `,
         `$ xano ephemeral static_host build list e4f2-9ab1-xyz1 -H default -p staging -o json --page 2
 [
@@ -46,16 +50,7 @@ Available builds:
             options: ['summary', 'json'],
             required: false,
         }),
-        page: Flags.integer({
-            default: 1,
-            description: 'Page number for pagination',
-            required: false,
-        }),
-        per_page: Flags.integer({
-            default: 50,
-            description: 'Number of results per page',
-            required: false,
-        }),
+        ...pagingFlags('page-only-envelope', { fixedPerPage: 100 }),
         'static-host': Flags.string({
             char: 'H',
             description: 'Static host name',
@@ -86,13 +81,7 @@ Available builds:
                 `  2. Set it in your profile using: xano profile:edit ${profileName} -w <workspace_id>`);
         }
         // Build query parameters
-        const queryParams = new URLSearchParams({
-            page: flags.page.toString(),
-        });
-        // Only add per_page if it's not the default value
-        if (flags.per_page !== 50) {
-            queryParams.append('per_page', flags.per_page.toString());
-        }
+        const queryParams = new URLSearchParams(buildPagingParams(flags, 'page-only-envelope'));
         // Construct the API URL
         const apiUrl = `${profile.instance_origin}/api:meta/workspace/${workspaceId}/tenant/${tenantName}/static_host/${staticHost}/build?${queryParams.toString()}`;
         // Fetch builds from the API
@@ -108,24 +97,11 @@ Available builds:
                 const errorText = await response.text();
                 this.error(`API request failed with status ${response.status}: ${response.statusText}\n${errorText}`);
             }
-            const data = await response.json();
-            // Handle different response formats
-            let builds;
-            if (Array.isArray(data)) {
-                builds = data;
-            }
-            else if (data && typeof data === 'object' && 'builds' in data && Array.isArray(data.builds)) {
-                builds = data.builds;
-            }
-            else if (data && typeof data === 'object' && 'items' in data && Array.isArray(data.items)) {
-                builds = data.items;
-            }
-            else {
-                this.error('Unexpected API response format');
-            }
+            const list = normalizeListResponse(await response.json(), ['builds']);
+            const builds = list.items;
             // Output results
             if (flags.output === 'json') {
-                this.log(JSON.stringify(builds, null, 2));
+                this.log(JSON.stringify(buildPagingJson(list, { page: flags.page, tier: 'page-only-envelope' }), null, 2));
             }
             else {
                 // summary format
@@ -144,6 +120,9 @@ Available builds:
                         }
                     }
                 }
+                const footer = formatPagingFooter(list, { noun: 'build', page: flags.page, tier: 'page-only-envelope' });
+                if (footer)
+                    this.log(footer);
             }
         }
         catch (error) {

package/dist/commands/ephemeral/static_host/list/index.d.ts

@@ -6,10 +6,9 @@ export default class EphemeralStaticHostList extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
-        per_page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         config: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/ephemeral/static_host/list/index.js

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import BaseCommand from '../../../../base-command.js';
+import { buildPagingJson, buildPagingParams, formatPagingFooter, normalizeListResponse, pagingFlags } from '../../../../utils/paging.js';
 export default class EphemeralStaticHostList extends BaseCommand {
     static args = {
         tenant_name: Args.string({
@@ -20,13 +21,17 @@ Available static hosts:
   - another-host (ID: 2)
 `,
         `$ xano ephemeral static_host list e4f2-9ab1-xyz1 -w 40 --output json
-[
-  {
-    "id": 1,
-    "name": "my-static-host",
-    "domain": "example.com"
-  }
-]
+{
+  "count": 1,
+  "page": 1,
+  "total": 3,
+  "items": [
+    {
+      "id": 1,
+      "name": "my-static-host"
+    }
+  ]
+}
 `,
         `$ xano ephemeral static_host list e4f2-9ab1-xyz1 -p staging -o json --page 2
 [
@@ -46,16 +51,7 @@ Available static hosts:
             options: ['summary', 'json'],
             required: false,
         }),
-        page: Flags.integer({
-            default: 1,
-            description: 'Page number for pagination',
-            required: false,
-        }),
-        per_page: Flags.integer({
-            default: 50,
-            description: 'Number of results per page',
-            required: false,
-        }),
+        ...pagingFlags('page-only-envelope', { fixedPerPage: 100 }),
         workspace: Flags.string({
             char: 'w',
             description: 'Workspace ID (optional if set in profile)',
@@ -80,13 +76,7 @@ Available static hosts:
                 `  2. Set it in your profile using: xano profile:edit ${profileName} -w <workspace_id>`);
         }
         // Build query parameters
-        const queryParams = new URLSearchParams({
-            page: flags.page.toString(),
-        });
-        // Only add per_page if it's not the default value
-        if (flags.per_page !== 50) {
-            queryParams.append('per_page', flags.per_page.toString());
-        }
+        const queryParams = new URLSearchParams(buildPagingParams(flags, 'page-only-envelope'));
         // Construct the API URL
         const apiUrl = `${profile.instance_origin}/api:meta/workspace/${workspaceId}/tenant/${tenantName}/static_host?${queryParams.toString()}`;
         // Fetch static hosts from the API
@@ -102,24 +92,11 @@ Available static hosts:
                 const errorText = await response.text();
                 this.error(`API request failed with status ${response.status}: ${response.statusText}\n${errorText}`);
             }
-            const data = await response.json();
-            // Handle different response formats
-            let staticHosts;
-            if (Array.isArray(data)) {
-                staticHosts = data;
-            }
-            else if (data && typeof data === 'object' && 'static_hosts' in data && Array.isArray(data.static_hosts)) {
-                staticHosts = data.static_hosts;
-            }
-            else if (data && typeof data === 'object' && 'items' in data && Array.isArray(data.items)) {
-                staticHosts = data.items;
-            }
-            else {
-                this.error('Unexpected API response format');
-            }
+            const list = normalizeListResponse(await response.json(), ['static_hosts']);
+            const staticHosts = list.items;
             // Output results
             if (flags.output === 'json') {
-                this.log(JSON.stringify(staticHosts, null, 2));
+                this.log(JSON.stringify(buildPagingJson(list, { page: flags.page, tier: 'page-only-envelope' }), null, 2));
             }
             else {
                 // summary format
@@ -138,6 +115,9 @@ Available static hosts:
                         }
                     }
                 }
+                const footer = formatPagingFooter(list, { noun: 'static host', page: flags.page, tier: 'page-only-envelope' });
+                if (footer)
+                    this.log(footer);
             }
         }
         catch (error) {

package/dist/commands/flatten/index.d.ts

@@ -0,0 +1,34 @@
+import { Command } from '@oclif/core';
+/**
+ * Split a multi-document `.xs` bundle into the standard one-document-per-file
+ * layout that the push pipeline requires.
+ *
+ * A hand-authored bundle keeps every object (workspace, tables, queries,
+ * microservices, …) in a single file joined by `---`. That is convenient to
+ * edit but unsupported by `push`: the partial-diff filter and GUID writeback
+ * both parse only the first document in a file, so such a bundle silently
+ * pushes nothing (partial mode) or corrupts GUIDs (full mode). `flatten` turns
+ * it back into the exact tree `pull` would have produced, using the shared
+ * placement logic so the two never drift.
+ *
+ * Not a BaseCommand: this is a purely local, offline transform — no profile,
+ * token, or network — so it extends oclif's Command directly.
+ */
+export default class Flatten extends Command {
+    static args: {
+        input: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'keep-source': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        output: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+    /** Recursively collect `.xs` files under a dir that actually hold >1 document. */
+    private collectMultiDocFiles;
+    /** Flatten a single bundle file. Returns the number of documents written. */
+    private flattenOne;
+}

package/dist/commands/flatten/index.js

@@ -0,0 +1,140 @@
+import { Args, Command, Flags, ux } from '@oclif/core';
+import * as fs from 'node:fs';
+import { join, relative, resolve } from 'node:path';
+import { flattenBundleFile } from '../../utils/flatten.js';
+/**
+ * Split a multi-document `.xs` bundle into the standard one-document-per-file
+ * layout that the push pipeline requires.
+ *
+ * A hand-authored bundle keeps every object (workspace, tables, queries,
+ * microservices, …) in a single file joined by `---`. That is convenient to
+ * edit but unsupported by `push`: the partial-diff filter and GUID writeback
+ * both parse only the first document in a file, so such a bundle silently
+ * pushes nothing (partial mode) or corrupts GUIDs (full mode). `flatten` turns
+ * it back into the exact tree `pull` would have produced, using the shared
+ * placement logic so the two never drift.
+ *
+ * Not a BaseCommand: this is a purely local, offline transform — no profile,
+ * token, or network — so it extends oclif's Command directly.
+ */
+export default class Flatten extends Command {
+    static args = {
+        input: Args.string({
+            description: 'A multi-document .xs file, or a directory containing them, to split',
+            required: true,
+        }),
+    };
+    static description = 'Split a multi-document .xs bundle (documents joined by `---`) into the standard ' +
+        'one-document-per-file layout that push requires. Deletes the original bundle by ' +
+        'default (use --keep-source to keep it). Purely local — no network.';
+    static examples = [
+        `$ xano flatten secret/pdf-micro/multidoc.xs
+Split the bundle in place into per-document files (removes multidoc.xs)`,
+        `$ xano flatten ./bundle.xs -o ./workspace
+Write the split files under ./workspace instead of alongside the bundle`,
+        `$ xano flatten secret/pdf-micro/multidoc.xs --dry-run
+Preview the file layout without writing anything`,
+        `$ xano flatten ./dir-of-bundles --keep-source
+Flatten every multi-doc .xs under a directory, keeping the originals`,
+    ];
+    static flags = {
+        'dry-run': Flags.boolean({
+            default: false,
+            description: 'Show the resulting file layout without writing anything',
+        }),
+        force: Flags.boolean({
+            char: 'f',
+            default: false,
+            description: 'Overwrite existing destination files instead of erroring',
+        }),
+        'keep-source': Flags.boolean({
+            default: false,
+            description: 'Keep the original multi-document file(s) (default: delete after a successful split)',
+        }),
+        output: Flags.string({
+            char: 'o',
+            description: 'Output directory (default: the directory each bundle file lives in)',
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(Flatten);
+        const inputPath = resolve(args.input);
+        if (!fs.existsSync(inputPath)) {
+            this.error(`Not found: ${inputPath}`);
+        }
+        // Resolve the set of bundle files to flatten.
+        const bundleFiles = fs.statSync(inputPath).isDirectory()
+            ? this.collectMultiDocFiles(inputPath)
+            : [inputPath];
+        if (bundleFiles.length === 0) {
+            this.error(fs.statSync(inputPath).isDirectory()
+                ? `No multi-document .xs files found under ${inputPath}`
+                : `${inputPath} is not a .xs file`);
+        }
+        let totalWritten = 0;
+        for (const bundleFile of bundleFiles) {
+            totalWritten += this.flattenOne(bundleFile, flags);
+        }
+        if (flags['dry-run']) {
+            this.log('');
+            this.log(ux.colorize('dim', `Dry run — ${totalWritten} file(s) would be written. Nothing changed.`));
+        }
+        else {
+            this.log('');
+            this.log(`Flattened ${bundleFiles.length} bundle(s) into ${totalWritten} file(s).`);
+        }
+    }
+    /** Recursively collect `.xs` files under a dir that actually hold >1 document. */
+    collectMultiDocFiles(dir) {
+        const out = [];
+        const walk = (d) => {
+            for (const entry of fs.readdirSync(d, { withFileTypes: true })) {
+                const full = join(d, entry.name);
+                if (entry.isDirectory()) {
+                    walk(full);
+                }
+                else if (entry.isFile() && entry.name.endsWith('.xs')) {
+                    const content = fs.readFileSync(full, 'utf8');
+                    if (/^---$/m.test(content))
+                        out.push(full);
+                }
+            }
+        };
+        walk(dir);
+        return out.sort();
+    }
+    /** Flatten a single bundle file. Returns the number of documents written. */
+    flattenOne(bundleFile, flags) {
+        const rel = relative(process.cwd(), bundleFile) || bundleFile;
+        let result;
+        try {
+            // Buffer the plan so we can print a header before it only when there's work.
+            const planLines = [];
+            result = flattenBundleFile(bundleFile, {
+                dryRun: flags['dry-run'],
+                force: flags.force,
+                keepSource: flags['keep-source'],
+                log: (msg) => planLines.push(msg),
+                outputDir: flags.output,
+            });
+            if (result.skipped === 'empty') {
+                this.warn(`No parseable documents in ${rel}; skipping.`);
+                return 0;
+            }
+            if (result.skipped === 'single') {
+                this.warn(`${rel} holds a single document; nothing to split. Skipping.`);
+                return 0;
+            }
+            this.log('');
+            this.log(ux.colorize('bold', `${rel} → ${result.written.length} documents`));
+            for (const l of planLines) {
+                // Colorize the WRITE marker; dim the incidental notes.
+                this.log(l.startsWith('  WRITE') ? l.replace('WRITE', ux.colorize('green', 'WRITE')) : ux.colorize('dim', l));
+            }
+        }
+        catch (error) {
+            this.error(error.message);
+        }
+        return result.written.length;
+    }
+}

package/dist/commands/function/list/index.d.ts

@@ -4,14 +4,14 @@ export default class FunctionList extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        sort: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
+        per_page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         include_draft: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         include_xanoscript: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         order: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
-        per_page: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
-        sort: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         config: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/function/list/index.js

@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import BaseCommand from '../../../base-command.js';
+import { buildPagingJson, formatPagingFooter, normalizeListResponse, pagingFlags } from '../../../utils/paging.js';
 export default class FunctionList extends BaseCommand {
     static args = {};
     static description = 'List all functions in a workspace from the Xano Metadata API';
@@ -16,20 +17,30 @@ Available functions:
   - another-function (ID: 2)
 `,
         `$ xano function:list -w 40 --output json
-[
-  {
-    "id": 1,
-    "name": "function-1"
-  }
-]
+{
+  "count": 1,
+  "page": 1,
+  "per_page": 50,
+  "next_page": 2,
+  "items": [
+    {
+      "id": 1,
+      "name": "function-1"
+    }
+  ]
+}
 `,
         `$ xano function:list -p staging -o json --include_draft
-[
-  {
-    "id": 1,
-    "name": "function-1"
-  }
-]
+{
+  "count": 1,
+  "page": 1,
+  "items": [
+    {
+      "id": 1,
+      "name": "function-1"
+    }
+  ]
+}
 `,
     ];
     static flags = {
@@ -57,16 +68,7 @@ Available functions:
             options: ['summary', 'json'],
             required: false,
         }),
-        page: Flags.integer({
-            default: 1,
-            description: 'Page number for pagination',
-            required: false,
-        }),
-        per_page: Flags.integer({
-            default: 50,
-            description: 'Number of results per page',
-            required: false,
-        }),
+        ...pagingFlags('envelope', { maxPerPage: 10_000 }),
         sort: Flags.string({
             default: 'created_at',
             description: 'Sort field',
@@ -118,24 +120,11 @@ Available functions:
                 const errorText = await response.text();
                 this.error(`API request failed with status ${response.status}: ${response.statusText}\n${errorText}`);
             }
-            const data = await response.json();
-            // Handle different response formats
-            let functions;
-            if (Array.isArray(data)) {
-                functions = data;
-            }
-            else if (data && typeof data === 'object' && 'functions' in data && Array.isArray(data.functions)) {
-                functions = data.functions;
-            }
-            else if (data && typeof data === 'object' && 'items' in data && Array.isArray(data.items)) {
-                functions = data.items;
-            }
-            else {
-                this.error('Unexpected API response format');
-            }
+            const list = normalizeListResponse(await response.json(), ['functions']);
+            const functions = list.items;
             // Output results
             if (flags.output === 'json') {
-                this.log(JSON.stringify(functions, null, 2));
+                this.log(JSON.stringify(buildPagingJson(list, { page: flags.page, perPage: flags.per_page, tier: 'envelope' }), null, 2));
             }
             else {
                 // summary format
@@ -153,6 +142,9 @@ Available functions:
                         }
                     }
                 }
+                const footer = formatPagingFooter(list, { noun: 'function', page: flags.page, tier: 'envelope' });
+                if (footer)
+                    this.log(footer);
             }
         }
         catch (error) {

package/dist/commands/function/run/index.d.ts

@@ -8,6 +8,7 @@ export default class FunctionRun extends BaseCommand {
     static flags: {
         branch: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         data: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        datasource: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         logs: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;