@forge/cli 7.0.4-next.0-experimental-326ff96 → 7.0.4-next.3

package/CHANGELOG.md

@@ -1,21 +1,36 @@
 # @forge/cli
 
-## 7.0.4-next.0-experimental-326ff96
+## 7.0.4-next.3
 
-### Minor Changes
+### Patch Changes
 
-- 5477c90: Support for AI modules
+- Updated dependencies [b44f823]
+  - @forge/manifest@6.0.0-next.1
+  - @forge/cli-shared@3.23.4-next.2
+  - @forge/lint@4.0.6-next.2
+  - @forge/tunnel@4.0.4-next.3
+  - @forge/bundler@4.15.4-next.3
+
+## 7.0.4-next.2
 
 ### Patch Changes
 
-- Updated dependencies [afb1634]
-- Updated dependencies [5477c90]
-- Updated dependencies [75f0e40]
-  - @forge/manifest@5.6.0-next.0-experimental-326ff96
-  - @forge/cli-shared@3.23.4-next.0-experimental-326ff96
-  - @forge/lint@4.0.6-next.0-experimental-326ff96
-  - @forge/tunnel@4.0.4-next.0-experimental-326ff96
-  - @forge/bundler@4.15.4-next.0-experimental-326ff96
+- Updated dependencies [803a8b0]
+  - @forge/node-runtime@0.7.1-next.0
+  - @forge/runtime@5.4.1-next.0
+  - @forge/bundler@4.15.4-next.2
+  - @forge/tunnel@4.0.4-next.2
+
+## 7.0.4-next.1
+
+### Patch Changes
+
+- a5d062c: Added error messages for Forge apps containing Connect modules where there is an installation error due to a macro collision or failed descriptor validation.
+- Updated dependencies [a5d062c]
+  - @forge/cli-shared@3.23.4-next.1
+  - @forge/bundler@4.15.4-next.1
+  - @forge/lint@4.0.6-next.1
+  - @forge/tunnel@4.0.4-next.1
 
 ## 7.0.4-next.0
 

package/npm-shrinkwrap.json

@@ -1,23 +1,23 @@
 {
   "name": "@forge/cli",
-  "version": "7.0.4-next.0-experimental-326ff96",
+  "version": "7.0.4-next.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@forge/cli",
-      "version": "7.0.4-next.0-experimental-326ff96",
+      "version": "7.0.4-next.3",
       "hasInstallScript": true,
       "license": "UNLICENSED",
       "dependencies": {
-        "@forge/bundler": "4.15.4-next.0-experimental-326ff96",
-        "@forge/cli-shared": "3.23.4-next.0-experimental-326ff96",
+        "@forge/bundler": "4.15.4-next.3",
+        "@forge/cli-shared": "3.23.4-next.2",
         "@forge/egress": "1.2.13",
-        "@forge/lint": "4.0.6-next.0-experimental-326ff96",
-        "@forge/manifest": "5.6.0-next.0-experimental-326ff96",
-        "@forge/node-runtime": "0.7.0",
-        "@forge/runtime": "5.4.0",
-        "@forge/tunnel": "4.0.4-next.0-experimental-326ff96",
+        "@forge/lint": "4.0.6-next.2",
+        "@forge/manifest": "6.0.0-next.1",
+        "@forge/node-runtime": "0.7.1-next.0",
+        "@forge/runtime": "5.4.1-next.0",
+        "@forge/tunnel": "4.0.4-next.3",
         "@forge/util": "1.4.1",
         "@sentry/node": "7.100.1",
         "ajv": "^8.12.0",
@@ -878,9 +878,9 @@
       "integrity": "sha512-AyuVoQXu5QLqdBnID8T7zL8jfobESvBXRoEHhg62qD6FS2pmGTLWNnahreX0qQKYGn45Wa6xNaJ890xYhfua1Q=="
     },
     "node_modules/@forge/bundler": {
-      "version": "4.15.4-next.0-experimental-326ff96",
-      "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.4-next.0-experimental-326ff96.tgz",
-      "integrity": "sha512-Nq0t3lg4gvm03r4ksm3SItOcioCPI1OcaigS7aMxtl/4sy+xJ4ViDdcbzLE3T/ZyzcHdChXq9UBBs5OM8amq6Q==",
+      "version": "4.15.4-next.3",
+      "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.4-next.3.tgz",
+      "integrity": "sha512-+QkPmXoiErfvDAEONGZZjre3C9JoKH7VoOvck9upCz03X/i0EqrzADED5rsAc1UKFOyqdkhiBg7IBlJKy/7DdQ==",
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/plugin-transform-class-properties": "^7.23.3",
@@ -891,9 +891,9 @@
         "@babel/preset-typescript": "^7.23.3",
         "@forge/api": "3.2.0",
         "@forge/babel-plugin-transform-ui": "1.1.17",
-        "@forge/cli-shared": "3.23.4-next.0-experimental-326ff96",
-        "@forge/lint": "4.0.6-next.0-experimental-326ff96",
-        "@forge/node-runtime": "0.7.0",
+        "@forge/cli-shared": "3.23.4-next.2",
+        "@forge/lint": "4.0.6-next.2",
+        "@forge/node-runtime": "0.7.1-next.0",
         "@forge/util": "1.4.1",
         "assert": "^2.1.0",
         "babel-loader": "^8.3.0",
@@ -950,11 +950,11 @@
       "integrity": "sha512-n4AWXkzMA4Pv4nam+dTu7PHgDQtMwaAF2MalOWF323zGvYKS/gZJY+7efJq0DLP783iTfjvYT879EHhCrfvEXA=="
     },
     "node_modules/@forge/cli-shared": {
-      "version": "3.23.4-next.0-experimental-326ff96",
-      "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.23.4-next.0-experimental-326ff96.tgz",
-      "integrity": "sha512-dK2OQ1nQ+m5HM/HS7cZmWO5hHfXJhDnwNo+bKGw+xgFAb1KlDc5p3k890arPy731064sIPuVmkLaRSFVIS93ww==",
+      "version": "3.23.4-next.2",
+      "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.23.4-next.2.tgz",
+      "integrity": "sha512-FKKkv716GE4dBuxM5bzZB5s8NGs2hp9QR3g+vmdLr9dIBxKK0IjZ5o90RSiDURdCTuNvyzNWKSRHe9jOmlJD9Q==",
       "dependencies": {
-        "@forge/manifest": "5.6.0-next.0-experimental-326ff96",
+        "@forge/manifest": "6.0.0-next.1",
         "@forge/util": "1.4.1",
         "@sentry/node": "7.100.1",
         "adm-zip": "^0.5.10",
@@ -988,9 +988,9 @@
       }
     },
     "node_modules/@forge/csp": {
-      "version": "3.1.6-experimental-326ff96",
-      "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-3.1.6-experimental-326ff96.tgz",
-      "integrity": "sha512-5T7g9nMtiu72EDbS7rqhE2G/0pux4GxQYsOCWANJmho5jMLcb9bkkIFtNvheUOildPceJeJX/CcKBVuVXBB/iw==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-3.1.6.tgz",
+      "integrity": "sha512-sc9HqtMemMJAFIlWaHeF7ZeUdROD/jPVyUL+CLT14OWTuvpG4fCg+n+l8ebo8EwvZeJ5jCjEyZrVcH+QOqrDyg==",
       "dependencies": {
         "cheerio": "^0.22.0",
         "content-security-policy-parser": "^0.4.1"
@@ -1005,13 +1005,13 @@
       }
     },
     "node_modules/@forge/lint": {
-      "version": "4.0.6-next.0-experimental-326ff96",
-      "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-4.0.6-next.0-experimental-326ff96.tgz",
-      "integrity": "sha512-Z4w7HBryxlJVDpJ5VMFnF906tXIO6degYctPq4TDGXBR4FCeTKs209G3jJvnmwDFM6yxYCGks3LY4dBys4N2pQ==",
+      "version": "4.0.6-next.2",
+      "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-4.0.6-next.2.tgz",
+      "integrity": "sha512-B/HiKbvW7bOtMuKaVuxZksTMGEkhXE387KgiXajxFX/qJgevKU5YcguGSEJ62PzQwplv07xU51upU88Y1x5ybg==",
       "dependencies": {
-        "@forge/cli-shared": "3.23.4-next.0-experimental-326ff96",
+        "@forge/cli-shared": "3.23.4-next.2",
         "@forge/egress": "1.2.13",
-        "@forge/manifest": "5.6.0-next.0-experimental-326ff96",
+        "@forge/manifest": "6.0.0-next.1",
         "@typescript-eslint/typescript-estree": "^5.62.0",
         "array.prototype.flatmap": "^1.3.2",
         "atlassian-openapi": "^1.0.18",
@@ -1020,9 +1020,9 @@
       }
     },
     "node_modules/@forge/manifest": {
-      "version": "5.6.0-next.0-experimental-326ff96",
-      "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-5.6.0-next.0-experimental-326ff96.tgz",
-      "integrity": "sha512-uAp5dknNPPGZwmWpaL2D3rvwpbkEZziXWG0AKa5rtqIIBpgPjiA4HDQUTeWhQpCMAofa12J1dkXubV4LAZOjVA==",
+      "version": "6.0.0-next.1",
+      "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-6.0.0-next.1.tgz",
+      "integrity": "sha512-sJsVbWZNpU/xOUYdddaJZ2wQLNLJ/BdRQUhGagoxG6Z3Fg/pdz7XNXFnrYkREqnSG+B3VVTkTDaeUxOULydBDA==",
       "dependencies": {
         "@forge/util": "1.4.1",
         "ajv": "^8.12.0",
@@ -1037,12 +1037,12 @@
       }
     },
     "node_modules/@forge/node-runtime": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.7.0.tgz",
-      "integrity": "sha512-DsAmDjoXFo1aavVpQVme47Iu7wzQGoHCgFZNGNYwBgCG2LxgVuo6bdvB5MkjIIfStU2hrp1oo6nnT4OZHpjlVw==",
+      "version": "0.7.1-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.7.1-next.0.tgz",
+      "integrity": "sha512-APfowGK96FR0/AcWttUF6CZu5voPiJDZoiLWX7r7DTGWHD6mmHfBxDWvv43BB9gHt12Lom5ail4qD/Ha1MGBqw==",
       "dependencies": {
         "@forge/api": "3.2.0",
-        "@forge/runtime": "5.4.0",
+        "@forge/runtime": "5.4.1-next.0",
         "uuid": "^9.0.1"
       }
     },
@@ -1065,9 +1065,9 @@
       "integrity": "sha512-n4AWXkzMA4Pv4nam+dTu7PHgDQtMwaAF2MalOWF323zGvYKS/gZJY+7efJq0DLP783iTfjvYT879EHhCrfvEXA=="
     },
     "node_modules/@forge/runtime": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.4.0.tgz",
-      "integrity": "sha512-OdOznknyxmGnCnb3CN6Fa1pukwUsKfqAbPI7jCWJ/4jEIT5RpStKPBKuJ30o4my6SUiHGz+OdME0kjWvwSvlTA==",
+      "version": "5.4.1-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-5.4.1-next.0.tgz",
+      "integrity": "sha512-Tiv4I3eOzYt1HV85INkFFlC7dKdpnGoiv4++dCAyif9/LDSAkf3ssWN8sLcIYadNoz/wQoUGITt6voniAhtQIg==",
       "dependencies": {
         "@forge/util": "1.4.1",
         "fp-ts": "^2.16.2",
@@ -1080,14 +1080,14 @@
       }
     },
     "node_modules/@forge/tunnel": {
-      "version": "4.0.4-next.0-experimental-326ff96",
-      "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-4.0.4-next.0-experimental-326ff96.tgz",
-      "integrity": "sha512-zsJn8Ks9EkhPIF5HSgwF21nl1lod6oQjd3PrY0fo8+Dsh8TJNy53oerC9QxEt6wrrlOiwDQzgIUT0j4J7UJzqg==",
-      "dependencies": {
-        "@forge/bundler": "4.15.4-next.0-experimental-326ff96",
-        "@forge/cli-shared": "3.23.4-next.0-experimental-326ff96",
-        "@forge/csp": "3.1.6-experimental-326ff96",
-        "@forge/runtime": "5.4.0",
+      "version": "4.0.4-next.3",
+      "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-4.0.4-next.3.tgz",
+      "integrity": "sha512-JmSScbuTqCstg3BOZcHHd6Z3sen9d0n3t0LAPn40GNzoneXuELFAUPfAWsgcD9mm/WPjH61JCcjpAmb7SCehvw==",
+      "dependencies": {
+        "@forge/bundler": "4.15.4-next.3",
+        "@forge/cli-shared": "3.23.4-next.2",
+        "@forge/csp": "3.1.6",
+        "@forge/runtime": "5.4.1-next.0",
         "express": "^4.18.2",
         "express-intercept": "^1.1.0",
         "http-proxy-middleware": "^2.0.6",

package/out/command-line/controller/autocomplete-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autocomplete-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/autocomplete-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAK9D,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAQD,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,MAAyB,GAAG,IAAI,CAInF;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB7C"}
+{"version":3,"file":"autocomplete-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/autocomplete-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,EAAE,EAAsC,MAAM,mBAAmB,CAAC;AAIjF,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAQD,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,MAAyB,GAAG,IAAI,CAInF;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB7C"}

package/out/command-line/controller/autocomplete-controller.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const cli_shared_1 = require("@forge/cli-shared");
 const autocomplete_1 = require("../../autocomplete");
-const assertUnreachable_1 = require("./assertUnreachable");
 const getNodeVersion_1 = require("./getNodeVersion");
 var Argument;
 (function (Argument) {
@@ -47,7 +46,7 @@ class AutocompleteController {
             autocomplete_1.autocomplete.cleanupShellInitFile();
         }
         else {
-            (0, assertUnreachable_1.assertUnreachable)(arg);
+            (0, cli_shared_1.assertUnreachable)(arg);
         }
     }
 }

package/out/command-line/register-app-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAatD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AAaD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAC1B,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CA6IjC;AA6CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
+{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AAaD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAC1B,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAqIjC;AA6CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}

package/out/command-line/register-app-commands.js

@@ -8,7 +8,6 @@ const cli_shared_1 = require("@forge/cli-shared");
 var TemplateCategory;
 (function (TemplateCategory) {
     TemplateCategory["SHOW_ALL"] = "Show All";
-    TemplateCategory["AI"] = "AI";
     TemplateCategory["CUSTOM_UI"] = "Custom UI";
     TemplateCategory["BACKEND"] = "Triggers and Validators";
     TemplateCategory["UI_KIT"] = "UI kit";
@@ -77,17 +76,12 @@ async function createCommandHandler(ui, createAppCommand, featureFlagService, na
         ui.info(cli_shared_1.Text.create.overviewTemplates);
         const templates = await ui.displayTemporaryMessage(() => createAppCommand.getAvailableTemplates(), cli_shared_1.Text.create.waitTemplates);
         const enableCSUIK = await featureFlagService.readFlag('forge-cli-enable-csuik');
-        const enableAIModules = await featureFlagService.shouldEnableAiModules();
-        const type = await ui.promptForList(cli_shared_1.Text.create.promptCategory, Object.values(TemplateCategory)
-            .filter((category) => enableCSUIK || category !== TemplateCategory.UI_KIT_2)
-            .filter((category) => enableAIModules || category !== TemplateCategory.AI));
+        const type = await ui.promptForList(cli_shared_1.Text.create.promptCategory, Object.values(TemplateCategory).filter((category) => enableCSUIK || category !== TemplateCategory.UI_KIT_2));
         const filteredTemplates = type === TemplateCategory.SHOW_ALL
             ? templates
             : templates
                 .filter((name) => {
                 switch (type) {
-                    case TemplateCategory.AI:
-                        return name.startsWith('ai-');
                     case TemplateCategory.BACKEND:
                         return (!name.includes('ui-kit') &&
                             !name.includes('csuik') &&
@@ -103,8 +97,7 @@ async function createCommandHandler(ui, createAppCommand, featureFlagService, na
             })
                 .map((name) => name.replace('-ui-kit', '').replace('-custom-ui', '').replace('-csuik', ''));
         const enableCategoriseTemplateByProduct = await featureFlagService.readFlag('forge-cli-enable-categorise-templates-by-product_e9fzn');
-        if (enableCategoriseTemplateByProduct &&
-            ![TemplateCategory.SHOW_ALL, TemplateCategory.AI].includes(type)) {
+        if (enableCategoriseTemplateByProduct && type !== TemplateCategory.SHOW_ALL) {
             const productList = PRODUCT_CATEGORY.filter((productName) => productName === 'show-all' ||
                 filteredTemplates.some((template) => templateMatchesProduct(productName, template, PRODUCT_CATEGORY)));
             if (productList.length > 1) {

package/out/installations/graphql-client.js

@@ -187,7 +187,7 @@ class InstallationsGraphqlClient {
         await this.monitorAppInstallOrUpgrade(taskId);
     }
     async monitorAppInstallOrUpgrade(taskId) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         let status = cli_shared_1.AppTaskState.Pending;
         while (status !== cli_shared_1.AppTaskState.Complete) {
             const { state, errors, requestId } = await this.getAppInstallationTask(taskId);
@@ -199,8 +199,8 @@ class InstallationsGraphqlClient {
                 const isUserError = statusCode && statusCode >= 400 && statusCode < 500 ? true : false;
                 const code = (_c = (_b = error === null || error === void 0 ? void 0 : error.extensions) === null || _b === void 0 ? void 0 : _b.errorType) !== null && _c !== void 0 ? _c : undefined;
                 throw new InstallationRequestFailedError(isUserError, code, shouldDisplayHarmonizedAppInstallationErrors
-                    ? (0, harmonized_app_installation_errors_1.expandHarmonizedAppInstallationError)(code)
-                    : (_d = error === null || error === void 0 ? void 0 : error.message) !== null && _d !== void 0 ? _d : undefined, requestId);
+                    ? (0, harmonized_app_installation_errors_1.expandHarmonizedAppInstallationError)(code, (_d = error === null || error === void 0 ? void 0 : error.message) !== null && _d !== void 0 ? _d : undefined)
+                    : (_e = error === null || error === void 0 ? void 0 : error.message) !== null && _e !== void 0 ? _e : undefined, requestId);
             }
             if (status !== cli_shared_1.AppTaskState.Complete)
                 await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);

package/out/installations/harmonized-apps/harmonized-app-installation-errors.d.ts

@@ -1,8 +1,7 @@
 export declare enum ApiErrorCode {
-    CONCURRENT_SYNC = "CONNECT_PLUGIN_CONCURRENT_PERMS_SYNC"
+    CONCURRENT_SYNC = "CONNECT_PLUGIN_CONCURRENT_PERMS_SYNC",
+    MACRO_COLLISION = "CONNECT_PLUGIN_MACRO_COLLISION",
+    FAILED_DESCRIPTOR_VALIDATION = "CONNECT_PLUGIN_FAILED_DESCRIPTOR_VALIDATION"
 }
-export declare const KNOWN_HARMONIZED_APP_INSTALLATION_ERRORS: {
-    CONNECT_PLUGIN_CONCURRENT_PERMS_SYNC: string;
-};
-export declare const expandHarmonizedAppInstallationError: (errorCode: string | undefined) => string | undefined;
+export declare const expandHarmonizedAppInstallationError: (errorCode: string | undefined, errorMessage: string | undefined) => string | undefined;
 //# sourceMappingURL=harmonized-app-installation-errors.d.ts.map

package/out/installations/harmonized-apps/harmonized-app-installation-errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harmonized-app-installation-errors.d.ts","sourceRoot":"","sources":["../../../src/installations/harmonized-apps/harmonized-app-installation-errors.ts"],"names":[],"mappings":"AAEA,oBAAY,YAAY;IAGtB,eAAe,yCAAyC;CACzD;AAED,eAAO,MAAM,wCAAwC;;CAEpD,CAAC;AAMF,eAAO,MAAM,oCAAoC,cAAe,MAAM,GAAG,SAAS,uBAMjF,CAAC"}
+{"version":3,"file":"harmonized-app-installation-errors.d.ts","sourceRoot":"","sources":["../../../src/installations/harmonized-apps/harmonized-app-installation-errors.ts"],"names":[],"mappings":"AAEA,oBAAY,YAAY;IAGtB,eAAe,yCAAyC;IACxD,eAAe,mCAAmC;IAClD,4BAA4B,gDAAgD;CAC7E;AAcD,eAAO,MAAM,oCAAoC,cACpC,MAAM,GAAG,SAAS,gBACf,MAAM,GAAG,SAAS,uBAuBjC,CAAC"}

package/out/installations/harmonized-apps/harmonized-app-installation-errors.js

@@ -1,18 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expandHarmonizedAppInstallationError = exports.KNOWN_HARMONIZED_APP_INSTALLATION_ERRORS = exports.ApiErrorCode = void 0;
+exports.expandHarmonizedAppInstallationError = exports.ApiErrorCode = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 var ApiErrorCode;
 (function (ApiErrorCode) {
     ApiErrorCode["CONCURRENT_SYNC"] = "CONNECT_PLUGIN_CONCURRENT_PERMS_SYNC";
+    ApiErrorCode["MACRO_COLLISION"] = "CONNECT_PLUGIN_MACRO_COLLISION";
+    ApiErrorCode["FAILED_DESCRIPTOR_VALIDATION"] = "CONNECT_PLUGIN_FAILED_DESCRIPTOR_VALIDATION";
 })(ApiErrorCode = exports.ApiErrorCode || (exports.ApiErrorCode = {}));
-exports.KNOWN_HARMONIZED_APP_INSTALLATION_ERRORS = {
-    [ApiErrorCode.CONCURRENT_SYNC]: cli_shared_1.Text.harmonization.installation.errors.concurrentSync
-};
-const expandHarmonizedAppInstallationError = (errorCode) => {
-    if (errorCode) {
-        return exports.KNOWN_HARMONIZED_APP_INSTALLATION_ERRORS[errorCode];
+function isApiErrorCode(errorCode) {
+    if (!errorCode) {
+        return false;
+    }
+    return Object.values(ApiErrorCode).includes(errorCode);
+}
+const expandHarmonizedAppInstallationError = (errorCode, errorMessage) => {
+    if (!isApiErrorCode(errorCode)) {
+        return errorMessage;
+    }
+    switch (errorCode) {
+        case ApiErrorCode.CONCURRENT_SYNC:
+            return cli_shared_1.Text.harmonization.installation.errors.concurrentSync;
+        case ApiErrorCode.MACRO_COLLISION:
+        case ApiErrorCode.FAILED_DESCRIPTOR_VALIDATION:
+            if (errorMessage && errorMessage.length > 0) {
+                return errorMessage;
+            }
+            return errorCode === ApiErrorCode.MACRO_COLLISION
+                ? cli_shared_1.Text.harmonization.installation.errors.placeholderMacroCollision
+                : cli_shared_1.Text.harmonization.installation.errors.placeholderFailedDescriptorValidation;
+        default:
+            (0, cli_shared_1.assertUnreachable)(errorCode);
     }
-    return undefined;
 };
 exports.expandHarmonizedAppInstallationError = expandHarmonizedAppInstallationError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "7.0.4-next.0-experimental-326ff96",
+  "version": "7.0.4-next.3",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,14 +18,14 @@
     "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "4.15.4-next.0-experimental-326ff96",
-    "@forge/cli-shared": "3.23.4-next.0-experimental-326ff96",
+    "@forge/bundler": "4.15.4-next.3",
+    "@forge/cli-shared": "3.23.4-next.2",
     "@forge/egress": "1.2.13",
-    "@forge/lint": "4.0.6-next.0-experimental-326ff96",
-    "@forge/manifest": "5.6.0-next.0-experimental-326ff96",
-    "@forge/node-runtime": "0.7.0",
-    "@forge/runtime": "5.4.0",
-    "@forge/tunnel": "4.0.4-next.0-experimental-326ff96",
+    "@forge/lint": "4.0.6-next.2",
+    "@forge/manifest": "6.0.0-next.1",
+    "@forge/node-runtime": "0.7.1-next.0",
+    "@forge/runtime": "5.4.1-next.0",
+    "@forge/tunnel": "4.0.4-next.3",
     "@forge/util": "1.4.1",
     "@sentry/node": "7.100.1",
     "ajv": "^8.12.0",

package/out/command-line/controller/assertUnreachable.d.ts

@@ -1,2 +0,0 @@
-export declare function assertUnreachable(x: never): never;
-//# sourceMappingURL=assertUnreachable.d.ts.map

package/out/command-line/controller/assertUnreachable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"assertUnreachable.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/assertUnreachable.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAEjD"}

package/out/command-line/controller/assertUnreachable.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertUnreachable = void 0;
-function assertUnreachable(x) {
-    throw new Error("Didn't expect to get here");
-}
-exports.assertUnreachable = assertUnreachable;