@sanity/cli 6.1.8 → 6.2.1

package/dist/commands/init.js

@@ -50,7 +50,7 @@ import { getSanityEnv } from '../util/getSanityEnv.js';
 import { getPeerDependencies } from '../util/packageManager/getPeerDependencies.js';
 import { installDeclaredPackages, installNewPackages } from '../util/packageManager/installPackages.js';
 import { getPartialEnvWithNpmPath } from '../util/packageManager/packageManagerChoice.js';
-import { ImportDatasetCommand } from './dataset/import.js';
+import { ImportDatasetCommand } from './datasets/import.js';
 const debug = subdebug('init');
 export class InitCommand extends SanityCommand {
     static args = {
@@ -75,7 +75,7 @@ export class InitCommand extends SanityCommand {
             description: 'Initialize a project with the given project ID and dataset using the moviedb template to the given path'
         },
         {
-            command: '<%= config.bin %> <%= command.id %> -y --create-project "Movies Unlimited" --dataset moviedb --visibility private --template moviedb --output-path /Users/espenh/movies-unlimited',
+            command: '<%= config.bin %> <%= command.id %> -y --project-name "Movies Unlimited" --dataset moviedb --visibility private --template moviedb --output-path /Users/espenh/movies-unlimited',
             description: 'Create a brand new project with name "Movies Unlimited"'
         }
     ];
@@ -99,8 +99,12 @@ export class InitCommand extends SanityCommand {
             helpValue: '<code>'
         }),
         'create-project': Flags.string({
+            deprecated: {
+                message: 'Use --project-name instead'
+            },
             description: 'Create a new project with the given name',
-            helpValue: '<name>'
+            helpValue: '<name>',
+            hidden: true
         }),
         dataset: Flags.string({
             description: 'Dataset name for the studio',
@@ -139,6 +143,11 @@ export class InitCommand extends SanityCommand {
             helpLabel: '    --[no-]git',
             helpValue: '<message>'
         }),
+        'import-dataset': Flags.boolean({
+            allowNo: true,
+            default: undefined,
+            description: 'Import template sample dataset'
+        }),
         mcp: Flags.boolean({
             allowNo: true,
             default: true,
@@ -206,10 +215,19 @@ export class InitCommand extends SanityCommand {
             ],
             description: 'Project ID to use for the studio',
             exclusive: [
-                'create-project'
+                'create-project',
+                'project-name'
             ],
             helpValue: '<id>'
         }),
+        'project-name': Flags.string({
+            description: 'Create a new project with the given name',
+            exclusive: [
+                'project',
+                'create-project'
+            ],
+            helpValue: '<name>'
+        }),
         'project-plan': Flags.string({
             description: 'Optionally select a plan for a new project',
             helpValue: '<name>'
@@ -269,7 +287,7 @@ export class InitCommand extends SanityCommand {
     _trace;
     async run() {
         const workDir = process.cwd();
-        const createProjectName = this.flags['create-project'];
+        const createProjectName = this.flags['project-name'] ?? this.flags['create-project'];
         // For backwards "compatibility" - we used to allow `sanity init plugin`,
         // and no longer do - but instead of printing an error about an unknown
         // _command_, we want to acknowledge that the user is trying to do something
@@ -312,10 +330,13 @@ export class InitCommand extends SanityCommand {
                 exit: 1
             });
         }
+        const isAppTemplate = this.flags.template ? determineAppTemplate(this.flags.template) : false // Default to false
+        ;
         // Checks flags are present when in unattended mode
         if (this.isUnattended()) {
             this.checkFlagsInUnattendedMode({
                 createProjectName,
+                isAppTemplate,
                 isNextJs
             });
         }
@@ -346,8 +367,6 @@ export class InitCommand extends SanityCommand {
         const envFilename = typeof this.flags.env === 'string' ? this.flags.env : envFilenameDefault;
         // If the user isn't already autenticated, make it so
         const { user } = await this.ensureAuthenticated();
-        const isAppTemplate = this.flags.template ? determineAppTemplate(this.flags.template) : false // Default to false
-        ;
         if (!isAppTemplate) {
             this.log(`${logSymbols.success} Fetching existing projects`);
             this.log('');
@@ -401,8 +420,14 @@ export class InitCommand extends SanityCommand {
             workDir
         });
         // Set up MCP integration
+        let mcpMode = 'prompt';
+        if (!this.flags.mcp || !this.resolveIsInteractive()) {
+            mcpMode = 'skip';
+        } else if (this.flags.yes) {
+            mcpMode = 'auto';
+        }
         const mcpResult = await setupMCP({
-            skip: !this.flags.mcp
+            mode: mcpMode
         });
         this._trace.log({
             configuredEditors: mcpResult.configuredEditors,
@@ -476,7 +501,8 @@ export class InitCommand extends SanityCommand {
             });
         }
         // If the template has a sample dataset, prompt the user whether or not we should import it
-        const shouldImport = !this.isUnattended() && template?.datasetUrl && await this.promptForDatasetImport(template.importPrompt);
+        const importDatasetFlag = this.flags['import-dataset'];
+        const shouldImport = template?.datasetUrl && (importDatasetFlag ?? (!this.isUnattended() && await this.promptForDatasetImport(template.importPrompt)));
         this._trace.log({
             selectedOption: shouldImport ? 'yes' : 'no',
             step: 'importTemplateDataset'
@@ -621,8 +647,22 @@ export class InitCommand extends SanityCommand {
         }
         this._trace.complete();
     }
-    checkFlagsInUnattendedMode({ createProjectName, isNextJs }) {
+    checkFlagsInUnattendedMode({ createProjectName, isAppTemplate, isNextJs }) {
         debug('Unattended mode, validating required options');
+        // App templates only require --organization and --output-path
+        if (isAppTemplate) {
+            if (!this.flags['output-path']) {
+                this.error('`--output-path` must be specified in unattended mode', {
+                    exit: 1
+                });
+            }
+            if (!this.flags.organization) {
+                this.error('The --organization flag is required for app templates in unattended mode. ' + 'Use --organization <id> to specify which organization to use.', {
+                    exit: 1
+                });
+            }
+            return;
+        }
         if (!this.flags['dataset']) {
             this.error(`\`--dataset\` must be specified in unattended mode`, {
                 exit: 1
@@ -635,18 +675,18 @@ export class InitCommand extends SanityCommand {
             });
         }
         if (!this.flags.project && !createProjectName) {
-            this.error('`--project <id>` or `--create-project <name>` must be specified in unattended mode', {
+            this.error('`--project <id>` or `--project-name <name>` must be specified in unattended mode', {
                 exit: 1
             });
         }
         if (createProjectName && !this.flags.organization) {
-            this.error('--create-project is not supported in unattended mode without an organization, please specify an organization with `--organization <id>`', {
+            this.error('`--project-name` requires `--organization <id>` in unattended mode', {
                 exit: 1
             });
         }
     }
     async createProjectFromName({ createProjectName, planId, user }) {
-        debug('--create-project specified, creating a new project');
+        debug('--project-name specified, creating a new project');
         let orgForCreateProjectFlag = this.flags.organization;
         if (!orgForCreateProjectFlag) {
             debug('no organization specified, selecting one');
@@ -948,6 +988,18 @@ export class InitCommand extends SanityCommand {
     }
     async getProjectDetails({ isAppTemplate, newProject, planId, showDefaultConfigPrompt, user }) {
         if (isAppTemplate) {
+            // If organization flag is provided, use it directly (skip prompt and API call)
+            if (this.flags.organization) {
+                return {
+                    datasetName: '',
+                    displayName: '',
+                    isFirstProject: false,
+                    organizationId: this.flags.organization,
+                    projectId: ''
+                };
+            }
+            // Interactive mode: fetch orgs and prompt
+            // Note: unattended mode without --organization is rejected by checkFlagsInUnattendedMode
             const organizations = await listOrganizations({
                 includeImplicitMemberships: 'true',
                 includeMembers: 'true'