@microsoft/teamsfx-core 2.0.4-alpha.a0d5ed36e.0 → 2.0.4-alpha.a70ab7bdd.0

package/build/error/script.d.ts

@@ -3,12 +3,12 @@ import { UserError } from "@microsoft/teamsfx-api";
  * Script execution timeout
  */
 export declare class ScriptTimeoutError extends UserError {
-    constructor(cmd: string);
+    constructor(cmd: string, error?: any);
 }
 /**
  * Script execution error
  */
 export declare class ScriptExecutionError extends UserError {
-    constructor(script: string, message: string);
+    constructor(script: string, message: string, error?: any);
 }
 //# sourceMappingURL=script.d.ts.map

package/build/error/script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../src/error/script.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAoB,MAAM,wBAAwB,CAAC;AAGrE;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;gBACnC,GAAG,EAAE,MAAM;CAUxB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;gBACrC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAU5C"}
+{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../src/error/script.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAoB,MAAM,wBAAwB,CAAC;AAIrE;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;gBACnC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG;CAYrC;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;gBACrC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG;CAYzD"}

package/build/error/script.js

@@ -5,17 +5,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScriptExecutionError = exports.ScriptTimeoutError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../common/localizeUtils");
+const types_1 = require("./types");
 /**
  * Script execution timeout
  */
 class ScriptTimeoutError extends teamsfx_api_1.UserError {
-    constructor(cmd) {
+    constructor(cmd, error) {
         const key = "error.script.ScriptTimeoutError";
         const errorOptions = {
             source: "script",
             name: "ScriptTimeoutError",
             message: localizeUtils_1.getDefaultString(key, cmd),
             displayMessage: localizeUtils_1.getLocalizedString(key, cmd),
+            error: error,
+            categories: [types_1.ErrorCategory.External],
         };
         super(errorOptions);
     }
@@ -25,13 +28,15 @@ exports.ScriptTimeoutError = ScriptTimeoutError;
  * Script execution error
  */
 class ScriptExecutionError extends teamsfx_api_1.UserError {
-    constructor(script, message) {
+    constructor(script, message, error) {
         const key = "error.script.ScriptExecutionError";
         const errorOptions = {
             source: "script",
             name: "ScriptExecutionError",
             message: localizeUtils_1.getDefaultString(key, script, message),
             displayMessage: localizeUtils_1.getLocalizedString(key, script, message),
+            error: error,
+            categories: [types_1.ErrorCategory.External],
         };
         super(errorOptions);
     }

package/build/error/script.js.map

@@ -1 +1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../src/error/script.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAqE;AACrE,2DAA+E;AAE/E;;GAEG;AACH,MAAa,kBAAmB,SAAQ,uBAAS;IAC/C,YAAY,GAAW;QACrB,MAAM,GAAG,GAAG,iCAAiC,CAAC;QAC9C,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;YACnC,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;SAC7C,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAXD,gDAWC;AAED;;GAEG;AACH,MAAa,oBAAqB,SAAQ,uBAAS;IACjD,YAAY,MAAc,EAAE,OAAe;QACzC,MAAM,GAAG,GAAG,mCAAmC,CAAC;QAChD,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC;YAC/C,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC;SACzD,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAXD,oDAWC"}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../src/error/script.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAqE;AACrE,2DAA+E;AAC/E,mCAAwC;AAExC;;GAEG;AACH,MAAa,kBAAmB,SAAQ,uBAAS;IAC/C,YAAY,GAAW,EAAE,KAAW;QAClC,MAAM,GAAG,GAAG,iCAAiC,CAAC;QAC9C,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;YACnC,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;YAC5C,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,CAAC,qBAAa,CAAC,QAAQ,CAAC;SACrC,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAbD,gDAaC;AAED;;GAEG;AACH,MAAa,oBAAqB,SAAQ,uBAAS;IACjD,YAAY,MAAc,EAAE,OAAe,EAAE,KAAW;QACtD,MAAM,GAAG,GAAG,mCAAmC,CAAC;QAChD,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC;YAC/C,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC;YACxD,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,CAAC,qBAAa,CAAC,QAAQ,CAAC;SACrC,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAbD,oDAaC"}

package/build/error/types.d.ts

@@ -0,0 +1,6 @@
+export declare enum ErrorCategory {
+    Internal = "internal",
+    External = "external",
+    Unhandled = "unhandled"
+}
+//# sourceMappingURL=types.d.ts.map

package/build/error/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/error/types.ts"],"names":[],"mappings":"AAEA,oBAAY,aAAa;IACvB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB"}

package/build/error/types.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ErrorCategory = void 0;
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+var ErrorCategory;
+(function (ErrorCategory) {
+    ErrorCategory["Internal"] = "internal";
+    ErrorCategory["External"] = "external";
+    ErrorCategory["Unhandled"] = "unhandled";
+})(ErrorCategory = exports.ErrorCategory || (exports.ErrorCategory = {}));
+//# sourceMappingURL=types.js.map

package/build/error/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/error/types.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;IACrB,wCAAuB,CAAA;AACzB,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB"}

package/build/error/yml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"yml.d.ts","sourceRoot":"","sources":["../../src/error/yml.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAoB,MAAM,wBAAwB,CAAC;AAIrE;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,SAAS;gBACvC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;CAkB9C;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;gBACnC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAUxC;AAED;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,SAAS;gBACtC,KAAK,EAAE,MAAM;CAU1B;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,MAAM,EAAE,MAAM;CAW3B;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,SAAS,EAAE,MAAM;CAW9B"}
+{"version":3,"file":"yml.d.ts","sourceRoot":"","sources":["../../src/error/yml.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAoB,MAAM,wBAAwB,CAAC;AAKrE;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,SAAS;gBACvC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;CAmB9C;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;gBACnC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAWxC;AAED;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,SAAS;gBACtC,KAAK,EAAE,MAAM;CAW1B;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,MAAM,EAAE,MAAM;CAY3B;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,SAAS,EAAE,MAAM;CAY9B"}

package/build/error/yml.js

@@ -9,6 +9,7 @@ exports.LifeCycleUndefinedError = exports.InvalidYmlActionNameError = exports.Ya
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../common/localizeUtils");
 const globalVars_1 = require("../core/globalVars");
+const types_1 = require("./types");
 /**
  * invalid yml schema, failed to parse yml file content into object or schema validation failed
  */
@@ -27,6 +28,7 @@ class InvalidYamlSchemaError extends teamsfx_api_1.UserError {
             name: "InvalidYamlSchemaError",
             message: defaultMessage,
             displayMessage: localizedMessage,
+            categories: [types_1.ErrorCategory.Internal],
         };
         errorOptions.helpLink = "https://aka.ms/teamsfx-actions/invalid-lifecycle-error";
         super(errorOptions);
@@ -44,6 +46,7 @@ class YamlFieldTypeError extends teamsfx_api_1.UserError {
             name: "YamlFieldTypeError",
             message: localizeUtils_1.getDefaultString(key, field, type, globalVars_1.globalVars.ymlFilePath),
             displayMessage: localizeUtils_1.getLocalizedString(key, field, type, globalVars_1.globalVars.ymlFilePath),
+            categories: [types_1.ErrorCategory.Internal],
         };
         super(errorOptions);
     }
@@ -60,6 +63,7 @@ class YamlFieldMissingError extends teamsfx_api_1.UserError {
             name: "YamlFieldMissingError",
             message: localizeUtils_1.getDefaultString(key, field, globalVars_1.globalVars.ymlFilePath),
             displayMessage: localizeUtils_1.getLocalizedString(key, field, globalVars_1.globalVars.ymlFilePath),
+            categories: [types_1.ErrorCategory.Internal],
         };
         super(errorOptions);
     }
@@ -77,6 +81,7 @@ class InvalidYmlActionNameError extends teamsfx_api_1.UserError {
             message: localizeUtils_1.getDefaultString(key, action, globalVars_1.globalVars.ymlFilePath),
             displayMessage: localizeUtils_1.getLocalizedString(key, action, globalVars_1.globalVars.ymlFilePath),
             helpLink: "https://aka.ms/teamsfx-actions",
+            categories: [types_1.ErrorCategory.Internal],
         };
         super(errorOptions);
     }
@@ -94,6 +99,7 @@ class LifeCycleUndefinedError extends teamsfx_api_1.UserError {
             message: localizeUtils_1.getDefaultString(key, lifecycle, globalVars_1.globalVars.ymlFilePath),
             displayMessage: localizeUtils_1.getLocalizedString(key, lifecycle, globalVars_1.globalVars.ymlFilePath),
             helpLink: "https://aka.ms/teamsfx-actions",
+            categories: [types_1.ErrorCategory.Internal],
         };
         super(errorOptions);
     }

package/build/error/yml.js.map

@@ -1 +1 @@
-{"version":3,"file":"yml.js","sourceRoot":"","sources":["../../src/error/yml.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"yml.js","sourceRoot":"","sources":["../../src/error/yml.ts"],"names":[],"mappings":"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"}

package/build/index.d.ts

@@ -21,7 +21,7 @@ export { envUtil, DotenvOutput } from "./component/utils/envUtil";
 export { metadataUtil } from "./component/utils/metadataUtil";
 export { pathUtils } from "./component/utils/pathUtils";
 export { CoreCallbackFunc, FxCore } from "./core/FxCore";
-export { sampleProvider } from "./common/samples";
+export { sampleProvider, SampleConfig } from "./common/samples";
 export { loadingOptionsPlaceholder, loadingDefaultPlaceholder } from "./common/utils";
 export { AppStudioClient } from "./component/driver/teamsApp/clients/appStudioClient";
 export { getPermissionMap } from "./component/driver/aad/permissions/index";
@@ -30,6 +30,7 @@ export * from "./component/driver/teamsApp/utils/utils";
 export { manifestUtils } from "./component/driver/teamsApp/utils/ManifestUtils";
 export { CollaborationConstants } from "./core/collaborator";
 export { environmentManager } from "./core/environment";
+export { environmentNameManager } from "./core/environmentName";
 export * from "./core/error";
 export { QuestionNames as CoreQuestionNames } from "./question/questionNames";
 export * from "./core/types";

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACpE,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAC;AACpG,cAAc,yCAAyC,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC9E,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,4CAA4C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACpE,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAC;AACpG,cAAc,yCAAyC,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC9E,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,4CAA4C,CAAC"}

package/build/index.js

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoreQuestionNames = exports.environmentManager = exports.CollaborationConstants = exports.manifestUtils = exports.getPermissionMap = exports.AppStudioClient = exports.loadingDefaultPlaceholder = exports.loadingOptionsPlaceholder = exports.sampleProvider = exports.FxCore = exports.pathUtils = exports.metadataUtil = exports.envUtil = exports.TelemetryUtils = exports.VersionState = exports.MetadataV3 = exports.PackageService = exports.jsonUtils = void 0;
+exports.CoreQuestionNames = exports.environmentNameManager = exports.environmentManager = exports.CollaborationConstants = exports.manifestUtils = exports.getPermissionMap = exports.AppStudioClient = exports.loadingDefaultPlaceholder = exports.loadingOptionsPlaceholder = exports.sampleProvider = exports.FxCore = exports.pathUtils = exports.metadataUtil = exports.envUtil = exports.TelemetryUtils = exports.VersionState = exports.MetadataV3 = exports.PackageService = exports.jsonUtils = void 0;
 const tslib_1 = require("tslib");
 require("reflect-metadata");
 tslib_1.__exportStar(require("./common/correlator"), exports);
@@ -52,6 +52,8 @@ var collaborator_1 = require("./core/collaborator");
 Object.defineProperty(exports, "CollaborationConstants", { enumerable: true, get: function () { return collaborator_1.CollaborationConstants; } });
 var environment_1 = require("./core/environment");
 Object.defineProperty(exports, "environmentManager", { enumerable: true, get: function () { return environment_1.environmentManager; } });
+var environmentName_1 = require("./core/environmentName");
+Object.defineProperty(exports, "environmentNameManager", { enumerable: true, get: function () { return environmentName_1.environmentNameManager; } });
 tslib_1.__exportStar(require("./core/error"), exports);
 var questionNames_1 = require("./question/questionNames");
 Object.defineProperty(exports, "CoreQuestionNames", { enumerable: true, get: function () { return questionNames_1.QuestionNames; } });

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,4BAA0B;AAC1B,8DAAoC;AACpC,gEAAsC;AACtC,gEAAsC;AACtC,+DAAqC;AACrC,6DAAmC;AACnC,gDAA+C;AAAtC,sGAAA,SAAS,OAAA;AAClB,yDAA+B;AAC/B,kEAAwC;AACxC,+DAA8D;AAArD,gHAAA,cAAc,OAAA;AACvB,wEAA8C;AAC9C,uEAA6C;AAC7C,yEAA+C;AAC/C,2EAAiD;AACjD,yDAA+B;AAC/B,4DAAoE;AAA3D,6GAAA,UAAU,OAAA;AAAE,+GAAA,YAAY,OAAA;AACjC,gEAAsC;AACtC,8DAAoC;AACpC,yEAA6E;AAApE,2GAAA,cAAc,OAAA;AACvB,qDAAkE;AAAzD,kGAAA,OAAO,OAAA;AAChB,+DAA8D;AAArD,4GAAA,YAAY,OAAA;AACrB,yDAAwD;AAA/C,sGAAA,SAAS,OAAA;AAClB,wCAAyD;AAA9B,gGAAA,MAAM,OAAA;AACjC,4CAAkD;AAAzC,yGAAA,cAAc,OAAA;AACvB,wCAAsF;AAA7E,kHAAA,yBAAyB,OAAA;AAAE,kHAAA,yBAAyB,OAAA;AAC7D,uFAAsF;AAA7E,kHAAA,eAAe,OAAA;AACxB,kEAA4E;AAAnE,yGAAA,gBAAgB,OAAA;AAEzB,kFAAwD;AACxD,iFAAgF;AAAvE,8GAAA,aAAa,OAAA;AACtB,oDAA6D;AAApD,sHAAA,sBAAsB,OAAA;AAC/B,kDAAwD;AAA/C,iHAAA,kBAAkB,OAAA;AAC3B,uDAA6B;AAC7B,0DAA8E;AAArE,kHAAA,aAAa,OAAqB;AAC3C,uDAA6B;AAC7B,wDAA8B;AAC9B,uDAA6B;AAC7B,+DAAqC;AACrC,qDAA2B;AAC3B,qFAA2D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,4BAA0B;AAC1B,8DAAoC;AACpC,gEAAsC;AACtC,gEAAsC;AACtC,+DAAqC;AACrC,6DAAmC;AACnC,gDAA+C;AAAtC,sGAAA,SAAS,OAAA;AAClB,yDAA+B;AAC/B,kEAAwC;AACxC,+DAA8D;AAArD,gHAAA,cAAc,OAAA;AACvB,wEAA8C;AAC9C,uEAA6C;AAC7C,yEAA+C;AAC/C,2EAAiD;AACjD,yDAA+B;AAC/B,4DAAoE;AAA3D,6GAAA,UAAU,OAAA;AAAE,+GAAA,YAAY,OAAA;AACjC,gEAAsC;AACtC,8DAAoC;AACpC,yEAA6E;AAApE,2GAAA,cAAc,OAAA;AACvB,qDAAkE;AAAzD,kGAAA,OAAO,OAAA;AAChB,+DAA8D;AAArD,4GAAA,YAAY,OAAA;AACrB,yDAAwD;AAA/C,sGAAA,SAAS,OAAA;AAClB,wCAAyD;AAA9B,gGAAA,MAAM,OAAA;AACjC,4CAAgE;AAAvD,yGAAA,cAAc,OAAA;AACvB,wCAAsF;AAA7E,kHAAA,yBAAyB,OAAA;AAAE,kHAAA,yBAAyB,OAAA;AAC7D,uFAAsF;AAA7E,kHAAA,eAAe,OAAA;AACxB,kEAA4E;AAAnE,yGAAA,gBAAgB,OAAA;AAEzB,kFAAwD;AACxD,iFAAgF;AAAvE,8GAAA,aAAa,OAAA;AACtB,oDAA6D;AAApD,sHAAA,sBAAsB,OAAA;AAC/B,kDAAwD;AAA/C,iHAAA,kBAAkB,OAAA;AAC3B,0DAAgE;AAAvD,yHAAA,sBAAsB,OAAA;AAC/B,uDAA6B;AAC7B,0DAA8E;AAArE,kHAAA,aAAa,OAAqB;AAC3C,uDAA6B;AAC7B,wDAA8B;AAC9B,uDAA6B;AAC7B,+DAAqC;AACrC,qDAA2B;AAC3B,qFAA2D"}

package/build/question/constants.d.ts

@@ -1,4 +1,6 @@
-export declare const copilotPluginApiSpecOptionId = "existing-api";
-export declare const copilotPluginOpenAIPluginOptionId = "openai-plugin";
+export declare const copilotPluginApiSpecOptionId = "copilot-plugin-existing-api";
+export declare const copilotPluginOpenAIPluginOptionId = "copilot-plugin-openai-plugin";
 export declare const copilotPluginExistingApiOptionIds: string[];
+export declare const copilotPluginNewApiOptionId = "copilot-plugin-new-api";
+export declare const copilotPluginOptionIds: string[];
 //# sourceMappingURL=constants.d.ts.map

package/build/question/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAC3D,eAAO,MAAM,iCAAiC,kBAAkB,CAAC;AACjE,eAAO,MAAM,iCAAiC,UAG7C,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E,eAAO,MAAM,iCAAiC,iCAAiC,CAAC;AAChF,eAAO,MAAM,iCAAiC,UAG7C,CAAC;AACF,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AACpE,eAAO,MAAM,sBAAsB,UAIlC,CAAC"}

package/build/question/constants.js

@@ -2,11 +2,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copilotPluginExistingApiOptionIds = exports.copilotPluginOpenAIPluginOptionId = exports.copilotPluginApiSpecOptionId = void 0;
-exports.copilotPluginApiSpecOptionId = "existing-api";
-exports.copilotPluginOpenAIPluginOptionId = "openai-plugin";
+exports.copilotPluginOptionIds = exports.copilotPluginNewApiOptionId = exports.copilotPluginExistingApiOptionIds = exports.copilotPluginOpenAIPluginOptionId = exports.copilotPluginApiSpecOptionId = void 0;
+exports.copilotPluginApiSpecOptionId = "copilot-plugin-existing-api";
+exports.copilotPluginOpenAIPluginOptionId = "copilot-plugin-openai-plugin";
 exports.copilotPluginExistingApiOptionIds = [
     exports.copilotPluginApiSpecOptionId,
     exports.copilotPluginOpenAIPluginOptionId,
 ];
+exports.copilotPluginNewApiOptionId = "copilot-plugin-new-api";
+exports.copilotPluginOptionIds = [
+    exports.copilotPluginNewApiOptionId,
+    exports.copilotPluginApiSpecOptionId,
+    exports.copilotPluginOpenAIPluginOptionId,
+];
 //# sourceMappingURL=constants.js.map

package/build/question/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,4BAA4B,GAAG,cAAc,CAAC;AAC9C,QAAA,iCAAiC,GAAG,eAAe,CAAC;AACpD,QAAA,iCAAiC,GAAG;IAC/C,oCAA4B;IAC5B,yCAAiC;CAClC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,4BAA4B,GAAG,6BAA6B,CAAC;AAC7D,QAAA,iCAAiC,GAAG,8BAA8B,CAAC;AACnE,QAAA,iCAAiC,GAAG;IAC/C,oCAA4B;IAC5B,yCAAiC;CAClC,CAAC;AACW,QAAA,2BAA2B,GAAG,wBAAwB,CAAC;AACvD,QAAA,sBAAsB,GAAG;IACpC,mCAA2B;IAC3B,oCAA4B;IAC5B,yCAAiC;CAClC,CAAC"}

package/build/question/create.d.ts

@@ -23,16 +23,28 @@ export declare class CapabilityOptions {
     static SPFxTab(): OptionItem;
     static linkUnfurling(): OptionItem;
     static m365SearchMe(): OptionItem;
+    static copilotM365SearchMe(): OptionItem;
     static SearchMe(): OptionItem;
     static collectFormMe(): OptionItem;
     static me(): OptionItem;
     static bots(inputs?: Inputs): OptionItem[];
     static tabs(): OptionItem[];
     static dotnetCaps(inputs?: Inputs): OptionItem[];
+    /**
+     * Collect all capabilities for message extension, including dotnet and nodejs.
+     * @param filterByFeatureFlag true: filter capabilities by feature flag, false: return all capabilities
+     * @returns OptionItem[] capability list
+     */
+    static collectMECaps(filterByFeatureFlag: boolean): OptionItem[];
     static mes(inputs?: Inputs): OptionItem[];
     static copilotPlugins(): OptionItem[];
-    static copilotPluginCli(): OptionItem;
+    /**
+     * static capability list, which does not depend on any feature flags
+     */
     static staticAll(inputs?: Inputs): OptionItem[];
+    /**
+     * dynamic capability list, which depends on feature flags
+     */
     static all(inputs?: Inputs): OptionItem[];
     static officeAddinImport(): OptionItem;
     static officeAddinItems(): OptionItem[];
@@ -43,6 +55,7 @@ export declare class CapabilityOptions {
     static copilotPluginOpenAIPlugin(): OptionItem;
     static aiBot(): OptionItem;
 }
+export declare function capabilityQuestion(): SingleSelectQuestion;
 declare enum HostType {
     AppService = "app-service",
     Functions = "azure-functions"

package/build/question/create.d.ts.map

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

package/build/question/create.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.apiOperationQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.officeAddinHostingQuestion = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.CapabilityOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
+exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.apiOperationQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.officeAddinHostingQuestion = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -101,7 +101,7 @@ function projectTypeQuestion() {
         dynamicOptions: (inputs) => {
             var _a;
             let staticOptions;
-            if (featureFlags_1.isCopilotPluginEnabled()) {
+            if (featureFlags_1.isApiCopilotPluginEnabled()) {
                 staticOptions = [
                     ProjectTypeOptions.copilotPlugin(inputs.platform),
                     ProjectTypeOptions.bot(inputs.platform),
@@ -266,6 +266,14 @@ class CapabilityOptions {
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlook"),
         };
     }
+    static copilotM365SearchMe() {
+        return {
+            id: "search-me-copilot",
+            label: `${localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.label")}`,
+            detail: localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.detail"),
+            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlookCopilot"),
+        };
+    }
     static SearchMe() {
         return {
             id: "search-message-extension",
@@ -322,6 +330,29 @@ class CapabilityOptions {
             ...CapabilityOptions.mes(inputs),
         ];
     }
+    /**
+     * Collect all capabilities for message extension, including dotnet and nodejs.
+     * @param filterByFeatureFlag true: filter capabilities by feature flag, false: return all capabilities
+     * @returns OptionItem[] capability list
+     */
+    static collectMECaps(filterByFeatureFlag) {
+        return filterByFeatureFlag
+            ? [
+                CapabilityOptions.linkUnfurling(),
+                featureFlags_1.isCopilotPluginEnabled()
+                    ? CapabilityOptions.copilotM365SearchMe()
+                    : CapabilityOptions.m365SearchMe(),
+                CapabilityOptions.collectFormMe(),
+                CapabilityOptions.SearchMe(),
+            ]
+            : [
+                CapabilityOptions.linkUnfurling(),
+                CapabilityOptions.m365SearchMe(),
+                CapabilityOptions.collectFormMe(),
+                CapabilityOptions.copilotM365SearchMe(),
+                CapabilityOptions.SearchMe(),
+            ];
+    }
     static mes(inputs) {
         return inputs !== undefined && getRuntime(inputs) === RuntimeOptions.DotNet().id
             ? [
@@ -331,7 +362,9 @@ class CapabilityOptions {
             ]
             : [
                 CapabilityOptions.linkUnfurling(),
-                CapabilityOptions.m365SearchMe(),
+                featureFlags_1.isCopilotPluginEnabled()
+                    ? CapabilityOptions.copilotM365SearchMe()
+                    : CapabilityOptions.m365SearchMe(),
                 CapabilityOptions.collectFormMe(),
             ];
     }
@@ -342,31 +375,29 @@ class CapabilityOptions {
             CapabilityOptions.copilotPluginOpenAIPlugin(),
         ];
     }
-    static copilotPluginCli() {
-        return {
-            id: "copilot-plugin-capability",
-            label: `${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.label")}`,
-            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.detail"),
-        };
-    }
+    /**
+     * static capability list, which does not depend on any feature flags
+     */
     static staticAll(inputs) {
         const capabilityOptions = [
             ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
-            ...CapabilityOptions.mes(),
-            CapabilityOptions.copilotPluginCli(),
+            ...CapabilityOptions.collectMECaps(false),
+            ...CapabilityOptions.copilotPlugins(),
         ];
         return capabilityOptions;
     }
+    /**
+     * dynamic capability list, which depends on feature flags
+     */
     static all(inputs) {
-        // teamsfx list capabilities
         const capabilityOptions = [
             ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
-            ...CapabilityOptions.mes(),
+            ...CapabilityOptions.collectMECaps(true),
         ];
-        if (featureFlags_1.isCopilotPluginEnabled()) {
-            capabilityOptions.push(CapabilityOptions.copilotPluginCli());
+        if (featureFlags_1.isApiCopilotPluginEnabled()) {
+            capabilityOptions.push(...CapabilityOptions.copilotPlugins());
         }
         return capabilityOptions;
     }
@@ -401,7 +432,7 @@ class CapabilityOptions {
     // copilot plugin
     static copilotPluginNewApi() {
         return {
-            id: "new-api",
+            id: constants_3.copilotPluginNewApiOptionId,
             label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginNewApiOption.label"),
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginNewApiOption.detail"),
         };
@@ -468,6 +499,10 @@ function capabilityQuestion() {
             if (getRuntime(inputs) === RuntimeOptions.DotNet().id) {
                 return CapabilityOptions.dotnetCaps(inputs);
             }
+            if (inputs.nonInteractive && inputs.platform === teamsfx_api_1.Platform.CLI) {
+                //cli non-interactive mode the choice list is the same as staticOptions
+                return CapabilityOptions.all(inputs);
+            }
             // nodejs capabilities
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
             if (projectType === ProjectTypeOptions.bot().id) {
@@ -486,15 +521,7 @@ function capabilityQuestion() {
                 return CapabilityOptions.copilotPlugins();
             }
             else {
-                const capabilityOptions = [
-                    ...CapabilityOptions.bots(inputs),
-                    ...CapabilityOptions.tabs(),
-                    ...CapabilityOptions.mes(),
-                ];
-                if (featureFlags_1.isCopilotPluginEnabled()) {
-                    capabilityOptions.push(CapabilityOptions.copilotPluginCli());
-                }
-                return capabilityOptions;
+                return CapabilityOptions.all(inputs);
             }
         },
         placeholder: (inputs) => {
@@ -507,6 +534,7 @@ function capabilityQuestion() {
         skipSingleOption: true,
     };
 }
+exports.capabilityQuestion = capabilityQuestion;
 var HostType;
 (function (HostType) {
     HostType["AppService"] = "app-service";
@@ -622,16 +650,6 @@ function botTriggerQuestion() {
         placeholder: localizeUtils_1.getLocalizedString("plugins.bot.questionHostTypeTrigger.placeholder"),
     };
 }
-function copilotPluginDevelopmentQuestion() {
-    return {
-        name: questionNames_1.QuestionNames.CopilotPluginDevelopment,
-        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.title"),
-        type: "singleSelect",
-        staticOptions: CapabilityOptions.copilotPlugins(),
-        cliShortName: "p",
-        cliDescription: "Plugin for Copilot.",
-    };
-}
 function SPFxSolutionQuestion() {
     return {
         type: "singleSelect",
@@ -710,6 +728,7 @@ function SPFxFrameworkQuestion() {
         type: "singleSelect",
         name: questionNames_1.QuestionNames.SPFxFramework,
         cliShortName: "k",
+        cliDescription: "Framework.",
         title: localizeUtils_1.getLocalizedString("plugins.spfx.questions.framework.title"),
         staticOptions: [
             { id: "react", label: "React" },
@@ -1217,8 +1236,8 @@ function openAIPluginManifestLocationQuestion() {
         type: "text",
         name: questionNames_1.QuestionNames.OpenAIPluginDomain,
         cliShortName: "d",
-        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.AIPluginManifest.title"),
-        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.AIPluginManifest.placeholder"),
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.OpenAIPluginDomain"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.OpenAIPluginDomain.placeholder"),
         cliDescription: "OpenAI plugin website domain.",
         forgetLastValue: true,
         validation: {
@@ -1300,14 +1319,6 @@ function apiOperationQuestion(includeExistingAPIs = true) {
     };
 }
 exports.apiOperationQuestion = apiOperationQuestion;
-function getCopilotPluginFeatureId(inputs) {
-    if (teamsfx_api_1.CLIPlatforms.includes(inputs.platform)) {
-        return inputs[questionNames_1.QuestionNames.CopilotPluginDevelopment];
-    }
-    else {
-        return inputs[questionNames_1.QuestionNames.Capabilities];
-    }
-}
 function capabilitySubTree() {
     const node = {
         data: capabilityQuestion(),
@@ -1365,32 +1376,22 @@ function capabilitySubTree() {
                 },
                 data: officeAddinHostingQuestion(),
             },
-            {
-                // Copilot plugin sub-tree (will show in CLI only)
-                condition: (inputs) => {
-                    return (teamsfx_api_1.CLIPlatforms.includes(inputs.platform) &&
-                        inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginCli().id);
-                },
-                data: copilotPluginDevelopmentQuestion(),
-            },
             {
                 // Copilot plugin from API spec or AI Plugin
-                condition: (inputs) => {
-                    return constants_3.copilotPluginExistingApiOptionIds.includes(getCopilotPluginFeatureId(inputs));
+                condition: {
+                    enum: [
+                        CapabilityOptions.copilotPluginApiSpec().id,
+                        CapabilityOptions.copilotPluginOpenAIPlugin().id,
+                    ],
                 },
                 data: { type: "group", name: questionNames_1.QuestionNames.CopilotPluginExistingApi },
                 children: [
                     {
-                        condition: (inputs) => {
-                            return (getCopilotPluginFeatureId(inputs) === CapabilityOptions.copilotPluginApiSpec().id);
-                        },
+                        condition: { equals: CapabilityOptions.copilotPluginApiSpec().id },
                         data: apiSpecLocationQuestion(),
                     },
                     {
-                        condition: (inputs) => {
-                            return (getCopilotPluginFeatureId(inputs) ===
-                                CapabilityOptions.copilotPluginOpenAIPlugin().id);
-                        },
+                        condition: { equals: CapabilityOptions.copilotPluginOpenAIPlugin().id },
                         data: openAIPluginManifestLocationQuestion(),
                     },
                     {
@@ -1401,14 +1402,11 @@ function capabilitySubTree() {
             {
                 // programming language
                 data: programmingLanguageQuestion(),
-                condition: (inputs) => {
-                    const copilotFeature = getCopilotPluginFeatureId(inputs);
-                    if (copilotFeature) {
-                        return !constants_3.copilotPluginExistingApiOptionIds.includes(getCopilotPluginFeatureId(inputs));
-                    }
-                    else {
-                        return !!inputs[questionNames_1.QuestionNames.Capabilities];
-                    }
+                condition: {
+                    excludesEnum: [
+                        CapabilityOptions.copilotPluginApiSpec().id,
+                        CapabilityOptions.copilotPluginOpenAIPlugin().id,
+                    ],
                 },
             },
             {
@@ -1500,9 +1498,8 @@ function createProjectCliHelpNode() {
     if (!featureFlags_1.isCLIDotNetEnabled()) {
         deleteNames.push(questionNames_1.QuestionNames.Runtime);
     }
-    if (!featureFlags_1.isCopilotPluginEnabled()) {
+    if (!featureFlags_1.isApiCopilotPluginEnabled()) {
         deleteNames.push(questionNames_1.QuestionNames.CopilotPluginExistingApi);
-        deleteNames.push(questionNames_1.QuestionNames.CopilotPluginDevelopment);
     }
     trimQuestionTreeForCliHelp(node, deleteNames);
     return node;