@xano/cli 1.2.0 → 1.3.1-beta.0

package/dist/commands/tenant_deploy_request/revision/index.d.ts

@@ -0,0 +1,21 @@
+import BaseCommand from '../../../base-command.js';
+export default class TenantDeployRequestRevision extends BaseCommand {
+    static args: {
+        id: import("@oclif/core/interfaces").Arg<number, {
+            max?: number;
+            min?: number;
+        }>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        note: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        release: 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>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/tenant_deploy_request/revision/index.js

@@ -0,0 +1,83 @@
+import { Args, Flags } from '@oclif/core';
+import BaseCommand from '../../../base-command.js';
+export default class TenantDeployRequestRevision extends BaseCommand {
+    static args = {
+        id: Args.integer({
+            description: 'Tenant deploy request ID',
+            required: true,
+        }),
+    };
+    static description = 'Link a newer release candidate to an existing tenant deploy request after changes were requested. The previous candidate is kept in the revision history and the request returns to pending. Author only.';
+    static examples = [
+        `$ xano tenant_deploy_request revision 12 --release v1.2.1 --note "Added the missing migration"
+Deploy request #12 is now: pending
+`,
+    ];
+    static flags = {
+        ...BaseCommand.baseFlags,
+        note: Flags.string({
+            description: 'Note describing what changed in this revision',
+            required: false,
+        }),
+        output: Flags.string({
+            char: 'o',
+            default: 'summary',
+            description: 'Output format',
+            options: ['summary', 'json'],
+            required: false,
+        }),
+        release: Flags.string({
+            char: 'r',
+            description: 'Name of the new release to review',
+            required: true,
+        }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'Workspace ID (uses profile workspace if not provided)',
+            required: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(TenantDeployRequestRevision);
+        const { profile } = this.resolveProfile(flags);
+        const workspaceId = flags.workspace || profile.workspace;
+        if (!workspaceId) {
+            this.error('No workspace ID provided. Use --workspace flag or set one in your profile.');
+        }
+        const body = {
+            note: flags.note ?? '',
+            release_name: flags.release,
+        };
+        const apiUrl = `${profile.instance_origin}/api:meta/workspace/${workspaceId}/approval_request/${args.id}/revision`;
+        try {
+            const response = await this.verboseFetch(apiUrl, {
+                body: JSON.stringify(body),
+                headers: {
+                    accept: 'application/json',
+                    Authorization: `Bearer ${profile.access_token}`,
+                    'Content-Type': 'application/json',
+                },
+                method: 'POST',
+            }, flags.verbose, profile.access_token);
+            if (!response.ok) {
+                const message = await this.parseApiError(response, 'Failed to add revision to tenant deploy request');
+                this.error(message);
+            }
+            const item = (await response.json());
+            if (flags.output === 'json') {
+                this.log(JSON.stringify(item, null, 2));
+            }
+            else {
+                this.log(`Deploy request #${item.id} is now: ${item.status}`);
+            }
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                this.error(`Failed to add revision to tenant deploy request: ${error.message}`);
+            }
+            else {
+                this.error(`Failed to add revision to tenant deploy request: ${String(error)}`);
+            }
+        }
+    }
+}

package/dist/commands/tenant_deploy_request/set_status/index.d.ts

@@ -0,0 +1,38 @@
+import BaseCommand from '../../../base-command.js';
+export default class TenantDeployRequestSetStatus extends BaseCommand {
+    static args: {
+        id: import("@oclif/core/interfaces").Arg<number, {
+            max?: number;
+            min?: number;
+        }>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'override-policy': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        reason: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        status: 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>;
+    };
+    /** Set once the policy gate refuses the deploy an approval triggered, the one failure that exits 2. */
+    private refusedByPolicyGate;
+    /** Exit 2 is the policy gate's refusal; every other failure, flag errors included, exits 1. */
+    protected catch(error: Error & {
+        oclif?: {
+            exit?: number;
+        };
+    }): Promise<void>;
+    run(): Promise<void>;
+    /** `--override-policy` overrides the deploy an approve can trigger, and its reason is `--reason`. */
+    private checkOverride;
+    /**
+     * The deploy this approval triggered was refused by the policy gate: its verdict, then the refusal,
+     * exiting 2. The vote that completes the approvals is recorded before the deploy, so the request
+     * stays approved, and a later deploy of the pair that overrides the gate completes it.
+     */
+    private refuseByPolicyGate;
+}

package/dist/commands/tenant_deploy_request/set_status/index.js

@@ -0,0 +1,159 @@
+import { Args, Flags } from '@oclif/core';
+import BaseCommand from '../../../base-command.js';
+import { gateOverrideHint, gateRefusal, gateRefusalOutput, quoted } from '../../../utils/policy/gate.js';
+export default class TenantDeployRequestSetStatus extends BaseCommand {
+    static args = {
+        id: Args.integer({
+            description: 'Tenant deploy request ID',
+            required: true,
+        }),
+    };
+    static description = "[CRITICAL] STOP and confirm with the user before running --status approve; if this is the vote that completes the tenant's required reviewer count, it deploys the release to the tenant immediately as part of approving. Change a tenant deploy request's status (draft, submit, approve, request_changes, close, or reopen). That deploy is gated on the release's policy check: a refusal exits 2 and leaves the request approved; --override-policy with --reason proceeds past it.";
+    static examples = [
+        `$ xano tenant_deploy_request set_status 12 --status submit
+Deploy request #12 is now: pending
+`,
+        `$ xano tenant_deploy_request set_status 12 --status approve
+Vote recorded on deploy request #12: 1/2 required reviewers.
+`,
+        `$ xano tenant_deploy_request set_status 12 --status approve
+Deploy request #12 is now: approved (2/2 required reviewers)
+Deployed to tenant as part of this approval.
+`,
+        `$ xano tenant_deploy_request set_status 12 --status approve --override-policy --reason "Finding accepted; fix tracked in JIRA-12"`,
+        `$ xano tenant_deploy_request set_status 12 --status request_changes --reason "Needs a migration note"`,
+        `$ xano tenant_deploy_request set_status 12 --status close --reason "Superseded by #14"`,
+        `$ xano tenant_deploy_request set_status 12 --status reopen`,
+    ];
+    static flags = {
+        ...BaseCommand.baseFlags,
+        output: Flags.string({
+            char: 'o',
+            default: 'summary',
+            description: 'Output format',
+            options: ['summary', 'json'],
+            required: false,
+        }),
+        'override-policy': Flags.boolean({
+            default: false,
+            description: 'With --status approve: if this vote deploys, proceed past a blocking policy gate, recording --reason as the override reason (needs the workspace:policy update permission; audited)',
+        }),
+        reason: Flags.string({
+            description: 'Reason for this status change. Required for request_changes and close, and with --override-policy.',
+            required: false,
+        }),
+        status: Flags.string({
+            description: 'The status transition to apply',
+            options: ['draft', 'submit', 'approve', 'request_changes', 'close', 'reopen'],
+            required: true,
+        }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'Workspace ID (uses profile workspace if not provided)',
+            required: false,
+        }),
+    };
+    /** Set once the policy gate refuses the deploy an approval triggered, the one failure that exits 2. */
+    refusedByPolicyGate = false;
+    /** Exit 2 is the policy gate's refusal; every other failure, flag errors included, exits 1. */
+    async catch(error) {
+        if (this.refusedByPolicyGate)
+            return super.catch(error);
+        return this.catchAsOperational(error);
+    }
+    async run() {
+        const { args, flags } = await this.parse(TenantDeployRequestSetStatus);
+        const { profile } = this.resolveProfile(flags);
+        const workspaceId = flags.workspace || profile.workspace;
+        if (!workspaceId) {
+            this.error('No workspace ID provided. Use --workspace flag or set one in your profile.');
+        }
+        if ((flags.status === 'request_changes' || flags.status === 'close') && !flags.reason) {
+            this.error(`--reason is required when --status is "${flags.status}"`);
+        }
+        if (flags['override-policy'])
+            this.checkOverride(flags);
+        const body = {
+            action: flags.status,
+            reason: flags.reason ?? '',
+            ...(flags['override-policy'] ? { override_policy: true } : {}),
+        };
+        // A refusal by the policy gate exits 2 with its verdict; the catch that rewords other failures keeps it.
+        let refused = null;
+        const apiUrl = `${profile.instance_origin}/api:meta/workspace/${workspaceId}/approval_request/${args.id}/status`;
+        try {
+            const response = await this.verboseFetch(apiUrl, {
+                body: JSON.stringify(body),
+                headers: {
+                    accept: 'application/json',
+                    Authorization: `Bearer ${profile.access_token}`,
+                    'Content-Type': 'application/json',
+                },
+                method: 'POST',
+            }, flags.verbose, profile.access_token);
+            if (!response.ok) {
+                refused = await gateRefusal(response);
+                if (refused)
+                    this.refuseByPolicyGate(refused, args.id, flags.output === 'json');
+                const message = await this.parseApiError(response, 'Failed to change tenant deploy request status');
+                this.error(message);
+            }
+            const item = (await response.json());
+            if (flags.output === 'json') {
+                this.log(JSON.stringify(item, null, 2));
+            }
+            else if (flags.status === 'approve' && item.fully_approved === false) {
+                // required_reviewers > 1: this vote didn't complete the quorum, so status
+                // stays "pending" and nothing was deployed yet.
+                this.log(`Vote recorded on deploy request #${item.id}: ${item.approvals_count}/${item.required_reviewers} required reviewers.`);
+            }
+            else {
+                const quorum = item.approvals_count !== undefined && item.required_reviewers !== undefined
+                    ? ` (${item.approvals_count}/${item.required_reviewers} required reviewers)`
+                    : '';
+                this.log(`Deploy request #${item.id} is now: ${item.status}${quorum}`);
+                if (flags.status === 'approve') {
+                    if (item.resolution?.deploy_status === 'deployed') {
+                        this.log('Deployed to tenant as part of this approval.');
+                    }
+                    else if (item.resolution?.deploy_status === 'failed') {
+                        this.log(`Approved, but the deploy failed: ${item.resolution.deploy_error ?? 'unknown error'}`);
+                    }
+                }
+            }
+        }
+        catch (error) {
+            if (refused)
+                throw error;
+            if (error instanceof Error) {
+                this.error(`Failed to change tenant deploy request status: ${error.message}`);
+            }
+            else {
+                this.error(`Failed to change tenant deploy request status: ${String(error)}`);
+            }
+        }
+    }
+    /** `--override-policy` overrides the deploy an approve can trigger, and its reason is `--reason`. */
+    checkOverride(flags) {
+        if (flags.status !== 'approve')
+            this.error('--override-policy applies only to --status approve, the vote that can deploy.');
+        if (!flags.reason?.trim())
+            this.error('--override-policy needs --reason: say why this deploy may proceed past the policy gate.');
+    }
+    /**
+     * The deploy this approval triggered was refused by the policy gate: its verdict, then the refusal,
+     * exiting 2. The vote that completes the approvals is recorded before the deploy, so the request
+     * stays approved, and a later deploy of the pair that overrides the gate completes it.
+     */
+    refuseByPolicyGate(refused, id, json) {
+        for (const line of gateRefusalOutput(refused, json))
+            this.log(line);
+        const approved = refused.answer.gate === 'tenant_approve'
+            ? '\nYour approval was recorded and the request is approved, but its release was not deployed.'
+            : '';
+        const release = refused.answer.release?.name?.trim();
+        const override = `xano tenant deploy_release <tenant> --release ${release ? quoted(release) : '<release>'} --override-reason "<why>" (\`xano tenant_deploy_request get ${id}\` names the tenant)`;
+        this.refusedByPolicyGate = true;
+        this.error(`${refused.message}${approved}${gateOverrideHint(refused.answer, override)}`, { exit: 2 });
+    }
+}

package/dist/commands/workspace/git/pull/index.d.ts

@@ -13,14 +13,14 @@ export default class GitPull extends BaseCommand {
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
-    /**
-     * Recursively collect all .xs files from a directory, sorted for deterministic ordering.
-     */
-    private collectFiles;
     /**
      * Clone a git repository using shallow clone.
      */
     private cloneRepo;
+    /**
+     * Recursively collect all .xs files from a directory, sorted for deterministic ordering.
+     */
+    private collectFiles;
     /**
      * Fetch a GitHub repository via the tarball API for fast download without requiring git.
      */

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

@@ -1,11 +1,11 @@
 import { Flags } from '@oclif/core';
+import snakeCase from 'lodash.snakecase';
 import { execSync } from 'node:child_process';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
-import * as path from 'node:path';
-import snakeCase from 'lodash.snakecase';
+import path from 'node:path';
 import BaseCommand, { buildUserAgent } from '../../../../base-command.js';
-import { buildApiGroupFolderResolver, 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 = [
@@ -60,13 +60,7 @@ export default class GitPull extends BaseCommand {
         const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'xano-git-pull-'));
         try {
             // Fetch repository contents
-            let repoRoot;
-            if (repoInfo.host === 'github') {
-                repoRoot = await this.fetchGitHubTarball(repoInfo.owner, repoInfo.repo, ref, token, tempDir, flags.verbose);
-            }
-            else {
-                repoRoot = this.cloneRepo(repoInfo.url, ref, token, tempDir, flags.verbose);
-            }
+            const repoRoot = repoInfo.host === 'github' ? (await this.fetchGitHubTarball(repoInfo.owner, repoInfo.repo, ref, token, tempDir, flags.verbose)) : this.cloneRepo(repoInfo.url, ref, token, tempDir, flags.verbose);
             // Determine source directory (optionally scoped to --path or URL path)
             const sourceDir = subPath ? path.join(repoRoot, subPath) : repoRoot;
             if (!fs.existsSync(sourceDir)) {
@@ -97,10 +91,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);
@@ -123,23 +120,6 @@ export default class GitPull extends BaseCommand {
             fs.rmSync(tempDir, { force: true, recursive: true });
         }
     }
-    /**
-     * Recursively collect all .xs files from a directory, sorted for deterministic ordering.
-     */
-    collectFiles(dir) {
-        const files = [];
-        const entries = fs.readdirSync(dir, { withFileTypes: true });
-        for (const entry of entries) {
-            const fullPath = path.join(dir, entry.name);
-            if (entry.isDirectory()) {
-                files.push(...this.collectFiles(fullPath));
-            }
-            else if (entry.isFile() && entry.name.endsWith('.xs')) {
-                files.push(fullPath);
-            }
-        }
-        return files.sort();
-    }
     /**
      * Clone a git repository using shallow clone.
      */
@@ -168,6 +148,23 @@ export default class GitPull extends BaseCommand {
         }
         return cloneTarget;
     }
+    /**
+     * Recursively collect all .xs files from a directory, sorted for deterministic ordering.
+     */
+    collectFiles(dir) {
+        const files = [];
+        const entries = fs.readdirSync(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                files.push(...this.collectFiles(fullPath));
+            }
+            else if (entry.isFile() && entry.name.endsWith('.xs')) {
+                files.push(fullPath);
+            }
+        }
+        return files.sort();
+    }
     /**
      * Fetch a GitHub repository via the tarball API for fast download without requiring git.
      */
@@ -325,78 +322,142 @@ 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') {
-            typeDir = path.join(outputDir, 'workspace');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'workspace_trigger') {
-            typeDir = path.join(outputDir, 'workspace', 'trigger');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'error_trigger') {
-            // error_trigger → workspace/trigger/{name}.xs (singleton, colocated with workspace triggers)
-            typeDir = path.join(outputDir, 'workspace', 'trigger');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'agent') {
-            typeDir = path.join(outputDir, 'ai', 'agent');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'mcp_server') {
-            typeDir = path.join(outputDir, 'ai', 'mcp_server');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'tool') {
-            typeDir = path.join(outputDir, 'ai', 'tool');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'agent_trigger') {
-            typeDir = path.join(outputDir, 'ai', 'agent', 'trigger');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'mcp_server_trigger') {
-            typeDir = path.join(outputDir, 'ai', 'mcp_server', 'trigger');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'table_trigger') {
-            typeDir = path.join(outputDir, 'table', 'trigger');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'realtime_channel') {
-            typeDir = path.join(outputDir, 'realtime', 'channel');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'realtime_trigger') {
-            typeDir = path.join(outputDir, 'realtime', 'trigger');
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'api_group') {
-            const groupFolder = getApiGroupFolder(doc.name);
-            typeDir = path.join(outputDir, 'api', groupFolder);
-            baseName = this.sanitizeFilename(doc.name);
-        }
-        else if (doc.type === 'query' && doc.apiGroup) {
-            const groupFolder = getApiGroupFolder(doc.apiGroup);
-            const nameParts = doc.name.split('/');
-            const leafName = nameParts.pop();
-            const folderParts = nameParts.map((part) => snakeCase(part));
-            typeDir = path.join(outputDir, 'api', groupFolder, ...folderParts);
-            baseName = this.sanitizeFilename(leafName);
-            if (doc.verb) {
-                baseName = `${baseName}_${doc.verb}`;
+        switch (doc.type) {
+            case 'agent': {
+                typeDir = path.join(outputDir, 'ai', 'agent');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
             }
-        }
-        else {
-            const nameParts = doc.name.split('/');
-            const leafName = nameParts.pop();
-            const folderParts = nameParts.map((part) => snakeCase(part));
-            typeDir = path.join(outputDir, doc.type, ...folderParts);
-            baseName = this.sanitizeFilename(leafName);
-            if (doc.verb) {
-                baseName = `${baseName}_${doc.verb}`;
+            case 'agent_trigger': {
+                typeDir = path.join(outputDir, 'ai', 'agent', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case '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';
+                }
+                break;
+            }
+            case 'error_trigger': {
+                // error_trigger → workspace/trigger/{name}.xs (singleton, colocated with workspace triggers)
+                typeDir = path.join(outputDir, 'workspace', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case 'mcp_server': {
+                typeDir = path.join(outputDir, 'ai', 'mcp_server');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case 'mcp_server_trigger': {
+                typeDir = path.join(outputDir, 'ai', 'mcp_server', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case 'realtime_channel': {
+                typeDir = path.join(outputDir, 'realtime', 'channel');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case '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);
+                break;
+            }
+            case 'realtime_trigger': {
+                typeDir = path.join(outputDir, 'realtime', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case 'table_trigger': {
+                typeDir = path.join(outputDir, 'table', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case 'tool': {
+                typeDir = path.join(outputDir, 'ai', 'tool');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case 'workspace': {
+                typeDir = path.join(outputDir, 'workspace');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            case 'workspace_trigger': {
+                typeDir = path.join(outputDir, 'workspace', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+                break;
+            }
+            default: {
+                if (doc.type === 'message' && doc.channel) {
+                    // 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') {
+                    const groupFolder = getApiGroupFolder(doc.name);
+                    typeDir = path.join(outputDir, 'api', groupFolder);
+                    baseName = this.sanitizeFilename(doc.name);
+                }
+                else if (doc.type === 'query' && doc.apiGroup) {
+                    const groupFolder = getApiGroupFolder(doc.apiGroup);
+                    const nameParts = doc.name.split('/');
+                    const leafName = nameParts.pop();
+                    const folderParts = nameParts.map((part) => snakeCase(part));
+                    typeDir = path.join(outputDir, 'api', groupFolder, ...folderParts);
+                    baseName = this.sanitizeFilename(leafName);
+                    if (doc.verb) {
+                        baseName = `${baseName}_${doc.verb}`;
+                    }
+                }
+                else {
+                    const nameParts = doc.name.split('/');
+                    const leafName = nameParts.pop();
+                    const folderParts = nameParts.map((part) => snakeCase(part));
+                    typeDir = path.join(outputDir, doc.type, ...folderParts);
+                    baseName = this.sanitizeFilename(leafName);
+                    if (doc.verb) {
+                        baseName = `${baseName}_${doc.verb}`;
+                    }
+                }
             }
         }
         return { baseName, typeDir };

package/dist/commands/workspace/pull/index.d.ts

@@ -5,8 +5,8 @@ export default class Pull extends BaseCommand {
     static flags: {
         branch: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         directory: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        env: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         draft: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        env: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         records: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         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>;
@@ -15,9 +15,13 @@ export default class Pull extends BaseCommand {
     };
     run(): Promise<void>;
     /**
-     * Sanitize a document name for use as a filename.
-     * Strips quotes, replaces spaces with underscores, and removes
-     * characters that are unsafe in filenames.
+     * Policy keys are unique on the server without regard to case, but an older export or a local file
+     * can still differ only in case, and file names are not case-sensitive on every checkout. The
+     * policies whose file name differs only in case from another exported policy, or from a local file
+     * it would overwrite, are left out with a warning; everything else is written. Local policy files
+     * absent from the export are kept. They are reported as stale only when this credential reads the
+     * branch's policies, because an export leaves out the policies its credential cannot read, and
+     * every policy while the Policies feature is off.
      */
-    private sanitizeFilename;
+    private policyClashes;
 }