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

package/dist/commands/unit_test/run_all/index.js

@@ -1,5 +1,7 @@
 import { Flags } from '@oclif/core';
 import BaseCommand from '../../../base-command.js';
+import { createOrderedEmitter, mapWithConcurrency } from '../../../utils/concurrency.js';
+import { collectAllPages, INTERNAL_PAGE_SIZE, normalizeListResponse } from '../../../utils/paging.js';
 export default class UnitTestRunAll extends BaseCommand {
     static description = 'Run all unit tests in a workspace';
     static examples = [
@@ -22,6 +24,11 @@ Results: 2 passed, 1 failed
             description: 'Branch to run tests from (uses profile branch if not provided, then the live branch)',
             required: false,
         }),
+        concurrency: Flags.integer({
+            default: 1,
+            description: 'Run this many tests in parallel. Tests share the workspace database, so raise this only when your tests do not depend on shared state.',
+            required: false,
+        }),
         'obj-type': Flags.string({
             description: 'Filter by object type',
             options: ['function', 'query', 'middleware'],
@@ -53,38 +60,46 @@ Results: 2 passed, 1 failed
         const branch = flags.branch ?? profile.branch;
         try {
             // Step 1: List all unit tests
-            const listParams = new URLSearchParams();
-            listParams.set('per_page', '10000');
-            if (branch) {
-                listParams.set('branch', branch);
-            }
-            if (flags['obj-type']) {
-                listParams.set('obj_type', flags['obj-type']);
-            }
-            const listResponse = await this.verboseFetch(`${baseUrl}?${listParams}`, {
-                headers: {
-                    accept: 'application/json',
-                    Authorization: `Bearer ${profile.access_token}`,
+            // Page the list rather than asking for everything at once: 100 per
+            // request is plenty for typical suites and does not make the instance
+            // build one enormous response. Termination is the server's own nextPage,
+            // never "the page came back full".
+            const branchValue = branch;
+            const tests = await collectAllPages(async (page) => {
+                const listParams = new URLSearchParams();
+                listParams.set('page', String(page));
+                listParams.set('per_page', String(INTERNAL_PAGE_SIZE));
+                if (branchValue)
+                    listParams.set('branch', branchValue);
+                if (flags['obj-type'])
+                    listParams.set('obj_type', flags['obj-type']);
+                const listResponse = await this.verboseFetch(`${baseUrl}?${listParams}`, {
+                    headers: {
+                        accept: 'application/json',
+                        Authorization: `Bearer ${profile.access_token}`,
+                    },
+                    method: 'GET',
+                }, flags.verbose, profile.access_token);
+                if (!listResponse.ok) {
+                    const errorText = await listResponse.text();
+                    this.error(`Failed to list unit tests: ${listResponse.status}: ${listResponse.statusText}\n${errorText}`);
+                }
+                return normalizeListResponse(await listResponse.json());
+            }, {
+                onTruncate: (collected) => {
+                    this.warn(`Stopped after ${collected} unit tests — the list did not terminate. Some tests may not have run.`);
                 },
-                method: 'GET',
-            }, flags.verbose, profile.access_token);
-            if (!listResponse.ok) {
-                const errorText = await listResponse.text();
-                this.error(`Failed to list unit tests: ${listResponse.status}: ${listResponse.statusText}\n${errorText}`);
-            }
-            const data = (await listResponse.json());
-            let tests;
-            if (Array.isArray(data)) {
-                tests = data;
-            }
-            else if (data && typeof data === 'object' && 'items' in data && Array.isArray(data.items)) {
-                tests = data.items;
-            }
-            else {
-                this.error('Unexpected API response format');
-            }
+            });
             if (tests.length === 0) {
-                this.log('No unit tests found');
+                // An empty suite is a normal state (fresh branches have no tests) and
+                // is a success, not a failure. Under -o json it must still be parseable,
+                // with the same keys the populated path emits below.
+                if (flags.output === 'json') {
+                    this.log(JSON.stringify({ failed: 0, passed: 0, results: [] }, null, 2));
+                }
+                else {
+                    this.log('No unit tests found');
+                }
                 return;
             }
             if (flags.output === 'summary') {
@@ -92,7 +107,15 @@ Results: 2 passed, 1 failed
             }
             // Step 2: Run each test
             const results = [];
-            for (const test of tests) {
+            const runOne = async (test) => {
+                // Shadowed accumulators: the body below is the original sequential
+                // logic, but it records output instead of printing it so a concurrent
+                // run can still emit in input order.
+                const results = [];
+                const lines = [];
+                const log = (message) => {
+                    lines.push(message);
+                };
                 const runUrl = `${baseUrl}/${test.id}/run`;
                 try {
                     const runResponse = await this.verboseFetch(runUrl, {
@@ -115,10 +138,10 @@ Results: 2 passed, 1 failed
                         };
                         results.push(result);
                         if (flags.output === 'summary') {
-                            this.log(`FAIL  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
-                            this.log(`      Error: API error ${runResponse.status}`);
+                            log(`FAIL  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
+                            log(`      Error: API error ${runResponse.status}`);
                         }
-                        continue;
+                        return { lines, results };
                     }
                     const runResult = (await runResponse.json());
                     const passed = runResult.status === 'ok';
@@ -133,19 +156,21 @@ Results: 2 passed, 1 failed
                     results.push(result);
                     if (flags.output === 'summary') {
                         if (passed) {
-                            this.log(`PASS  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
+                            log(`PASS  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
                         }
                         else {
-                            this.log(`FAIL  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
+                            log(`FAIL  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
                             for (const expect of failedExpects) {
                                 if (expect.message) {
-                                    this.log(`      Error: ${expect.message}`);
+                                    log(`      Error: ${expect.message}`);
                                 }
                             }
                         }
                     }
                 }
                 catch (error) {
+                    if (error instanceof Error && 'oclif' in error)
+                        throw error;
                     const message = error instanceof Error ? error.message : String(error);
                     results.push({
                         message,
@@ -155,16 +180,29 @@ Results: 2 passed, 1 failed
                         status: 'fail',
                     });
                     if (flags.output === 'summary') {
-                        this.log(`FAIL  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
-                        this.log(`      Error: ${message}`);
+                        log(`FAIL  ${test.name} [${test.obj_type}: ${test.obj_name}]`);
+                        log(`      Error: ${message}`);
                     }
                 }
-            }
+                return { lines, results };
+            };
+            // Print in input order as each test settles, so concurrent output stays
+            // diffable against a sequential run.
+            const emitter = createOrderedEmitter((settled) => {
+                for (const line of settled.lines)
+                    this.log(line);
+            });
+            const perTest = await mapWithConcurrency(tests, flags.concurrency, async (test, index) => {
+                const settled = await runOne(test);
+                emitter.settle(index, settled);
+                return settled;
+            });
+            results.push(...perTest.flatMap((r) => r.results));
             // Step 3: Summary
             const passed = results.filter((r) => r.status === 'pass').length;
             const failed = results.filter((r) => r.status === 'fail').length;
             if (flags.output === 'json') {
-                this.log(JSON.stringify({ passed, failed, results }, null, 2));
+                this.log(JSON.stringify({ failed, passed, results }, null, 2));
             }
             else {
                 this.log(`\nResults: ${passed} passed, ${failed} failed`);
@@ -174,6 +212,8 @@ Results: 2 passed, 1 failed
             }
         }
         catch (error) {
+            if (error instanceof Error && 'oclif' in error)
+                throw error;
             if (error instanceof Error) {
                 this.error(`Failed to run unit tests: ${error.message}`);
             }

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

@@ -3,9 +3,11 @@ export default class WorkflowTestList extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        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>;
         branch: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         output: 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/workflow_test/list/index.js

@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import BaseCommand from '../../../base-command.js';
+import { buildPagingJson, buildPagingParams, formatPagingFooter, normalizeListResponse, pagingFlags } from '../../../utils/paging.js';
 export default class WorkflowTestList extends BaseCommand {
     static description = 'List all workflow tests in a workspace';
     static examples = [
@@ -25,6 +26,7 @@ Workflow tests in workspace 5:
             options: ['summary', 'json'],
             required: false,
         }),
+        ...pagingFlags('envelope', { maxPerPage: 10_000 }),
         workspace: Flags.string({
             char: 'w',
             description: 'Workspace ID (uses profile workspace if not provided)',
@@ -38,7 +40,8 @@ Workflow tests in workspace 5:
         if (!workspaceId) {
             this.error('No workspace ID provided. Use --workspace flag or set one in your profile.');
         }
-        const params = new URLSearchParams({ include_xanoscript: 'false' });
+        const params = new URLSearchParams(buildPagingParams(flags, 'envelope'));
+        params.set('include_xanoscript', 'false');
         if (flags.branch) {
             params.set('branch', flags.branch);
         }
@@ -55,19 +58,10 @@ Workflow tests in workspace 5:
                 const errorText = await response.text();
                 this.error(`API request failed with status ${response.status}: ${response.statusText}\n${errorText}`);
             }
-            const data = await response.json();
-            let tests;
-            if (Array.isArray(data)) {
-                tests = data;
-            }
-            else if (data && typeof data === 'object' && 'items' in data && Array.isArray(data.items)) {
-                tests = data.items;
-            }
-            else {
-                this.error('Unexpected API response format');
-            }
+            const list = normalizeListResponse(await response.json());
+            const tests = list.items;
             if (flags.output === 'json') {
-                this.log(JSON.stringify(tests, null, 2));
+                this.log(JSON.stringify(buildPagingJson(list, { page: flags.page, perPage: flags.per_page, tier: 'envelope' }), null, 2));
             }
             else {
                 if (tests.length === 0) {
@@ -80,6 +74,9 @@ Workflow tests in workspace 5:
                         this.log(`  - ${test.name} (ID: ${test.id})${desc}`);
                     }
                 }
+                const footer = formatPagingFooter(list, { noun: 'workflow test', page: flags.page, tier: 'envelope' });
+                if (footer)
+                    this.log(footer);
             }
         }
         catch (error) {

package/dist/commands/workflow_test/run/index.js

@@ -55,24 +55,29 @@ Result: PASS (1.234s)
                 this.error(`API request failed with status ${response.status}: ${response.statusText}\n${errorText}`);
             }
             const result = await response.json();
+            // Anything other than 'ok' is a failure -- the API has been observed
+            // returning several distinct non-ok statuses, so never enumerate them.
+            const passed = result.status === 'ok';
             if (flags.output === 'json') {
                 this.log(JSON.stringify(result, null, 2));
             }
             else {
-                const timing = `(${result.timing.toFixed(3)}s)`;
-                if (result.status === 'ok') {
-                    this.log(`Result: PASS ${timing}`);
-                }
-                else {
-                    this.log(`Result: FAIL ${timing}`);
-                    if (result.message) {
-                        this.log(`  Error: ${result.message}`);
-                    }
-                    this.exit(1);
+                const timing = typeof result.timing === 'number' ? ` (${result.timing.toFixed(3)}s)` : '';
+                this.log(`Result: ${passed ? 'PASS' : 'FAIL'}${timing}`);
+                if (!passed && result.message) {
+                    this.log(`  Error: ${result.message}`);
                 }
             }
+            // Set the code rather than throwing via this.exit(): the exit must apply
+            // in both output modes, and process.exitCode cannot be swallowed by the
+            // surrounding catch. Mirrors what run_all already does.
+            if (!passed) {
+                process.exitCode = 1;
+            }
         }
         catch (error) {
+            if (error instanceof Error && 'oclif' in error)
+                throw error;
             if (error instanceof Error) {
                 this.error(`Failed to run workflow test: ${error.message}`);
             }

package/dist/commands/workflow_test/run_all/index.d.ts

@@ -4,6 +4,7 @@ export default class WorkflowTestRunAll extends BaseCommand {
     static examples: string[];
     static flags: {
         branch: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        concurrency: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
         output: 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>;

package/dist/commands/workflow_test/run_all/index.js

@@ -1,5 +1,7 @@
 import { Flags } from '@oclif/core';
 import BaseCommand from '../../../base-command.js';
+import { createOrderedEmitter, mapWithConcurrency } from '../../../utils/concurrency.js';
+import { collectAllPages, INTERNAL_PAGE_SIZE, normalizeListResponse } from '../../../utils/paging.js';
 export default class WorkflowTestRunAll extends BaseCommand {
     static description = 'Run all workflow tests in a workspace';
     static examples = [
@@ -22,6 +24,11 @@ Results: 2 passed, 1 failed (2.691s total)
             description: 'Filter by branch name',
             required: false,
         }),
+        concurrency: Flags.integer({
+            default: 1,
+            description: 'Run this many tests in parallel. Tests share the workspace database, so raise this only when your tests do not depend on shared state.',
+            required: false,
+        }),
         output: Flags.string({
             char: 'o',
             default: 'summary',
@@ -45,34 +52,45 @@ Results: 2 passed, 1 failed (2.691s total)
         const baseUrl = `${profile.instance_origin}/api:meta/workspace/${workspaceId}/workflow_test`;
         try {
             // Step 1: List all workflow tests
-            const listParams = new URLSearchParams({ include_xanoscript: 'false' });
-            if (flags.branch) {
-                listParams.set('branch', flags.branch);
-            }
-            const listResponse = await this.verboseFetch(`${baseUrl}?${listParams}`, {
-                headers: {
-                    accept: 'application/json',
-                    Authorization: `Bearer ${profile.access_token}`,
+            // Page the list rather than asking for everything at once: 100 per
+            // request is plenty for typical suites and does not make the instance
+            // build one enormous response. Termination is the server's own nextPage,
+            // never "the page came back full".
+            const branchValue = flags.branch;
+            const tests = await collectAllPages(async (page) => {
+                const listParams = new URLSearchParams();
+                listParams.set('page', String(page));
+                listParams.set('per_page', String(INTERNAL_PAGE_SIZE));
+                if (branchValue)
+                    listParams.set('branch', branchValue);
+                listParams.set('include_xanoscript', 'false');
+                const listResponse = await this.verboseFetch(`${baseUrl}?${listParams}`, {
+                    headers: {
+                        accept: 'application/json',
+                        Authorization: `Bearer ${profile.access_token}`,
+                    },
+                    method: 'GET',
+                }, flags.verbose, profile.access_token);
+                if (!listResponse.ok) {
+                    const errorText = await listResponse.text();
+                    this.error(`Failed to list workflow tests: ${listResponse.status}: ${listResponse.statusText}\n${errorText}`);
+                }
+                return normalizeListResponse(await listResponse.json());
+            }, {
+                onTruncate: (collected) => {
+                    this.warn(`Stopped after ${collected} workflow tests — the list did not terminate. Some tests may not have run.`);
                 },
-                method: 'GET',
-            }, flags.verbose, profile.access_token);
-            if (!listResponse.ok) {
-                const errorText = await listResponse.text();
-                this.error(`Failed to list workflow tests: ${listResponse.status}: ${listResponse.statusText}\n${errorText}`);
-            }
-            const data = (await listResponse.json());
-            let tests;
-            if (Array.isArray(data)) {
-                tests = data;
-            }
-            else if (data && typeof data === 'object' && 'items' in data && Array.isArray(data.items)) {
-                tests = data.items;
-            }
-            else {
-                this.error('Unexpected API response format');
-            }
+            });
             if (tests.length === 0) {
-                this.log('No workflow tests found');
+                // An empty suite is a normal state (fresh branches have no tests) and
+                // is a success, not a failure. Under -o json it must still be parseable,
+                // with the same keys the populated path emits below.
+                if (flags.output === 'json') {
+                    this.log(JSON.stringify({ failed: 0, passed: 0, results: [], total_timing: 0 }, null, 2));
+                }
+                else {
+                    this.log('No workflow tests found');
+                }
                 return;
             }
             if (flags.output === 'summary') {
@@ -81,7 +99,15 @@ Results: 2 passed, 1 failed (2.691s total)
             // Step 2: Run each test
             const results = [];
             let totalTiming = 0;
-            for (const test of tests) {
+            const runOne = async (test) => {
+                // Shadowed accumulators: the body below is the original sequential
+                // logic, but it records output instead of printing it so a concurrent
+                // run can still emit in input order.
+                const results = [];
+                const lines = [];
+                const log = (message) => {
+                    lines.push(message);
+                };
                 const runUrl = `${baseUrl}/${test.id}/run`;
                 try {
                     const runResponse = await this.verboseFetch(runUrl, {
@@ -102,10 +128,10 @@ Results: 2 passed, 1 failed (2.691s total)
                         };
                         results.push(result);
                         if (flags.output === 'summary') {
-                            this.log(`FAIL  ${test.name} (0.000s)`);
-                            this.log(`      Error: API error ${runResponse.status}`);
+                            log(`FAIL  ${test.name} (0.000s)`);
+                            log(`      Error: API error ${runResponse.status}`);
                         }
-                        continue;
+                        return { lines, results };
                     }
                     const runResult = (await runResponse.json());
                     const passed = runResult.status === 'ok';
@@ -116,21 +142,23 @@ Results: 2 passed, 1 failed (2.691s total)
                         timing: runResult.timing,
                     };
                     results.push(result);
-                    totalTiming += runResult.timing;
+                    totalTiming += runResult.timing ?? 0;
                     if (flags.output === 'summary') {
-                        const timing = `(${runResult.timing.toFixed(3)}s)`;
+                        const timing = `(${(runResult.timing ?? 0).toFixed(3)}s)`;
                         if (passed) {
-                            this.log(`PASS  ${test.name} ${timing}`);
+                            log(`PASS  ${test.name} ${timing}`);
                         }
                         else {
-                            this.log(`FAIL  ${test.name} ${timing}`);
+                            log(`FAIL  ${test.name} ${timing}`);
                             if (runResult.message) {
-                                this.log(`      Error: ${runResult.message}`);
+                                log(`      Error: ${runResult.message}`);
                             }
                         }
                     }
                 }
                 catch (error) {
+                    if (error instanceof Error && 'oclif' in error)
+                        throw error;
                     const message = error instanceof Error ? error.message : String(error);
                     results.push({
                         message,
@@ -139,16 +167,29 @@ Results: 2 passed, 1 failed (2.691s total)
                         timing: 0,
                     });
                     if (flags.output === 'summary') {
-                        this.log(`FAIL  ${test.name} (0.000s)`);
-                        this.log(`      Error: ${message}`);
+                        log(`FAIL  ${test.name} (0.000s)`);
+                        log(`      Error: ${message}`);
                     }
                 }
-            }
+                return { lines, results };
+            };
+            // Print in input order as each test settles, so concurrent output stays
+            // diffable against a sequential run.
+            const emitter = createOrderedEmitter((settled) => {
+                for (const line of settled.lines)
+                    this.log(line);
+            });
+            const perTest = await mapWithConcurrency(tests, flags.concurrency, async (test, index) => {
+                const settled = await runOne(test);
+                emitter.settle(index, settled);
+                return settled;
+            });
+            results.push(...perTest.flatMap((r) => r.results));
             // Step 3: Summary
             const passed = results.filter((r) => r.status === 'pass').length;
             const failed = results.filter((r) => r.status === 'fail').length;
             if (flags.output === 'json') {
-                this.log(JSON.stringify({ passed, failed, total_timing: totalTiming, results }, null, 2));
+                this.log(JSON.stringify({ failed, passed, results, total_timing: totalTiming }, null, 2));
             }
             else {
                 this.log(`\nResults: ${passed} passed, ${failed} failed (${totalTiming.toFixed(3)}s total)`);
@@ -158,6 +199,8 @@ Results: 2 passed, 1 failed (2.691s total)
             }
         }
         catch (error) {
+            if (error instanceof Error && 'oclif' in error)
+                throw error;
             if (error instanceof Error) {
                 this.error(`Failed to run workflow tests: ${error.message}`);
             }

package/dist/commands/workspace/git/pull/index.js

@@ -5,7 +5,7 @@ import * as os from 'node:os';
 import * as path from 'node:path';
 import snakeCase from 'lodash.snakecase';
 import BaseCommand, { buildUserAgent } from '../../../../base-command.js';
-import { buildApiGroupFolderResolver, channelPathSegments, parseDocument, } from '../../../../utils/document-parser.js';
+import { buildApiGroupFolderResolver, buildChannelServerResolver, channelPathSegments, parseDocument, } from '../../../../utils/document-parser.js';
 export default class GitPull extends BaseCommand {
     static description = 'Pull XanoScript files from a git repository into a local directory';
     static examples = [
@@ -97,10 +97,13 @@ export default class GitPull extends BaseCommand {
             // Write documents to output directory using the same file tree logic as workspace pull
             fs.mkdirSync(outputDir, { recursive: true });
             const getApiGroupFolder = buildApiGroupFolderResolver(documents, snakeCase);
+            // Resolve a realtime v2 channel path -> owning realtime_server name, so
+            // messages can nest under their channel's server (see resolver docs).
+            const getChannelServer = buildChannelServerResolver(documents);
             const filenameCounters = new Map();
             let writtenCount = 0;
             for (const doc of documents) {
-                const { baseName, typeDir } = this.resolveOutputPath(outputDir, doc, getApiGroupFolder);
+                const { baseName, typeDir } = this.resolveOutputPath(outputDir, doc, getApiGroupFolder, getChannelServer);
                 fs.mkdirSync(typeDir, { recursive: true });
                 // Track duplicates per directory
                 const dirKey = path.relative(outputDir, typeDir);
@@ -325,7 +328,7 @@ export default class GitPull extends BaseCommand {
      * Resolve the output directory and base filename for a parsed document.
      * Uses the same type-to-directory mapping as workspace pull.
      */
-    resolveOutputPath(outputDir, doc, getApiGroupFolder) {
+    resolveOutputPath(outputDir, doc, getApiGroupFolder, getChannelServer) {
         let typeDir;
         let baseName;
         if (doc.type === 'workspace') {
@@ -373,13 +376,51 @@ export default class GitPull extends BaseCommand {
             typeDir = path.join(outputDir, 'realtime', 'trigger');
             baseName = this.sanitizeFilename(doc.name);
         }
+        else if (doc.type === 'realtime_server') {
+            // Realtime v2 — see workspace/pull for the full rationale. Its own
+            // document is named after itself, mirroring api_group.
+            // realtime_server "chat" → realtime/server/chat/chat.xs
+            typeDir = path.join(outputDir, 'realtime', 'server', this.sanitizeFilename(doc.name));
+            baseName = this.sanitizeFilename(doc.name);
+        }
         else if (doc.type === 'channel') {
-            // Realtime v2 — see workspace/pull for the full rationale.
-            typeDir = path.join(outputDir, 'channel', ...channelPathSegments(doc.name, snakeCase));
-            baseName = '_channel';
+            // Realtime v2. The channel owns a directory named after itself (the full
+            // channel name, snake_cased into a single flat segment — like every other
+            // object), and its messages live in a message/ subfolder inside it. It
+            // nests under its owning realtime_server (from `server = "..."`):
+            //   channel "rooms/{room_id}" (server "chat")
+            //     → realtime/server/chat/channel/rooms_room_id/rooms_room_id.xs
+            //
+            // The channel name is snake_cased as a whole (rooms/{room_id} →
+            // rooms_room_id), so there is no path nesting and no bracket escaping —
+            // the on-disk name is a display form; the .xs content keeps the real
+            // name. A channel with no resolvable server (e.g. a pre-server export)
+            // falls back to the legacy flat channel/<path>/_channel.xs layout.
+            if (doc.server) {
+                typeDir = path.join(outputDir, 'realtime', 'server', this.sanitizeFilename(doc.server), 'channel', snakeCase(doc.name));
+                baseName = snakeCase(doc.name);
+            }
+            else {
+                typeDir = path.join(outputDir, 'channel', ...channelPathSegments(doc.name, snakeCase));
+                baseName = '_channel';
+            }
         }
         else if (doc.type === 'message' && doc.channel) {
-            typeDir = path.join(outputDir, 'channel', ...channelPathSegments(doc.channel, snakeCase));
+            // Realtime v2 message → nests in a message/ subfolder under its channel,
+            // under that channel's server. The message names only its channel; the
+            // server is resolved by looking that channel up in the same multidoc
+            // (two-pass resolve).
+            //   message "post" on channel "rooms/{room_id}" (server "chat")
+            //     → realtime/server/chat/channel/rooms_room_id/message/post.xs
+            //
+            // Nesting matters beyond tidiness: message names are unique only WITHIN
+            // a channel, so a flat message/ directory would collide when two
+            // channels both define e.g. "say". A channel whose server can't be
+            // resolved falls back to the legacy flat channel/ layout.
+            const messageServer = getChannelServer(doc.channel);
+            typeDir = messageServer
+                ? path.join(outputDir, 'realtime', 'server', this.sanitizeFilename(messageServer), 'channel', snakeCase(doc.channel), 'message')
+                : path.join(outputDir, 'channel', ...channelPathSegments(doc.channel, snakeCase));
             baseName = this.sanitizeFilename(doc.name);
         }
         else if (doc.type === 'api_group') {

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

@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import BaseCommand from '../../../base-command.js';
+import { buildPagingJson, formatPagingFooter, normalizeListResponse } from '../../../utils/paging.js';
 export default class WorkspaceList extends BaseCommand {
     static description = 'List all workspaces from the Xano Metadata API';
     static examples = [
@@ -71,24 +72,14 @@ Available workspaces:
                 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 workspaces;
-            if (Array.isArray(data)) {
-                workspaces = data;
-            }
-            else if (data && typeof data === 'object' && 'workspaces' in data && Array.isArray(data.workspaces)) {
-                workspaces = data.workspaces;
-            }
-            else {
-                this.error('Unexpected API response format');
-            }
+            const list = normalizeListResponse(await response.json(), ['workspaces']);
+            const workspaces = list.items;
             if (flags.latest) {
                 workspaces.sort((a, b) => b.id - a.id);
             }
             // Output results
             if (flags.output === 'json') {
-                this.log(JSON.stringify(workspaces, null, 2));
+                this.log(JSON.stringify(buildPagingJson(list, { tier: 'none' }), null, 2));
             }
             else {
                 // summary format
@@ -107,6 +98,9 @@ Available workspaces:
                         }
                     }
                 }
+                const footer = formatPagingFooter({ items: workspaces }, { noun: 'workspace', tier: 'none' });
+                if (footer)
+                    this.log(footer);
             }
         }
         catch (error) {