@forge/cli-shared 8.22.1-next.0 → 8.23.0-experimental-4a332af

package/out/ui/text.js

@@ -270,6 +270,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
         promptCategory: 'Select a category:',
         promptTemplate: 'Select a template:',
         promptProduct: 'Select an Atlassian app or platform tool:',
+        globalTemplateSelection: `${greenTick} UI Kit and global-ui will be used to create your app.`,
         taskTemplate: {
             title: 'Downloading template',
             downloading: (template) => `Downloading ${template} template project...`,
@@ -698,12 +699,16 @@ What do you like or don't like about Forge? Share your feedback below or press C
                     json: 'output results in JSON format',
                     outFile: 'specify a file to output the results',
                     version1: 'source version to upgrade in a non-interactive mode',
-                    version2: 'target version to upgrade to in a non-interactive mode'
+                    version2: 'target version to upgrade to in a non-interactive mode',
+                    limit: 'limit the number of installations to upgrade (optional)'
                 },
                 desc: `upgrades installations using one major version to another version. The version selection list displays:\n${itemList(['major version number', 'deployment date', 'number of installations'])}`,
                 overViewVersionTable: (versions, environment) => `\nDetails for a total of [${versions} major versions] in [${environment}] can be seen below.\nWhere there are no upgrade paths available, use \`forge version compare\` to compare versions and see more information:\n`,
                 promptVersionTable: 'Getting app version list...',
-                selectTargetVersionToUpgrade: (installations) => `Please select version to upgrade existing ${installations} installations to:`,
+                selectTargetVersionToUpgrade: (sourceVersion) => {
+                    const sourceVersionText = sourceVersion ? ` from version ${sourceVersion}` : '';
+                    return `Please select a version to upgrade installations${sourceVersionText} to:`;
+                },
                 error: {
                     missingVersionUpgradeParameters: `Missing parameters:\nError: [version bulk-upgrade start --non-interactive] requires --from-version and --to-version`,
                     appVersionRolloutRunning: `App version rollout for this app environment is already running. Use \`forge version bulk-upgrade list\` to identify the running upgrade and \`forge version bulk-upgrade cancel\` to cancel.`,
@@ -718,8 +723,29 @@ What do you like or don't like about Forge? Share your feedback below or press C
                 appVersionRolloutSuccess(appRolloutVersionId) {
                     return `Your upgrade has been queued with upgrade ID ${appRolloutVersionId}. To view that status of your update please use the \`forge version bulk-upgrade list\` command.`;
                 },
-                warningMessage: (sourceVersionId, targetVersionId, installations) => `${chalk_1.default.bold('Warning:')} You are planning to move ${installations} installations from version ${sourceVersionId} to version ${targetVersionId}.`,
-                promptConfirmation: 'Do you want to continue?'
+                limitWarningUserLimit: (expectedRemaining, totalEligible, userLimit) => `${chalk_1.default.yellow('Warning:')} Due to the limit you specified (${userLimit}), ${expectedRemaining} out of the eligible ${totalEligible} upgrades will remain unprocessed.`,
+                limitWarningAdjustedLimit: (expectedRemaining, totalEligible, userLimit, appliedLimit) => `${chalk_1.default.yellow('Warning:')} The limit you supplied (${userLimit}) could not be honored and a limit of ${appliedLimit} has been applied. Due to this limit ${expectedRemaining} out of the eligible ${totalEligible} upgrades will remain unprocessed.`,
+                limitWarningSystemLimit: (expectedRemaining, totalEligible, systemLimit) => `${chalk_1.default.yellow('Warning:')} The number of eligible installations exceeded the per-workflow maximum (${systemLimit}). Due to this maximum ${expectedRemaining} out of the eligible ${totalEligible} upgrades will remain unprocessed.`,
+                limitWarningFollowUp: 'These unprocessed installations can be processed by starting a new workflow after the completion of this one.',
+                warningMessage: (sourceVersionId, targetVersionId, installations, limit, enforcedSystemLimit, userProvidedLimit) => {
+                    const effectiveInstallations = limit !== undefined && limit < (installations || 0) ? limit : installations;
+                    const installationText = effectiveInstallations === 1 ? 'installation' : 'installations';
+                    let limitNote = '';
+                    if (enforcedSystemLimit !== undefined && userProvidedLimit !== undefined) {
+                        limitNote = `. Provided limit (${userProvidedLimit}) not honored due to system limit`;
+                    }
+                    return `${chalk_1.default.bold('Warning:')} You are planning to move ${effectiveInstallations} ${installationText} from version ${sourceVersionId} to version ${targetVersionId}${limitNote}.`;
+                },
+                promptConfirmation: 'Do you want to continue?',
+                promptLimit: (installations) => `How many installations to upgrade? (${installations} eligible):`,
+                promptLimitWithTargetInfo: (installations, upgradeLimit) => {
+                    const eligibleText = `${installations} eligible`;
+                    const limitText = upgradeLimit && (installations ?? 0) > upgradeLimit ? `, system limit: ${upgradeLimit}` : ``;
+                    return `How many installations to upgrade? (${eligibleText}${limitText}):`;
+                },
+                limitValidationError: (max) => max !== undefined
+                    ? `Please enter a valid number between 1 and ${max}, or leave empty for no limit.`
+                    : `Please enter a valid number greater than 0, or leave empty for no limit.`
             },
             list: {
                 cmdName: 'list',
@@ -855,6 +881,9 @@ What do you like or don't like about Forge? Share your feedback below or press C
         buildTag: {
             description: 'specify a build tag to deploy (from forge build)'
         },
+        skipRollout: {
+            description: 'Skip rolling release rollout after deployment'
+        },
         connectKeyChange: {
             continueChange: `Do you wish to continue with changing the Connect key?`,
             continueDelete: `Do you wish to continue with deleting the Connect key?`,
@@ -1048,6 +1077,7 @@ ${buildTerminalLink(link)}\n`,
         noResourceId: 'Unknown site with no resource ID',
         noCloudId: 'Unknown workspace with no cloud ID',
         noResourceIdInWorkspace: 'Unknown workspace with no resource ID',
+        noResourceIdInInstallation: 'Unknown installation with no resource ID',
         noInstallations: `The app is not installed anywhere.\nRun ${forge('install')} to install your app on an Atlassian site.\n`,
         status: {
             outdatedPermissions: 'Outdated permissions',
@@ -1137,6 +1167,7 @@ ${buildTerminalLink(link)}\n`,
         }
     },
     installationId: {
+        option: 'specify the installation ID',
         prompt: "Enter the app's installation ID:",
         errors: {
             invalid: `Invalid installation ID. Run ${forge('install', 'list')} to see the installation IDs for the app.`,
@@ -1157,8 +1188,12 @@ ${buildTerminalLink(link)}\n`,
             confirmAllInstallations: 'This will uninstall the app from the listed contexts. Are you sure you want to continue?'
         },
         info: 'Uninstalling...',
-        done: (product, domain, environment, isMulti) => `${isMulti ? log_symbols_1.default.info : log_symbols_1.default.success} Uninstalled from the ${(0, environment_1.environmentToOption)(environment)} environment in ${product} on ${buildTerminalLink(domain)}.`,
-        failed: (product, domain, environment) => `Failed to uninstall the app from the ${(0, environment_1.environmentToOption)(environment)} environment in ${product} on ${buildTerminalLink(domain)}. Try rerunning the command, or ask for help if you continue to see this error.`,
+        done: (product, domain, environment, isMulti) => product === 'Ecosystem'
+            ? `${isMulti ? log_symbols_1.default.info : log_symbols_1.default.success} Uninstalled.`
+            : `${isMulti ? log_symbols_1.default.info : log_symbols_1.default.success} Uninstalled from the ${(0, environment_1.environmentToOption)(environment)} environment in ${product} on ${buildTerminalLink(domain)}.`,
+        failed: (product, domain, environment) => product === 'Ecosystem'
+            ? `Failed to uninstall the app. Try rerunning the command, or ask for help if you continue to see this error.`
+            : `Failed to uninstall the app from the ${(0, environment_1.environmentToOption)(environment)} environment in ${product} on ${buildTerminalLink(domain)}. Try rerunning the command, or ask for help if you continue to see this error.`,
         missingUninstallTask: `Cannot uninstall the app: something went wrong with starting the uninstall task.`,
         uninstallBatchBanner: (remainingInstallations) => log_color_1.LogColor.warn(`${log_symbols_1.default.info} ${chalk_1.default.bold(`Batch uninstallations are limited to ${installations_1.MAX_BATCH_UNINSTALLS} per request and there ${remainingInstallations > 1 ? `are ${remainingInstallations} installations` : 'is 1 installation'} remaining. Run the command multiple times to perform more uninstallations`)}`),
         uninstallBatchProductionError: `${log_symbols_1.default.error} ${chalk_1.default.bold('Batch uninstallations are not supported in production environments.')}`
@@ -1487,6 +1522,15 @@ When errors occur during Forge command execution, error details will be sent to
             }
         }
     },
+    commandHelp: {
+        groups: {
+            quickStart: 'Quick Start',
+            develop: 'Develop',
+            manage: 'Manage',
+            account: 'Account',
+            cliExperience: 'CLI Experience'
+        }
+    },
     dynamicTable: {
         exiting: 'Exiting...'
     },
@@ -1500,16 +1544,65 @@ When errors occur during Forge command execution, error details will be sent to
             optionUiType: 'UI framework (ui-kit, custom-ui)',
             optionProduct: 'target product (Jira, Confluence, etc.)',
             optionDryRun: 'show what would be generated',
-            optionForce: 'overwrite existing files',
+            optionForce: 'overwrite existing files and upgrade conflicting dependencies to template versions',
             optionNoInstall: 'skip installing dependencies',
-            optionUpgradeDeps: 'upgrade existing dependencies to template versions',
             promptSelectProduct: 'select a product',
             promptSelectModule: 'select a module',
             promptSelectUIFramework: 'select a UI framework',
+            dryRunLabel: 'Dry run: ',
+            filesToBeCreatedHeader: 'Files to be created:',
+            fileChangeHeader: (fileName) => `${fileName} changes:`,
+            depAdditionsHeader: 'Adding:',
+            frontendDepHeader: 'Frontend dependencies:',
+            depConflictsHeader: '⚠️  Dependency conflicts detected',
+            depConflictsScopedHeader: (scope) => `⚠️  ${scope === 'frontend' ? 'Frontend' : 'Backend'} dependency conflicts detected`,
+            depConflictsBlockedHeader: (scope) => `⚠️  ${scope === 'frontend' ? 'Frontend' : 'Backend'} dependency conflicts detected`,
+            depConflictsColumnPackage: 'Package',
+            depConflictsColumnCurrent: 'Your version',
+            depConflictsColumnTemplate: 'Template version',
+            depConflictsColumnStatus: 'Status',
+            depConflictsStatusConflict: '⛔ CONFLICT',
+            depConflictsStatusUpgraded: '⬆️  UPGRADED',
+            depConflictsStatusDowngraded: '⬇️  DOWNGRADED',
+            depConflictsStatusOk: '✅ OK',
+            depConflictsSummary: (count) => `${count} conflict(s) found. Cannot proceed without resolution.`,
+            depConflictsUpgradedSummary: (count) => `${count} conflicting package(s) upgraded to template versions.`,
+            depConflictsOptionsHeader: 'Options:',
+            depConflictsOptionForce: '--force           Upgrade conflicting packages to template versions (still runs npm install)',
+            depConflictsOptionNoInstall: '--no-install      Add to package.json only, skip npm install',
+            depConflictsOptionForceNoInstall: '--force --no-install  Upgrade conflicting packages but skip npm install',
+            depConflictsFooter: 'Resolve conflicts manually or re-run with --force to upgrade.',
+            errorDepConflicts: (count) => `${count} dependency conflict(s) detected. Re-run with --force to upgrade, or --no-install to skip the install step.`,
+            errorPackageJsonNotFound: (pkgPath) => `package.json not found at ${pkgPath}. Cannot determine existing dependencies.`,
+            errorPackageJsonParseFailed: (pkgPath, message) => `Failed to parse package.json at ${pkgPath}: ${message}`,
+            errorMissingDepVersion: (name) => `Template dependency "${name}" is missing an explicit version. Templates must declare a version for every dependency.`,
+            warnNoManifest: (manifestPath) => `No manifest.yml found at ${manifestPath}. Manifest changes were not planned.`,
+            warnNoFragment: 'Template did not provide a manifest fragment; manifest changes were not planned.',
+            warnNoManifestDelta: 'Manifest fragment did not introduce any changes after merge.',
+            warnAddedAppCompatibility: (existingProduct, newProduct) => `Adding a "${newProduct}" module to an app that already targets "${existingProduct}"; updated app.compatibility so the app must be installed to "${newProduct}" to see changes.`,
+            warnUnsupportedFileOperations: (ops) => `Skipping ${ops.length} unsupported file operation(s): ${ops.join(', ')}. Only "create" operations are supported.`,
+            warnViteConfigExists: (configPath) => `An existing vite.config.js at ${configPath} could not be merged automatically. Skipping vite config changes; re-run with --force to overwrite.`,
+            errorViteConfigNestedInput: () => `Cannot safely merge vite.config.js: the existing "input" block contains a nested object. Merging would corrupt the file. Re-run with --force to regenerate the config from scratch, or edit the input map manually.`,
+            errorApplyNotImplemented: 'module add apply mode is not implemented yet; re-run with --dry-run to preview changes.',
             errorInvalidProduct: (product) => `Invalid product "${product}"`,
             errorInvalidUIFramework: (uiFramework, moduleKey) => `Invalid UI framework "${uiFramework ?? 'unknown'}" for module "${moduleKey}"`,
             errorFailedToResolveChoice: (choice) => `Failed to resolve selected module from choice "${choice}"`,
-            errorFailedToDownloadTemplate: (moduleKey) => `Failed to download template for module "${moduleKey}"`
+            errorFailedToDownloadTemplate: (moduleKey) => `Failed to download template for module "${moduleKey}"`,
+            errorMissingTemplateSource: (sourcePath) => `Template source file not found in extracted bundle: ${sourcePath}`,
+            errorTargetConflict: (targets) => `File(s) already exist and would be overwritten:\n- ${targets.join('\n- ')}\n\nRe-run with --force to overwrite, or choose different values to generate unique filenames.`,
+            errorZipExtractionFailed: (moduleKey, message) => `Failed to extract template bundle for "${moduleKey}": ${message}`,
+            errorZipCleanupFailed: (moduleKey) => `Failed to clean up downloaded zip for "${moduleKey}".`,
+            errorCacheDirMissing: (moduleKey) => `Cache directory is not set for module "${moduleKey}". Call prepareModuleMetadata before downloading the bundle.`,
+            errorFailedToDownloadBundle: (moduleKey, message) => `Failed to download bundle for "${moduleKey}": ${message}`,
+            errorCacheCleanupFailed: (cacheDir) => `Failed to clean up cache directory: ${cacheDir}`,
+            errorNoBundle: (moduleKey, searched) => `No template bundle was found for "${moduleKey}". Searched the following paths:\n- ${searched.join('\n- ')}\n\nThe template archive may have failed to download, or its layout may not match expectations.`,
+            errorNoFileOperations: (moduleKey, uiFramework) => `Template "${moduleKey}"${uiFramework ? ` (variant "${uiFramework}")` : ''} declares no "create" file operations; nothing to copy.`,
+            warnDownloadFailed: (moduleKey, message) => `Failed to download template archive for "${moduleKey}": ${message}. File copy will be skipped.`,
+            warnNoBundle: 'Template bundle was not downloaded; file copy was skipped.',
+            warnInstallSkipped: '⚠️ Skipping install: Run npm install to install new dependencies.',
+            infoReusingResource: (resourceKey) => `Reusing existing resource '${resourceKey}'`,
+            errorResourceEntryConflict: (resourceKey, entryName, existing, incoming) => `Resource '${resourceKey}' already declares entry '${entryName}' as '${existing}', but the new module wants '${incoming}'. Choose a different moduleKey or remove the existing entry.`,
+            errorResourcePathConflict: (resourceKey, existing, incoming) => `Resource '${resourceKey}' already declares path '${existing}', but the new module wants '${incoming}'. Resources sharing a key must share a path.`
         },
         list: {
             description: 'list available module templates',
@@ -1526,9 +1619,11 @@ When errors occur during Forge command execution, error details will be sent to
             bifrostIndexInvalid: 'Error: expected array of templates',
             bifrostIndexFetchFailed: (status, statusText) => `Error: template fetch failed: ${status} ${statusText}`,
             bifrostManifestFragmentFetchFailed: (status, statusText) => `Error: failed to fetch manifest fragment: ${status} ${statusText}`,
-            duplicateModuleKey: (value, moduleKey) => `Module key "${value}" already exists for ${moduleKey}. Please enter a different value.`,
+            bifrostZipFetchFailed: (moduleKey, status, statusText) => `Error: failed to fetch template bundle for "${moduleKey}": ${status} ${statusText}`,
+            duplicateModuleKey: (value) => `Module key "${value}" already exists in the manifest. Please enter a different value.`,
             duplicateFunctionKey: (value) => `Function key "${value}" already exists. Please enter a different value.`,
-            duplicateResourceKey: (value) => `Resource key "${value}" already exists. Please enter a different value.`
+            duplicateResourceKey: (value) => `Resource key "${value}" already exists. Please enter a different value.`,
+            duplicateKey: (value) => `"${value}" must be unique. Please enter a different value.`
         }
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "8.22.1-next.0",
+  "version": "8.23.0-experimental-4a332af",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -12,10 +12,11 @@
     "generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
   },
   "dependencies": {
-    "@forge/manifest": "12.7.1-next.0",
+    "@forge/manifest": "12.8.0-experimental-4a332af",
     "@forge/util": "2.0.1",
     "@forge/i18n": "0.0.7",
     "@sentry/node": "7.106.0",
+    "@vercel/detect-agent": "^1.2.3",
     "adm-zip": "^0.5.10",
     "array.prototype.flatmap": "^1.3.3",
     "case": "^1.6.3",
@@ -47,6 +48,7 @@
   },
   "devDependencies": {
     "@atlassian/xen-test-util": "^4.2.0",
+    "@colors/colors": "1.5.0",
     "@graphql-codegen/add": "^5.0.2",
     "@graphql-codegen/cli": "^5.0.2",
     "@graphql-codegen/typescript": "^4.1.6",