@xano/cli 1.2.0 → 1.3.0

package/dist/commands/tenant/env/get_all/index.js

@@ -1,7 +1,7 @@
 import { Args, Flags } from '@oclif/core';
 import * as yaml from 'js-yaml';
 import * as fs from 'node:fs';
-import * as path from 'node:path';
+import path from 'node:path';
 import BaseCommand from '../../../../base-command.js';
 export default class TenantEnvGetAll extends BaseCommand {
     static args = {

package/dist/commands/tenant/env/set_all/index.js

@@ -1,7 +1,7 @@
 import { Args, Flags } from '@oclif/core';
 import * as yaml from 'js-yaml';
 import * as fs from 'node:fs';
-import * as path from 'node:path';
+import path from 'node:path';
 import BaseCommand from '../../../../base-command.js';
 export default class TenantEnvSetAll extends BaseCommand {
     static args = {

package/dist/commands/tenant/impersonate/index.d.ts

@@ -14,6 +14,6 @@ export default class TenantImpersonate extends BaseCommand {
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
-    private getImpersonateResponse;
     private getFrontendUrl;
+    private getImpersonateResponse;
 }

package/dist/commands/tenant/impersonate/index.js

@@ -76,13 +76,26 @@ Impersonation successful!
             }
         }
     }
+    getFrontendUrl(instanceOrigin) {
+        try {
+            const url = new URL(instanceOrigin);
+            if (url.hostname === 'localhost' || url.hostname === '127.0.0.1') {
+                url.port = '4200';
+                return url.origin;
+            }
+        }
+        catch {
+            // fall through
+        }
+        return instanceOrigin;
+    }
     async getImpersonateResponse(profile, workspaceId, tenantName) {
         const apiUrl = `${profile.instance_origin}/api:meta/workspace/${workspaceId}/tenant/${encodeURIComponent(tenantName)}/impersonate`;
         const { verbose } = await this.parse(TenantImpersonate).then((r) => r.flags);
         const response = await this.verboseFetch(apiUrl, {
             headers: {
-                Authorization: `Bearer ${profile.access_token}`,
                 accept: 'application/json',
+                Authorization: `Bearer ${profile.access_token}`,
             },
             method: 'GET',
         }, verbose, profile.access_token);
@@ -96,17 +109,4 @@ Impersonation successful!
         }
         return result;
     }
-    getFrontendUrl(instanceOrigin) {
-        try {
-            const url = new URL(instanceOrigin);
-            if (url.hostname === 'localhost' || url.hostname === '127.0.0.1') {
-                url.port = '4200';
-                return url.origin;
-            }
-        }
-        catch {
-            // fall through
-        }
-        return instanceOrigin;
-    }
 }

package/dist/commands/tenant/license/get/index.js

@@ -1,6 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import * as fs from 'node:fs';
-import * as path from 'node:path';
+import path from 'node:path';
 import BaseCommand from '../../../../base-command.js';
 export default class TenantLicenseGet extends BaseCommand {
     static args = {

package/dist/commands/tenant/license/set/index.js

@@ -1,6 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import * as fs from 'node:fs';
-import * as path from 'node:path';
+import path from 'node:path';
 import BaseCommand from '../../../../base-command.js';
 export default class TenantLicenseSet extends BaseCommand {
     static args = {

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

@@ -14,10 +14,4 @@ export default class Pull extends BaseCommand {
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     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.
-     */
-    private sanitizeFilename;
 }

package/dist/commands/tenant/pull/index.js

@@ -1,9 +1,9 @@
 import { Flags } from '@oclif/core';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
 import snakeCase from 'lodash.snakecase';
+import * as fs from 'node:fs';
+import path from 'node:path';
 import BaseCommand from '../../../base-command.js';
-import { buildApiGroupFolderResolver, parseDocument } from '../../../utils/document-parser.js';
+import { buildApiGroupFolderResolver, buildChannelServerResolver, parseDocument, resolveDocumentPath, } from '../../../utils/document-parser.js';
 export default class Pull extends BaseCommand {
     static description = 'Pull a tenant multidoc from the Xano Metadata API and split into individual files';
     static examples = [
@@ -57,7 +57,7 @@ Pulled 58 documents from tenant my-tenant
     };
     async run() {
         const { flags } = await this.parse(Pull);
-        const { profileName, profile } = this.resolveProfile(flags);
+        const { profile, profileName } = this.resolveProfile(flags);
         // Determine workspace_id from flag or profile
         let workspaceId;
         if (flags.workspace) {
@@ -129,96 +129,19 @@ Pulled 58 documents from tenant my-tenant
         fs.mkdirSync(outputDir, { recursive: true });
         // Resolve api_group names to unique folder names, disambiguating collisions
         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);
         // Track filenames per type to handle duplicates
         const filenameCounters = new Map();
         let writtenCount = 0;
         for (const doc of documents) {
-            let typeDir;
-            let baseName;
-            if (doc.type === 'workspace') {
-                // workspace → workspace/{name}.xs
-                typeDir = path.join(outputDir, 'workspace');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'workspace_trigger') {
-                // workspace_trigger → workspace/trigger/{name}.xs
-                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') {
-                // agent → ai/agent/{name}.xs
-                typeDir = path.join(outputDir, 'ai', 'agent');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'mcp_server') {
-                // mcp_server → ai/mcp_server/{name}.xs
-                typeDir = path.join(outputDir, 'ai', 'mcp_server');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'tool') {
-                // tool → ai/tool/{name}.xs
-                typeDir = path.join(outputDir, 'ai', 'tool');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'agent_trigger') {
-                // agent_trigger → ai/agent/trigger/{name}.xs
-                typeDir = path.join(outputDir, 'ai', 'agent', 'trigger');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'mcp_server_trigger') {
-                // mcp_server_trigger → ai/mcp_server/trigger/{name}.xs
-                typeDir = path.join(outputDir, 'ai', 'mcp_server', 'trigger');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'table_trigger') {
-                // table_trigger → table/trigger/{name}.xs
-                typeDir = path.join(outputDir, 'table', 'trigger');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'realtime_channel') {
-                // realtime_channel → realtime/channel/{name}.xs
-                typeDir = path.join(outputDir, 'realtime', 'channel');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'realtime_trigger') {
-                // realtime_trigger → realtime/trigger/{name}.xs
-                typeDir = path.join(outputDir, 'realtime', 'trigger');
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'api_group') {
-                // api_group "test" → api/{resolved_folder}/{name}.xs
-                const groupFolder = getApiGroupFolder(doc.name);
-                typeDir = path.join(outputDir, 'api', groupFolder);
-                baseName = this.sanitizeFilename(doc.name);
-            }
-            else if (doc.type === 'query' && doc.apiGroup) {
-                // query in group "test" → api/{resolved_folder}/{query_name}.xs
-                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 {
-                // Default: split folder path from name
-                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}`;
-                }
-            }
+            const { baseName, typeDir } = resolveDocumentPath(doc, outputDir, {
+                getApiGroupFolder,
+                getChannelServer,
+                join: path.join,
+                snakeCase,
+            });
             fs.mkdirSync(typeDir, { recursive: true });
             // Track duplicates per directory
             const dirKey = path.relative(outputDir, typeDir);
@@ -229,20 +152,11 @@ Pulled 58 documents from tenant my-tenant
             const count = typeCounters.get(baseName) || 0;
             typeCounters.set(baseName, count + 1);
             // Append numeric suffix for duplicates
-            let filename;
-            filename = count === 0 ? `${baseName}.xs` : `${baseName}_${count + 1}.xs`;
+            const filename = count === 0 ? `${baseName}.xs` : `${baseName}_${count + 1}.xs`;
             const filePath = path.join(typeDir, filename);
             fs.writeFileSync(filePath, doc.content, 'utf8');
             writtenCount++;
         }
         this.log(`Pulled ${writtenCount} documents from tenant ${tenantName} to ${flags.directory}`);
     }
-    /**
-     * Sanitize a document name for use as a filename.
-     * Strips quotes, replaces spaces with underscores, and removes
-     * characters that are unsafe in filenames.
-     */
-    sanitizeFilename(name) {
-        return snakeCase(name.replaceAll('"', ''));
-    }
 }

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>;
@@ -14,10 +14,4 @@ export default class Pull extends BaseCommand {
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     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.
-     */
-    private sanitizeFilename;
 }