added support for orgplan check in export and import

Author: Your Name

.talismanrc

@@ -12,4 +12,8 @@ fileignoreconfig:
   checksum: 8cafd5994d3ec13ba9af74c80b330bfd14721ea4e0359b456598964a6c2913ce
 - filename: packages/contentstack-seed/tests/contentstack.test.ts
   checksum: 04196568bf29f4693e968079867e87d96219b022bfee0f4697dce1b9bc161ac3
+- filename: packages/contentstack-export/src/utils/export-config-handler.ts
+  checksum: 362c1042a70958b52e73a7a3096152cf0259c55095c8b2c6f308b8f5fb90614e
+- filename: packages/contentstack-import/src/utils/import-config-handler.ts
+  checksum: f310186b5ea1fc756bd200dbe01967bc07e5490dc5ed17018f0ca4b35f0fd86f
   version: '1.0'

packages/contentstack-export/package.json

@@ -93,7 +93,8 @@
     "shortCommandName": {
       "cm:stacks:export": "EXPRT",
       "cm:export": "O-EXPRT"
-    }
+    },
+    "planProtectedFeatures": ["assetsScan"]
   },
   "repository": "https://github.com/contentstack/cli"
 }

packages/contentstack-export/src/commands/cm/stacks/export.ts

@@ -120,7 +120,7 @@ export default class ExportCommand extends Command {
     let exportDir: string = pathValidator('logs');
     try {
       const { flags } = await this.parse(ExportCommand);
-      const exportConfig = await setupExportConfig(flags);
+      const exportConfig = await setupExportConfig(flags, this.context);
 
       // Store apiKey in configHandler for session.json (return value not needed)
       createLogContext(

packages/contentstack-export/src/types/export-config.ts

@@ -1,3 +1,4 @@
+import { FeatureStatus } from '@contentstack/cli-utilities';
 import { Context, Modules, Region } from '.';
 import DefaultConfig from './default-config';
 
@@ -36,6 +37,7 @@ export default interface ExportConfig extends DefaultConfig {
   skipStackSettings?: boolean;
   skipDependencies?: boolean;
   authenticationMethod?: string;
+  planStatus?: Record<string, FeatureStatus>;
 }
 
 type branch = {

packages/contentstack-export/src/utils/export-config-handler.ts

@@ -1,14 +1,22 @@
 import merge from 'merge';
 import * as path from 'path';
-import { configHandler, isAuthenticated,cliux, sanitizePath, log } from '@contentstack/cli-utilities';
+import {
+  configHandler,
+  isAuthenticated,
+  cliux,
+  sanitizePath,
+  log,
+  FeatureCtx,
+  isFeatureEnabled,
+} from '@contentstack/cli-utilities';
 import defaultConfig from '../config';
 import { readFile } from './file-helper';
 import { askExportDir, askAPIKey } from './interactive';
 import login from './basic-login';
 import { filter, includes } from 'lodash';
 import { ExportConfig } from '../types';
 
-const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
+const setupConfig = async (exportCmdFlags: any, context?: any): Promise<ExportConfig> => {
   let config = merge({}, defaultConfig);
 
   // Track authentication method
@@ -97,7 +105,7 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
 
   if (exportCmdFlags['branch-alias']) {
     config.branchAlias = exportCmdFlags['branch-alias'];
-  } 
+  }
   if (exportCmdFlags['branch']) {
     config.branchName = exportCmdFlags['branch'];
   }
@@ -133,10 +141,36 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
     }
   }
 
-    // Add authentication details to config for context tracking
+  // Add authentication details to config for context tracking
   config.authenticationMethod = authenticationMethod;
   log.debug('Export configuration setup completed.', { ...config });
 
+  // Deferred plan check — credentials now available after setupExportConfig
+  const deferredFeatures: string[] = context?.planCheckRequired ?? [];
+  if (deferredFeatures.length > 0) {
+    const planCtx: FeatureCtx = {
+      apiKey: config.apiKey,
+      managementToken: config.management_token,
+      authToken: config.auth_token,
+    };
+    for (const featureUid of deferredFeatures) {
+      try {
+        const status = await isFeatureEnabled(featureUid, planCtx);
+        if (context) {
+          context.planStatus[featureUid] = status;
+        }
+
+        log.debug(`[export] Deferred plan status fetched for "${featureUid}".`);
+      } catch (error) {
+        log.warn(`[export] Could not fetch deferred plan status for "${featureUid}": ${(error as Error).message}`);
+      }
+    }
+  }
+
+  if (context?.planStatus) {
+    config.planStatus = context.planStatus;
+  }
+
   return config;
 };
 

packages/contentstack-import/package.json

@@ -85,7 +85,8 @@
     "shortCommandName": {
       "cm:stacks:import": "IMPRT",
       "cm:import": "O-IMPRT"
-    }
+    },
+    "planProtectedFeatures": ["assetsScan"]
   },
   "repository": "https://github.com/contentstack/cli"
 }

packages/contentstack-import/src/commands/cm/stacks/import.ts

@@ -154,7 +154,7 @@ export default class ImportCommand extends Command {
     let importConfig: ImportConfig;
     try {
       const { flags } = await this.parse(ImportCommand);
-      importConfig = await setupImportConfig(flags);
+      importConfig = await setupImportConfig(flags, this.context);
       // Prepare the context object
       createLogContext(
         this.context?.info?.command || 'cm:stacks:export',

packages/contentstack-import/src/import/module-importer.ts

@@ -34,12 +34,6 @@ class ModuleImporter {
       const stackDetails: Record<string, unknown> = await this.stackAPIClient.fetch();
       this.importConfig.stackName = stackDetails.name as string;
       this.importConfig.org_uid = stackDetails.org_uid as string;
-
-      const assetScanningEnabled = await this.detectAssetScanning(this.importConfig.org_uid);
-      if (assetScanningEnabled) {
-        this.importConfig.assetScanningEnabled = true;
-        this.importConfig.skipAssetsPublish = true;
-      }
     }
 
     await this.resolveImportPath();
@@ -215,16 +209,6 @@ class ModuleImporter {
       log.error(`Audit failed with following error. ${error}`, this.importConfig.context);
     }
   }
-
-  private async detectAssetScanning(orgUid: string): Promise<boolean> {
-    try {
-      const orgDetails = await this.managementAPIClient.organization(orgUid).fetch({ include_plan: true });
-      const features: Array<{ uid: string; enabled?: boolean }> = orgDetails?.plan?.features || [];
-      return features.some((f) => (f.uid === 'assetsScan' || f.uid === 'amAssetsScan') && f.enabled === true);
-    } catch {
-      return false;
-    }
-  }
 }
 
 export default ModuleImporter;

packages/contentstack-import/src/import/modules/assets.ts

@@ -53,11 +53,15 @@ export default class ImportAssets extends BaseClass {
    */
   async start(): Promise<void> {
     try {
-    // NOTE Step 1: Import folders and create uid mapping file
+      if (this.importConfig.assetScanningEnabled) {
+        log.info('Assets Scanning is enabled in this stack', this.importConfig.context);
+        log.warn('Assets publishing will be skipped', this.importConfig.context);
+      }
+      // NOTE Step 1: Import folders and create uid mapping file
       log.debug('Starting folder import process...', this.importConfig.context);
       await this.importFolders();
 
-    // NOTE Step 2: Import versioned assets and create it mapping files (uid, url)
+      // NOTE Step 2: Import versioned assets and create it mapping files (uid, url)
       if (this.assetConfig.includeVersionedAssets) {
         const versionsPath = `${this.assetsPath}/versions`;
         if (existsSync(versionsPath)) {
@@ -68,11 +72,11 @@ export default class ImportAssets extends BaseClass {
         }
       }
 
-    // NOTE Step 3: Import Assets and create it mapping files (uid, url)
+      // NOTE Step 3: Import Assets and create it mapping files (uid, url)
       log.debug('Starting assets import...', this.importConfig.context);
       await this.importAssets();
 
-    // NOTE Step 4: Publish assets
+      // NOTE Step 4: Publish assets
       if (!this.importConfig.skipAssetsPublish) {
         log.debug('Starting assets publishing...', this.importConfig.context);
         await this.publish();

packages/contentstack-import/src/types/import-config.ts

@@ -1,3 +1,4 @@
+import { FeatureStatus } from '@contentstack/cli-utilities';
 import { Context, Modules, Region } from '.';
 import DefaultConfig from './default-config';
 
@@ -60,6 +61,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
   personalizeProjectName?: string;
   'exclude-global-modules': false;
   context: Context;
+  planStatus?: Record<string, FeatureStatus>;
 }
 
 type branch = {