create-nx-workspace 22.5.2 → 22.5.4

package/bin/create-nx-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-nx-workspace.d.ts","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/bin/create-nx-workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-nx-workspace.d.ts","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/bin/create-nx-workspace.ts"],"names":[],"mappings":"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"}

package/bin/create-nx-workspace.js

@@ -165,7 +165,7 @@ exports.commandsObject = yargs
         const errorCode = error instanceof error_utils_1.CnwError ? error.code : 'UNKNOWN';
         const errorMessage = error instanceof Error ? error.message : String(error);
         const errorFile = error instanceof Error ? extractErrorFile(error) : undefined;
-        useCloud = argv.nxCloud !== 'skip';
+        useCloud = argv.nxCloud !== 'skip' && argv.nxCloud !== 'never';
         await (0, ab_testing_1.recordStat)({
             nxVersion: nx_version_1.nxVersion,
             command: 'create-nx-workspace',
@@ -276,7 +276,7 @@ async function main(parsedArgs) {
     await (0, ab_testing_1.recordStat)({
         nxVersion: nx_version_1.nxVersion,
         command: 'create-nx-workspace',
-        useCloud: parsedArgs.nxCloud !== 'skip',
+        useCloud: parsedArgs.nxCloud !== 'skip' && parsedArgs.nxCloud !== 'never',
         meta: {
             type: 'complete',
             flowVariant: (0, ab_testing_1.getFlowVariant)(),
@@ -404,7 +404,7 @@ async function normalizeArgsMiddleware(argv) {
     await (0, ab_testing_1.recordStat)({
         nxVersion: nx_version_1.nxVersion,
         command: 'create-nx-workspace',
-        useCloud: argv.nxCloud !== 'skip',
+        useCloud: argv.nxCloud !== 'skip' && argv.nxCloud !== 'never',
         meta: {
             type: 'start',
             flowVariant: (0, ab_testing_1.getFlowVariant)(),
@@ -424,23 +424,36 @@ async function normalizeArgsMiddleware(argv) {
             const ghAvailable = (0, git_1.isGhCliAvailable)();
             let nxCloud;
             let completionMessageKey;
+            let skipCloudConnect = false;
+            let neverConnectToCloud = false;
             if (argv.skipGit === true) {
                 nxCloud = 'skip';
                 completionMessageKey = undefined;
             }
             else {
-                // Always show cloud prompt with "full platform" message (CLOUD-4147)
-                // Flow variant only affects completion banners, not this prompt
-                nxCloud = await (0, prompts_1.determineNxCloudV2)(argv);
+                const cloudChoice = await (0, prompts_1.determineNxCloudV2)(argv);
+                if (cloudChoice === 'yes') {
+                    nxCloud = 'yes';
+                    skipCloudConnect = false;
+                }
+                else if (cloudChoice === 'skip') {
+                    nxCloud = 'skip';
+                }
+                else {
+                    nxCloud = 'never';
+                    neverConnectToCloud = true;
+                }
                 completionMessageKey =
-                    nxCloud === 'skip' ? undefined : (0, ab_testing_1.getCompletionMessageKeyForVariant)();
+                    cloudChoice === 'never'
+                        ? undefined
+                        : (0, ab_testing_1.getCompletionMessageKeyForVariant)();
             }
             packageManager = argv.packageManager ?? (0, package_manager_1.detectInvokedPackageManager)();
             Object.assign(argv, {
                 nxCloud,
-                useGitHub: nxCloud !== 'skip',
-                // Deferred connection: skip cloud connect but show banner (CLOUD-4255)
-                skipCloudConnect: nxCloud !== 'skip',
+                useGitHub: nxCloud !== 'skip' && nxCloud !== 'never',
+                skipCloudConnect,
+                neverConnectToCloud,
                 completionMessageKey,
                 packageManager,
                 defaultBase: 'main',
@@ -450,7 +463,7 @@ async function normalizeArgsMiddleware(argv) {
             await (0, ab_testing_1.recordStat)({
                 nxVersion: nx_version_1.nxVersion,
                 command: 'create-nx-workspace',
-                useCloud: nxCloud !== 'skip',
+                useCloud: nxCloud !== 'skip' && nxCloud !== 'never',
                 meta: {
                     type: 'precreate',
                     flowVariant: (0, ab_testing_1.getFlowVariant)(),
@@ -482,38 +495,14 @@ async function normalizeArgsMiddleware(argv) {
             packageManager = await (0, prompts_1.determinePackageManager)(argv);
             const aiAgents = await (0, prompts_1.determineAiAgents)(argv);
             const defaultBase = await (0, prompts_1.determineDefaultBase)(argv);
-            // Check if CLI arg was provided (use rawArgs to check original input)
-            const cliNxCloudArgProvided = rawArgs.nxCloud !== undefined;
-            let nxCloud;
-            let useGitHub;
-            let completionMessageKey;
-            let skipCloudConnect = false;
-            if (argv.skipGit === true) {
-                nxCloud = 'skip';
-                useGitHub = undefined;
-            }
-            else if (cliNxCloudArgProvided) {
-                // CLI arg provided: use existing flow (CI provider selection if needed)
-                nxCloud = await (0, prompts_1.determineNxCloud)(argv);
-                useGitHub =
-                    nxCloud === 'skip'
-                        ? undefined
-                        : nxCloud === 'github' || (await (0, prompts_1.determineIfGitHubWillBeUsed)(argv));
-            }
-            else {
-                // No CLI arg: use simplified prompt (same as template flow)
-                nxCloud = await (0, prompts_1.determineNxCloudV2)(argv);
-                useGitHub = nxCloud !== 'skip';
-                completionMessageKey =
-                    nxCloud === 'skip' ? undefined : (0, ab_testing_1.getCompletionMessageKeyForVariant)();
-                // Deferred connection: skip cloud connect but show banner (CLOUD-4255)
-                skipCloudConnect = nxCloud !== 'skip';
-            }
+            // NXC-4020: Restored v22.1.3 simple flow (CI prompt → caching fallback)
+            const nxCloud = argv.skipGit === true ? 'skip' : await (0, prompts_1.determineNxCloud)(argv);
+            const useGitHub = nxCloud === 'skip'
+                ? undefined
+                : nxCloud === 'github' || (await (0, prompts_1.determineIfGitHubWillBeUsed)(argv));
             Object.assign(argv, {
                 nxCloud,
                 useGitHub,
-                skipCloudConnect,
-                completionMessageKey,
                 packageManager,
                 defaultBase,
                 aiAgents,
@@ -522,7 +511,7 @@ async function normalizeArgsMiddleware(argv) {
             await (0, ab_testing_1.recordStat)({
                 nxVersion: nx_version_1.nxVersion,
                 command: 'create-nx-workspace',
-                useCloud: nxCloud !== 'skip',
+                useCloud: nxCloud !== 'skip' && nxCloud !== 'never',
                 meta: {
                     type: 'precreate',
                     flowVariant: (0, ab_testing_1.getFlowVariant)(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "22.5.2",
+  "version": "22.5.4",
   "private": false,
   "description": "Smart Monorepos · Fast Builds",
   "repository": {

package/src/create-workspace-options.d.ts

@@ -41,10 +41,15 @@ export interface CreateWorkspaceOptions {
     cliName?: string;
     aiAgents?: Agent[];
     /**
-     * @description Skip cloud connection (variant 1 experiment - NXC-3628)
+     * @description Skip cloud connection (deferred - show banner but don't write nxCloudId)
      * @default false
      */
     skipCloudConnect?: boolean;
+    /**
+     * @description Set neverConnectToCloud in nx.json (full opt-out)
+     * @default false
+     */
+    neverConnectToCloud?: boolean;
     /**
      * @description Whether GitHub CLI (gh) is available on the system (for telemetry)
      */

package/src/create-workspace-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace-options.d.ts","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-workspace-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IACnB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,eAAe,yEAOlB,CAAC;AACX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AACrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAOjD,CAAC"}
+{"version":3,"file":"create-workspace-options.d.ts","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-workspace-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IACnB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,eAAe,yEAOlB,CAAC;AACX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AACrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAOjD,CAAC"}

package/src/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-workspace.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAC;AA2BzB,wBAAgB,4BAA4B,IAAI;IAC9C,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC,CAEA;AAED,wBAAsB,eAAe,CAAC,CAAC,SAAS,sBAAsB,EACpE,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,CAAC;;;;;GAuPZ;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI7D"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-workspace.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAC;AA4BzB,wBAAgB,4BAA4B,IAAI;IAC9C,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC,CAEA;AAED,wBAAsB,eAAe,CAAC,CAAC,SAAS,sBAAsB,EACpE,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,CAAC;;;;;GA+QZ;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI7D"}

package/src/create-workspace.js

@@ -82,26 +82,25 @@ async function createWorkspace(preset, options, rawArgs) {
             throw e;
         }
         // Connect to Nx Cloud for template flow
-        // For variant 1 (NXC-3628): Skip connection, use GitHub flow for URL generation
-        if (nxCloud !== 'skip' && !options.skipCloudConnect) {
+        if (nxCloud !== 'skip' &&
+            nxCloud !== 'never' &&
+            !options.skipCloudConnect) {
             await (0, nx_cloud_1.connectToNxCloudForTemplate)(directory, 'create-nx-workspace', useGitHub);
         }
     }
     else {
-        // Preset flow - existing behavior
+        // NXC-4020: Preset flow — restored to match v22.1.3
         if (!preset) {
             throw new Error('Preset is required when not using a template. Please provide --preset or --template.');
         }
         const tmpDir = await (0, create_sandbox_1.createSandbox)(packageManager);
         const workspaceGlobs = getWorkspaceGlobsFromPreset(preset);
-        // nx new requires a preset currently. We should probably make it optional.
+        // NXC-4020: Pass actual nxCloud value (v22.1.3 behavior) so nxCloudId is set in nx.json
+        // Previous: nxCloud: 'skip' override to defer cloud connection
         directory = await (0, create_empty_workspace_1.createEmptyWorkspace)(tmpDir, name, packageManager, {
             ...options,
             preset,
             workspaceGlobs,
-            // We want new workspaces to have a short URL to finish Cloud onboarding, but not have nxCloudId set up since it will be handled as part of the onboarding flow.
-            // This is skipping nxCloudId for the "custom" flow.
-            nxCloud: 'skip',
         });
         // Mark workspace as ready for SIGINT handler
         workspaceDirectory = directory;
@@ -114,11 +113,33 @@ async function createWorkspace(preset, options, rawArgs) {
         }
     }
     const isTemplate = !!options.template;
-    // Generate CI for preset flow (not template)
-    // When nxCloud === 'yes' (from simplified prompt), use GitHub as the CI provider
-    if (nxCloud !== 'skip' && !isTemplate) {
-        const ciProvider = nxCloud === 'yes' ? 'github' : nxCloud;
-        await (0, setup_ci_1.setupCI)(directory, ciProvider, packageManager);
+    // Handle "Never" opt-out: set neverConnectToCloud in nx.json
+    if (options.neverConnectToCloud) {
+        (0, nx_cloud_1.setNeverConnectToCloud)(directory);
+    }
+    // NXC-4020: Preset flow cloud handling matches v22.1.3 exactly:
+    // 1. Read token (cloud was connected during createEmptyWorkspace)
+    // 2. Setup CI for specific providers (not 'yes')
+    // 3. Generate onboarding URL
+    // 4. Git init with connectUrl
+    // 5. Show completion message
+    let connectUrl;
+    let nxCloudInfo;
+    if (!isTemplate && nxCloud !== 'skip' && nxCloud !== 'never') {
+        const token = (0, nx_cloud_1.readNxCloudToken)(directory);
+        if (nxCloud !== 'yes') {
+            await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager);
+        }
+        connectUrl = await (0, nx_cloud_1.createNxCloudOnboardingUrl)(nxCloud, token, directory, useGitHub);
+        // Store for SIGINT handler
+        cloudConnectUrl = connectUrl;
+    }
+    // Template flow: CI setup and cloud connection handled separately
+    if (isTemplate &&
+        nxCloud !== 'skip' &&
+        nxCloud !== 'never' &&
+        nxCloud !== 'yes') {
+        await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager);
     }
     let pushedToVcs = git_1.VcsPushStatus.SkippedGit;
     if (!skipGit) {
@@ -127,13 +148,11 @@ async function createWorkspace(preset, options, rawArgs) {
             (0, ai_output_1.logProgress)('initializing', 'Initializing git repository...');
         }
         try {
-            await (0, git_1.initializeGitRepo)(directory, { defaultBase, commit });
-            // Push to GitHub if commit was made, GitHub push is not skipped, and:
-            // - CI provider is GitHub (preset flow with CLI arg), OR
-            // - Nx Cloud enabled via simplified prompt (nxCloud === 'yes')
-            if (commit &&
-                !skipGitHubPush &&
-                (nxCloud === 'github' || nxCloud === 'yes')) {
+            // NXC-4020: Pass connectUrl to git init (v22.1.3 behavior)
+            await (0, git_1.initializeGitRepo)(directory, { defaultBase, commit, connectUrl });
+            // NXC-4020: Only push for github CI provider (v22.1.3 behavior)
+            // Previous: also pushed for nxCloud === 'yes'
+            if (commit && !skipGitHubPush && nxCloud === 'github') {
                 pushedToVcs = await (0, git_1.pushToGitHub)(directory, {
                     skipGitHubPush,
                     name,
@@ -144,60 +163,52 @@ async function createWorkspace(preset, options, rawArgs) {
         }
         catch (e) {
             if (e instanceof Error) {
-                if (!aiMode) {
+                if (!(0, ai_output_1.isAiAgent)()) {
                     output_1.output.error({
                         title: 'Could not initialize git repository',
                         bodyLines: (0, error_utils_1.mapErrorToBodyLines)(e),
                     });
                 }
-                // In AI mode, error will be handled by the caller
             }
             else {
                 console.error(e);
             }
         }
     }
-    // Create onboarding URL AFTER git operations so getVcsRemoteInfo() can detect the repo
-    let connectUrl;
-    let nxCloudInfo;
-    if (nxCloud !== 'skip') {
-        const aiModeForCloud = (0, ai_output_1.isAiAgent)();
-        if (aiModeForCloud) {
-            (0, ai_output_1.logProgress)('configuring', 'Configuring Nx Cloud...');
-        }
-        // For variant 1 (skipCloudConnect=true): Skip readNxCloudToken() entirely
-        // - We didn't call connectToNxCloudForTemplate(), so no token exists
-        // - The spinner message "Checking Nx Cloud setup" would be misleading
-        // - createNxCloudOnboardingUrl() uses GitHub flow which sends accessToken: null
-        //
-        // For variant 0: Read the token as before (cloud was connected)
-        const token = options.skipCloudConnect
-            ? undefined
-            : (0, nx_cloud_1.readNxCloudToken)(directory);
-        connectUrl = await (0, nx_cloud_1.createNxCloudOnboardingUrl)(nxCloud, token, directory, useGitHub);
-        // Store for SIGINT handler
-        cloudConnectUrl = connectUrl;
-        // Update README with connect URL (strips markers, adds connect section)
-        // Then commit the change - amend if not pushed, new commit if already pushed
-        if (isTemplate) {
+    // NXC-4020: Preset flow completion message matches v22.1.3
+    if (!isTemplate && connectUrl) {
+        nxCloudInfo = await (0, nx_cloud_1.getNxCloudInfo)(nxCloud, connectUrl, pushedToVcs, rawArgs?.nxCloud);
+    }
+    // Template flow: cloud URL generation and completion message
+    if (isTemplate) {
+        if (nxCloud !== 'skip' && nxCloud !== 'never') {
+            const aiModeForCloud = (0, ai_output_1.isAiAgent)();
+            if (aiModeForCloud) {
+                (0, ai_output_1.logProgress)('configuring', 'Configuring Nx Cloud...');
+            }
+            const token = options.skipCloudConnect
+                ? undefined
+                : (0, nx_cloud_1.readNxCloudToken)(directory);
+            connectUrl = await (0, nx_cloud_1.createNxCloudOnboardingUrl)(nxCloud, token, directory, useGitHub);
+            cloudConnectUrl = connectUrl;
             const readmeUpdated = (0, update_readme_1.addConnectUrlToReadme)(directory, connectUrl);
             if (readmeUpdated && !skipGit && commit) {
                 const alreadyPushed = pushedToVcs === git_1.VcsPushStatus.PushedToVcs;
                 await (0, update_readme_1.amendOrCommitReadme)(directory, alreadyPushed);
             }
+            nxCloudInfo = await (0, nx_cloud_1.getNxCloudInfo)(nxCloud, connectUrl, pushedToVcs);
         }
-        nxCloudInfo = await (0, nx_cloud_1.getNxCloudInfo)(connectUrl, pushedToVcs, options.completionMessageKey, name);
-    }
-    else if (isTemplate && nxCloud === 'skip') {
-        // Strip marker comments from README even when cloud is skipped
-        // so users don't see raw <!-- BEGIN/END: nx-cloud --> markers
-        const readmeUpdated = (0, update_readme_1.addConnectUrlToReadme)(directory, undefined);
-        if (readmeUpdated && !skipGit && commit) {
-            const alreadyPushed = pushedToVcs === git_1.VcsPushStatus.PushedToVcs;
-            await (0, update_readme_1.amendOrCommitReadme)(directory, alreadyPushed);
+        else {
+            // Strip marker comments from README
+            const readmeUpdated = (0, update_readme_1.addConnectUrlToReadme)(directory, undefined);
+            if (readmeUpdated && !skipGit && commit) {
+                const alreadyPushed = pushedToVcs === git_1.VcsPushStatus.PushedToVcs;
+                await (0, update_readme_1.amendOrCommitReadme)(directory, alreadyPushed);
+            }
+            if (nxCloud === 'skip') {
+                nxCloudInfo = (0, nx_cloud_1.getSkippedNxCloudInfo)();
+            }
         }
-        // Show nx connect message when user skips cloud in template flow
-        nxCloudInfo = (0, nx_cloud_1.getSkippedNxCloudInfo)();
     }
     return {
         nxCloudInfo,

package/src/internal-utils/prompts.d.ts

@@ -8,7 +8,7 @@ export declare function determineNxCloud(parsedArgs: yargs.Arguments<{
 export declare function determineNxCloudV2(parsedArgs: yargs.Arguments<{
     nxCloud?: string;
     interactive?: boolean;
-}>): Promise<'github' | 'skip'>;
+}>): Promise<'yes' | 'skip' | 'never'>;
 export declare function determineIfGitHubWillBeUsed(parsedArgs: yargs.Arguments<{
     nxCloud: NxCloud;
     useGitHub?: boolean;

package/src/internal-utils/prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../../../packages/create-nx-workspace/src/internal-utils/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,EAEL,cAAc,EAEf,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EACL,KAAK,EAGN,MAAM,6BAA6B,CAAC;AAGrC,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,GAChD,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACvE,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,CAc5B;AAED,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACrE,OAAO,CAAC,OAAO,CAAC,CAelB;AA4BD,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC,GACD,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,CA4C5B;AAED,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACzE,OAAO,CAAC,KAAK,EAAE,CAAC,CAElB;AAqBD,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACpD,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAED,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,GACtD,OAAO,CAAC,cAAc,CAAC,CAiCzB"}
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../../../packages/create-nx-workspace/src/internal-utils/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,EAEL,cAAc,EAEf,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EACL,KAAK,EAGN,MAAM,6BAA6B,CAAC;AAGrC,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,GAChD,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACvE,OAAO,CAAC,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC,CAiBnC;AAED,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACrE,OAAO,CAAC,OAAO,CAAC,CAelB;AA4BD,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC,GACD,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,CAG5B;AAED,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GACzE,OAAO,CAAC,KAAK,EAAE,CAAC,CAElB;AAqBD,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACpD,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAED,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,GACtD,OAAO,CAAC,cAAc,CAAC,CAiCzB"}

package/src/internal-utils/prompts.js

@@ -11,7 +11,6 @@ const enquirer = require("enquirer");
 const chalk = require("chalk");
 const ab_testing_1 = require("../utils/nx/ab-testing");
 const default_base_1 = require("../utils/git/default-base");
-const git_1 = require("../utils/git/git");
 const package_manager_1 = require("../utils/package-manager");
 const string_utils_1 = require("../utils/string-utils");
 const is_ci_1 = require("../utils/ci/is-ci");
@@ -31,15 +30,22 @@ async function determineNxCloud(parsedArgs) {
 async function determineNxCloudV2(parsedArgs) {
     // Provided via flag
     if (parsedArgs.nxCloud) {
-        return parsedArgs.nxCloud === 'skip' ? 'skip' : 'github';
+        if (parsedArgs.nxCloud === 'skip')
+            return 'skip';
+        if (parsedArgs.nxCloud === 'never')
+            return 'never';
+        return 'yes';
     }
     // Non-interactive mode
     if (!parsedArgs.interactive || (0, is_ci_1.isCI)()) {
         return 'skip';
     }
-    // Auto-select GitHub flow for deferred connection (variant 2 locked in - CLOUD-4255)
-    // Note: skipCloudConnect=true prevents actual connection, but we still get the banner
-    return 'github';
+    const result = await nxCloudPrompt('setupNxCloudV2');
+    if (result === 'never')
+        return 'never';
+    if (result === 'skip')
+        return 'skip';
+    return 'yes';
 }
 async function determineIfGitHubWillBeUsed(parsedArgs) {
     if (parsedArgs.nxCloud === 'yes' || parsedArgs.nxCloud === 'circleci') {
@@ -83,47 +89,7 @@ async function nxCloudPrompt(key) {
 async function determineTemplate(parsedArgs) {
     if (parsedArgs.template)
         return parsedArgs.template;
-    if (parsedArgs.preset)
-        return 'custom';
-    if (!parsedArgs.interactive || (0, is_ci_1.isCI)())
-        return 'custom';
-    // Docs generation needs preset flow to document all presets
-    if (process.env.NX_GENERATE_DOCS_PROCESS === 'true')
-        return 'custom';
-    // Template flow requires git for cloning - fall back to custom preset if git is not available
-    if (!(0, git_1.isGitAvailable)())
-        return 'custom';
-    const { template } = await enquirer.prompt([
-        {
-            name: 'template',
-            message: 'Which starter do you want to use?',
-            type: 'autocomplete',
-            choices: [
-                {
-                    name: 'nrwl/empty-template',
-                    message: 'Minimal           (empty monorepo without projects)',
-                },
-                {
-                    name: 'nrwl/react-template',
-                    message: 'React             (fullstack monorepo with React and Express)',
-                },
-                {
-                    name: 'nrwl/angular-template',
-                    message: 'Angular           (fullstack monorepo with Angular and Express)',
-                },
-                {
-                    name: 'nrwl/typescript-template',
-                    message: 'NPM Packages      (monorepo with TypeScript packages ready to publish)',
-                },
-                {
-                    name: 'custom',
-                    message: 'Custom            (advanced setup with additional frameworks)',
-                },
-            ],
-            initial: 0,
-        },
-    ]);
-    return template;
+    return 'custom';
 }
 async function determineAiAgents(parsedArgs) {
     return parsedArgs.aiAgents ?? [];

package/src/utils/nx/ab-testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ab-testing.d.ts","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/ab-testing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ab-testing.d.ts","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/ab-testing.ts"],"names":[],"mappings":"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"}

package/src/utils/nx/ab-testing.js

@@ -133,16 +133,7 @@ function isEnterpriseCloudUrl(cloudUrl) {
  * @param cloudUrl - The Nx Cloud URL. If enterprise, always returns '0'.
  */
 function getBannerVariant(cloudUrl) {
-    // Enterprise URLs always get plain link (variant 0)
-    if (isEnterpriseCloudUrl(cloudUrl)) {
-        return '0';
-    }
-    // Docs generation uses variant 0 for deterministic output
-    if (process.env.NX_GENERATE_DOCS_PROCESS === 'true') {
-        return '0';
-    }
-    // Standard URLs get variant 2 banner
-    return '2';
+    return '0';
 }
 exports.NxCloudChoices = [
     'github',
@@ -151,6 +142,7 @@ exports.NxCloudChoices = [
     'bitbucket-pipelines',
     'circleci',
     'skip',
+    'never',
     'yes', // Deprecated but still handled
 ];
 const messageOptions = {
@@ -177,72 +169,35 @@ const messageOptions = {
     ],
     /**
      * These messages are a fallback for setting up CI as well as when migrating major versions
-     * Locked to "full platform" messaging (CLOUD-4235)
+     * NXC-4020: Restored to v22.1.3 wording
      */
     setupNxCloud: [
         {
-            code: 'cloud-v2-full-platform-visit',
-            message: 'Try the full Nx platform?',
+            code: 'enable-caching2',
+            message: 'Would you like remote caching to make your build faster?',
             initial: 0,
             choices: [
                 { value: 'yes', name: 'Yes' },
-                { value: 'skip', name: 'Skip' },
+                { value: 'skip', name: 'No - I would not like remote caching' },
             ],
-            footer: '\nAutomatically fix broken PRs, 70% faster CI: https://nx.dev/nx-cloud',
+            footer: '\nRead more about remote caching at https://nx.dev/ci/features/remote-cache',
+            hint: '(can be disabled any time)',
             fallback: undefined,
-            completionMessage: 'platform-setup',
+            completionMessage: 'cache-setup',
         },
     ],
     /**
      * Simplified Cloud prompt for template flow
      */
     setupNxCloudV2: [
-        //{
-        //  code: 'cloud-v2-remote-cache-visit',
-        //  message: 'Enable remote caching with Nx Cloud?',
-        //  initial: 0,
-        //  choices: [
-        //    { value: 'yes', name: 'Yes' },
-        //    { value: 'skip', name: 'Skip' },
-        //  ],
-        //  footer:
-        //    '\nRemote caching makes your builds faster for development and in CI: https://nx.dev/ci/features/remote-cache',
-        //  fallback: undefined,
-        //  completionMessage: 'cache-setup',
-        //},
-        //{
-        //  code: 'cloud-v2-fast-ci-visit',
-        //  message: 'Speed up CI and reduce compute costs with Nx Cloud?',
-        //  initial: 0,
-        //  choices: [
-        //    { value: 'yes', name: 'Yes' },
-        //    { value: 'skip', name: 'Skip' },
-        //  ],
-        //  footer:
-        //    '\n70% faster CI, 60% less compute, Automatically fix broken PRs: https://nx.dev/nx-cloud',
-        //  fallback: undefined,
-        //  completionMessage: 'ci-setup',
-        //},
-        //{
-        //  code: 'cloud-v2-green-prs-visit',
-        //  message: 'Get to green PRs faster with Nx Cloud?',
-        //  initial: 0,
-        //  choices: [
-        //    { value: 'yes', name: 'Yes' },
-        //    { value: 'skip', name: 'Skip' },
-        //  ],
-        //  footer:
-        //    '\nAutomatically fix broken PRs, 70% faster CI: https://nx.dev/nx-cloud',
-        //  fallback: undefined,
-        //  completionMessage: 'ci-setup',
-        //},
         {
-            code: 'cloud-v2-full-platform-visit',
-            message: 'Try the full Nx platform?',
+            code: 'connect-to-cloud',
+            message: 'Connect to Nx Cloud?',
             initial: 0,
             choices: [
                 { value: 'yes', name: 'Yes' },
-                { value: 'skip', name: 'Skip' },
+                { value: 'skip', name: 'Skip for now' },
+                { value: 'never', name: "No, don't ask again" },
             ],
             footer: '\nAutomatically fix broken PRs, 70% faster CI: https://nx.dev/nx-cloud',
             fallback: undefined,

package/src/utils/nx/messages.d.ts

@@ -14,7 +14,7 @@ declare const completionMessages: {
         readonly title: "Your CI setup is almost complete.";
     };
     readonly 'cache-setup': {
-        readonly title: "Your remote cache setup is almost complete.";
+        readonly title: "Your remote cache is almost complete.";
     };
     readonly 'platform-setup': {
         readonly title: "Your platform setup is almost complete.";

package/src/utils/nx/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG,GAAG,GAAG,GAAG,CAAC;AAuDtC;;;GAGG;AACH,QAAA,MAAM,kBAAkB;;;;;;;;;;CAUd,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,kBAAkB,CAAC;AAEnE,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,oBAAoB,GAAG,SAAS,EACtD,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,WAAW,EAAE,aAAa,EAC1B,aAAa,CAAC,EAAE,MAAM,EACtB,aAAa,CAAC,EAAE,aAAa,GAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CA2BxC;AAED,wBAAgB,sBAAsB,IAAI;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAUA"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG,GAAG,GAAG,GAAG,CAAC;AAiDtC;;;GAGG;AACH,QAAA,MAAM,kBAAkB;;;;;;;;;;CAWd,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,kBAAkB,CAAC;AAEnE,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,oBAAoB,GAAG,SAAS,EACtD,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,WAAW,EAAE,aAAa,EAC1B,aAAa,CAAC,EAAE,MAAM,EACtB,aAAa,CAAC,EAAE,aAAa,GAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CA2BxC;AAED,wBAAgB,sBAAsB,IAAI;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAUA"}

package/src/utils/nx/messages.js

@@ -7,7 +7,7 @@ const git_1 = require("../git/git");
  * Generates a simple box banner with the setup URL.
  */
 function generateSimpleBanner(url) {
-    const content = `Finish your set up here: ${url}`;
+    const content = `Finish setup: ${url}`;
     // Add padding around content (3 spaces on each side)
     const innerWidth = content.length + 6;
     const horizontalBorder = '+' + '-'.repeat(innerWidth) + '+';
@@ -32,19 +32,15 @@ function getBannerLines(variant, url) {
     // Variant 0: plain link (no banner)
     return [];
 }
-function getSetupMessage(url, pushedToVcs, workspaceName) {
-    const githubUrl = workspaceName
-        ? `https://github.com/new?name=${encodeURIComponent(workspaceName)}`
-        : 'https://github.com/new';
+function getSetupMessage(url, pushedToVcs) {
     if (pushedToVcs === git_1.VcsPushStatus.PushedToVcs) {
         return url
             ? `Go to Nx Cloud and finish the setup: ${url}`
             : 'Return to Nx Cloud and finish the setup.';
     }
-    // User needs to push first
     const action = url ? 'go' : 'return';
     const urlSuffix = url ? `: ${url}` : '.';
-    return `Push your repo (${githubUrl}), then ${action} to Nx Cloud and finish the setup${urlSuffix}`;
+    return `Push your repo, then ${action} to Nx Cloud and finish the setup${urlSuffix}`;
 }
 /**
  * Completion messages shown after workspace creation.
@@ -55,7 +51,8 @@ const completionMessages = {
         title: 'Your CI setup is almost complete.',
     },
     'cache-setup': {
-        title: 'Your remote cache setup is almost complete.',
+        // NXC-4020: Restored to v22.1.3 wording (was "Your remote cache setup is almost complete.")
+        title: 'Your remote cache is almost complete.',
     },
     'platform-setup': {
         title: 'Your platform setup is almost complete.',
@@ -79,7 +76,7 @@ function getCompletionMessage(completionMessageKey, url, pushedToVcs, workspaceN
         }
     }
     // Variant 0 (control) or fallback: plain link message
-    const bodyLines = [getSetupMessage(url, pushedToVcs, workspaceName)];
+    const bodyLines = [getSetupMessage(url, pushedToVcs)];
     return {
         title,
         bodyLines,

package/src/utils/nx/nx-cloud.d.ts

@@ -1,9 +1,9 @@
 import { VcsPushStatus } from '../git/git';
-import { CompletionMessageKey } from './messages';
-export type NxCloud = 'yes' | 'github' | 'gitlab' | 'azure' | 'bitbucket-pipelines' | 'circleci' | 'skip';
+export type NxCloud = 'yes' | 'github' | 'gitlab' | 'azure' | 'bitbucket-pipelines' | 'circleci' | 'skip' | 'never';
 export declare function connectToNxCloudForTemplate(directory: string, installationSource: string, useGitHub?: boolean): Promise<string | null>;
 export declare function readNxCloudToken(directory: string): string;
 export declare function createNxCloudOnboardingUrl(nxCloud: NxCloud, token: string | undefined, directory: string, useGitHub?: boolean): Promise<string>;
-export declare function getNxCloudInfo(connectCloudUrl: string, pushedToVcs: VcsPushStatus, completionMessageKey?: CompletionMessageKey, workspaceName?: string): Promise<string>;
+export declare function getNxCloudInfo(nxCloud: NxCloud, connectCloudUrl: string, pushedToVcs: VcsPushStatus, rawNxCloud?: NxCloud): Promise<string>;
 export declare function getSkippedNxCloudInfo(): string;
+export declare function setNeverConnectToCloud(directory: string): void;
 //# sourceMappingURL=nx-cloud.d.ts.map

package/src/utils/nx/nx-cloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/nx-cloud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,EAGL,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAKpB,MAAM,MAAM,OAAO,GACf,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,qBAAqB,GACrB,UAAU,GACV,MAAM,CAAC;AAEX,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,kBAAkB,EAAE,MAAM,EAC1B,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BxB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,UAgBjD;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC,CAgCjB;AAED,wBAAsB,cAAc,CAClC,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,aAAa,EAC1B,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,aAAa,CAAC,EAAE,MAAM,mBAuBvB;AAED,wBAAgB,qBAAqB,WAIpC"}
+{"version":3,"file":"nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/nx-cloud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAO3C,MAAM,MAAM,OAAO,GACf,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,qBAAqB,GACrB,UAAU,GACV,MAAM,GACN,OAAO,CAAC;AAEZ,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,kBAAkB,EAAE,MAAM,EAC1B,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BxB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,UAiBjD;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC,CAgCjB;AAKD,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,aAAa,EAC1B,UAAU,CAAC,EAAE,OAAO,mBAUrB;AAED,wBAAgB,qBAAqB,WAIpC;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAO9D"}

package/src/utils/nx/nx-cloud.js

@@ -5,6 +5,7 @@ exports.readNxCloudToken = readNxCloudToken;
 exports.createNxCloudOnboardingUrl = createNxCloudOnboardingUrl;
 exports.getNxCloudInfo = getNxCloudInfo;
 exports.getSkippedNxCloudInfo = getSkippedNxCloudInfo;
+exports.setNeverConnectToCloud = setNeverConnectToCloud;
 const output_1 = require("../output");
 const messages_1 = require("./messages");
 const ab_testing_1 = require("./ab-testing");
@@ -41,7 +42,8 @@ function readNxCloudToken(directory) {
     // nx-ignore-next-line
     ));
     const { accessToken, nxCloudId } = getCloudOptions(directory);
-    nxCloudSpinner.succeed('Nx Cloud configuration was successfully added');
+    // NXC-4020: Restored to v22.1.3 wording
+    nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
     return accessToken || nxCloudId;
 }
 async function createNxCloudOnboardingUrl(nxCloud, token, directory, useGitHub) {
@@ -62,21 +64,17 @@ async function createNxCloudOnboardingUrl(nxCloud, token, directory, useGitHub)
     return createNxCloudOnboardingURL(source, token, meta, false, useGitHub ??
         (nxCloud === 'yes' || nxCloud === 'github' || nxCloud === 'circleci'), directory);
 }
-async function getNxCloudInfo(connectCloudUrl, pushedToVcs, completionMessageKey, workspaceName) {
+// NXC-4020: Restored v22.1.3 signature — determines message from nxCloud value,
+// uses rawNxCloud to decide whether to show URL (hide when user passed --nxCloud explicitly).
+// Previous signature: (connectCloudUrl, pushedToVcs, completionMessageKey?, workspaceName?)
+async function getNxCloudInfo(nxCloud, connectCloudUrl, pushedToVcs, rawNxCloud) {
+    const completionMessageKey = nxCloud === 'yes' ? 'cache-setup' : 'ci-setup';
     const out = new output_1.CLIOutput(false);
-    // Get the banner variant based on the cloud URL
-    // Enterprise URLs automatically get variant 0 (plain link)
-    const bannerVariant = (0, ab_testing_1.getBannerVariant)(connectCloudUrl);
-    const message = (0, messages_1.getCompletionMessage)(completionMessageKey, connectCloudUrl, pushedToVcs, workspaceName, bannerVariant);
-    // Variant 2 (deferred connection): No title, just output the banner directly
-    // without the NX badge since nothing was actually configured
-    if (!message.title) {
-        out.addNewline();
-        out.writeLines(message.bodyLines ?? []);
-    }
-    else {
-        out.success(message);
-    }
+    // When rawNxCloud is a string (user explicitly passed --nxCloud), hide the URL
+    // because the user "already knows" where to go
+    const url = typeof rawNxCloud === 'string' ? null : connectCloudUrl;
+    const message = (0, messages_1.getCompletionMessage)(completionMessageKey, url, pushedToVcs);
+    out.success(message);
     return out.getOutput();
 }
 function getSkippedNxCloudInfo() {
@@ -84,3 +82,11 @@ function getSkippedNxCloudInfo() {
     out.success((0, messages_1.getSkippedCloudMessage)());
     return out.getOutput();
 }
+function setNeverConnectToCloud(directory) {
+    const { readFileSync, writeFileSync } = require('fs');
+    const { join } = require('path');
+    const nxJsonPath = join(directory, 'nx.json');
+    const nxJson = JSON.parse(readFileSync(nxJsonPath, 'utf-8'));
+    nxJson.neverConnectToCloud = true;
+    writeFileSync(nxJsonPath, JSON.stringify(nxJson, null, 2) + '\n');
+}