@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.70b3a70e.0

package/build/core/index.js

@@ -8,7 +8,6 @@ const hooks_1 = require("@feathersjs/hooks");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const jsonschema = tslib_1.__importStar(require("jsonschema"));
-const lodash_1 = require("lodash");
 const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
 const uuid = tslib_1.__importStar(require("uuid"));
@@ -36,7 +35,6 @@ const localSettingsWriter_1 = require("./middleware/localSettingsWriter");
 const migrateConditionHandler_1 = require("./middleware/migrateConditionHandler");
 const projectMigrator_1 = require("./middleware/projectMigrator");
 const projectSettingsLoader_1 = require("./middleware/projectSettingsLoader");
-const projectSettingsLoaderV3_1 = require("./middleware/projectSettingsLoaderV3");
 const projectSettingsWriter_1 = require("./middleware/projectSettingsWriter");
 const questionModel_1 = require("./middleware/questionModel");
 const solutionLoader_1 = require("./middleware/solutionLoader");
@@ -45,6 +43,7 @@ const supportV1ConditionHandler_1 = require("./middleware/supportV1ConditionHand
 const question_2 = require("./question");
 const SolutionPluginContainer_1 = require("./SolutionPluginContainer");
 const tools_2 = require("./tools");
+const utils_1 = require("./utils");
 // TODO: For package.json,
 // use require instead of import because of core building/packaging method.
 // Using import will cause the build folder structure to change.
@@ -84,14 +83,12 @@ class FxCore {
         this._getQuestions = questionModel_1.getQuestionsV2;
         this._getQuestionsForMigrateV1Project = questionModel_1.getQuestionsForMigrateV1Project;
         //v3 questions
-        this._getQuestionsForScaffold = questionModel_1.getQuestionsForScaffold;
-        this._getQuestionsForAddModule = questionModel_1.getQuestionsForAddModule;
-        this._getQuestionsForAddResource = questionModel_1.getQuestionsForAddResource;
+        this._getQuestionsForAddFeature = questionModel_1.getQuestionsForAddFeature;
         this._getQuestionsForProvision = questionModel_1.getQuestionsForProvision;
         this._getQuestionsForDeploy = questionModel_1.getQuestionsForDeploy;
-        this._getQuestionsForLocalProvision = questionModel_1.getQuestionsForLocalProvision;
         this._getQuestionsForPublish = questionModel_1.getQuestionsForPublish;
         this._getQuestionsForInit = questionModel_1.getQuestionsForInit;
+        this._getQuestionsForUserTaskV3 = questionModel_1.getQuestionsForUserTaskV3;
         this.tools = tools;
         exports.TOOLS = tools;
         exports.Logger = tools.logProvider;
@@ -131,6 +128,7 @@ class FxCore {
         const scratch = inputs[question_2.CoreQuestionNames.CreateFromScratch];
         let projectPath;
         let globalStateDescription = "openReadme";
+        const automaticNpmInstall = "automaticNpmInstall";
         if (scratch === question_2.ScratchOptionNo.id) {
             // create from sample
             const downloadRes = await downloadSample_1.downloadSample(inputs, ctx);
@@ -167,45 +165,54 @@ class FxCore {
             const projectSettings = {
                 appName: appName,
                 projectId: inputs.projectId ? inputs.projectId : uuid.v4(),
-                solutionSettings: {
-                    name: "",
-                    version: "1.0.0",
-                },
                 version: getProjectSettingsVersion(),
                 isFromSample: false,
             };
-            ctx.projectSettings = projectSettings;
-            const createEnvResult = await this.createEnvWithName(__1.environmentManager.getDefaultEnvName(), projectSettings, inputs);
-            if (createEnvResult.isErr()) {
-                return teamsfx_api_1.err(createEnvResult.error);
-            }
-            const solution = await SolutionPluginContainer_1.getSolutionPluginV2ByName(inputs[question_2.CoreQuestionNames.Solution]);
-            if (!solution) {
-                return teamsfx_api_1.err(new error_1.LoadSolutionError());
-            }
-            ctx.solutionV2 = solution;
-            projectSettings.solutionSettings.name = solution.name;
-            const contextV2 = createV2Context(projectSettings);
-            ctx.contextV2 = contextV2;
-            const scaffoldSourceCodeRes = await solution.scaffoldSourceCode(contextV2, inputs);
-            if (scaffoldSourceCodeRes.isErr()) {
-                return teamsfx_api_1.err(scaffoldSourceCodeRes.error);
+            if (utils_1.isCreatedFromExistingApp(inputs)) {
+                // there is no solution settings if created from existing app
+                //TODO create from existing Tab or Bot/ME
+                // 1. call App Studio V3 API to create manifest with placeholder
+                // 2. create config.local.json to store existing App information
             }
-            const generateResourceTemplateRes = await solution.generateResourceTemplate(contextV2, inputs);
-            if (generateResourceTemplateRes.isErr()) {
-                return teamsfx_api_1.err(generateResourceTemplateRes.error);
-            }
-            // ctx.provisionInputConfig = generateResourceTemplateRes.value;
-            if (solution.createEnv) {
-                inputs.copy = false;
-                const createEnvRes = await solution.createEnv(contextV2, inputs);
-                if (createEnvRes.isErr()) {
-                    return teamsfx_api_1.err(createEnvRes.error);
+            else {
+                projectSettings.solutionSettings = {
+                    name: "",
+                    version: "1.0.0",
+                };
+                ctx.projectSettings = projectSettings;
+                const createEnvResult = await this.createEnvWithName(__1.environmentManager.getDefaultEnvName(), projectSettings, inputs);
+                if (createEnvResult.isErr()) {
+                    return teamsfx_api_1.err(createEnvResult.error);
+                }
+                const solution = await SolutionPluginContainer_1.getSolutionPluginV2ByName(inputs[question_2.CoreQuestionNames.Solution]);
+                if (!solution) {
+                    return teamsfx_api_1.err(new error_1.LoadSolutionError());
+                }
+                ctx.solutionV2 = solution;
+                projectSettings.solutionSettings.name = solution.name;
+                const contextV2 = createV2Context(projectSettings);
+                ctx.contextV2 = contextV2;
+                const scaffoldSourceCodeRes = await solution.scaffoldSourceCode(contextV2, inputs);
+                if (scaffoldSourceCodeRes.isErr()) {
+                    return teamsfx_api_1.err(scaffoldSourceCodeRes.error);
+                }
+                const generateResourceTemplateRes = await solution.generateResourceTemplate(contextV2, inputs);
+                if (generateResourceTemplateRes.isErr()) {
+                    return teamsfx_api_1.err(generateResourceTemplateRes.error);
+                }
+                // ctx.provisionInputConfig = generateResourceTemplateRes.value;
+                if (solution.createEnv) {
+                    inputs.copy = false;
+                    const createEnvRes = await solution.createEnv(contextV2, inputs);
+                    if (createEnvRes.isErr()) {
+                        return teamsfx_api_1.err(createEnvRes.error);
+                    }
                 }
             }
         }
         if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
             await globalState_1.globalStateUpdate(globalStateDescription, true);
+            await globalState_1.globalStateUpdate(automaticNpmInstall, true);
         }
         return teamsfx_api_1.ok(projectPath);
     }
@@ -228,6 +235,7 @@ class FxCore {
         const scratch = inputs[question_2.CoreQuestionNames.CreateFromScratch];
         let projectPath;
         let globalStateDescription = "openReadme";
+        const automaticNpmInstall = "automaticNpmInstall";
         if (scratch === question_2.ScratchOptionNo.id) {
             // create from sample
             const downloadRes = await downloadSample_1.downloadSample(inputs, ctx);
@@ -256,136 +264,51 @@ class FxCore {
             }
             await fs.ensureDir(projectPath);
             await fs.ensureDir(path.join(projectPath, `.${teamsfx_api_1.ConfigFolderName}`));
-            let capabilities = inputs[question_2.CoreQuestionNames.Capabilities];
-            let projectType = "";
-            if (capabilities.includes(question_2.TabSPFxItem.id))
-                projectType = "spfx";
-            else if (capabilities.includes(question_2.TabOptionItem.id) && capabilities.length === 1)
-                projectType = "tab";
-            else if ((capabilities.includes(question_2.BotOptionItem.id) ||
-                capabilities.includes(question_1.MessageExtensionItem.id)) &&
-                !capabilities.includes(question_2.TabOptionItem.id))
-                projectType = "bot";
-            else if ((capabilities.includes(question_2.BotOptionItem.id) ||
-                capabilities.includes(question_1.MessageExtensionItem.id)) &&
-                capabilities.includes(question_2.TabOptionItem.id))
-                projectType = "tab+bot";
-            const programmingLanguage = inputs[question_2.CoreQuestionNames.ProgrammingLanguage];
-            // const solution = capabilities.includes(TabSPFxItem.id)
-            //   ? BuiltInSolutionNames.spfx
-            //   : BuiltInSolutionNames.azure;
+            const capabilities = inputs[question_2.CoreQuestionNames.Capabilities];
             // init
             const initInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath });
             const initRes = await this._init(initInputs, ctx);
             if (initRes.isErr()) {
                 return teamsfx_api_1.err(initRes.error);
             }
-            // addModule, scaffold and addResource
+            // set solution in context
+            ctx.solutionV3 = typedi_1.Container.get(constants_2.BuiltInSolutionNames.azure);
+            // addFeature
             if (inputs.platform === teamsfx_api_1.Platform.VS) {
-                // addModule
-                const addModuleInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, capabilities: capabilities });
-                const addModuleRes = await this._addModule(addModuleInputs, ctx);
-                if (addModuleRes.isErr()) {
-                    return teamsfx_api_1.err(addModuleRes.error);
-                }
-                // addResource
-                const addResourceInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", resource: constants_2.BuiltInResourcePluginNames.webApp });
-                const addResourceRes = await this._addResource(addResourceInputs, ctx);
-                if (addResourceRes.isErr()) {
-                    return teamsfx_api_1.err(addResourceRes.error);
-                }
-                // scaffold
-                let templateName = "";
-                if (projectType === "tab")
-                    templateName = "BlazorTab";
-                else if (projectType === "bot")
-                    templateName = "BlazorBot";
-                else if (projectType === "tabbot")
-                    templateName = "BlazorTabBot";
-                const scaffoldInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", template: {
-                        id: `${constants_2.BuiltInScaffoldPluginNames.blazor}/${templateName}`,
-                        label: `${constants_2.BuiltInScaffoldPluginNames.blazor}/${templateName}`,
-                        data: {
-                            pluginName: constants_2.BuiltInScaffoldPluginNames.blazor,
-                            templateName: templateName,
-                        },
-                    } });
-                const scaffoldRes = await this._scaffold(scaffoldInputs, ctx);
-                if (scaffoldRes.isErr()) {
-                    return teamsfx_api_1.err(scaffoldRes.error);
+                const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, feature: constants_2.BuiltInFeaturePluginNames.dotnet });
+                const addFeatureRes = await this._addFeature(addFeatureInputs, ctx);
+                if (addFeatureRes.isErr()) {
+                    return teamsfx_api_1.err(addFeatureRes.error);
                 }
             }
             else {
-                if (capabilities.includes(question_2.TabOptionItem.id) || capabilities.includes(question_2.TabSPFxItem.id)) {
-                    const addModuleInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, capabilities: capabilities.includes(question_2.TabOptionItem.id)
-                            ? [question_2.TabOptionItem.id]
-                            : [question_2.TabSPFxItem.id] });
-                    const addModuleRes = await this._addModule(addModuleInputs, ctx);
-                    if (addModuleRes.isErr()) {
-                        return teamsfx_api_1.err(addModuleRes.error);
-                    }
-                    // addResource
-                    const addResourceInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", resource: capabilities.includes(question_2.TabOptionItem.id)
-                            ? constants_2.BuiltInResourcePluginNames.storage
-                            : constants_2.BuiltInResourcePluginNames.spfx });
-                    const addResourceRes = await this._addResource(addResourceInputs, ctx);
-                    if (addResourceRes.isErr()) {
-                        return teamsfx_api_1.err(addResourceRes.error);
-                    }
-                    // scaffold
-                    const pluginName = capabilities.includes(question_2.TabOptionItem.id)
-                        ? constants_2.BuiltInScaffoldPluginNames.tab
-                        : constants_2.BuiltInScaffoldPluginNames.spfx;
-                    const templateName = capabilities.includes(question_2.TabOptionItem.id)
-                        ? programmingLanguage === "javascript"
-                            ? "ReactTab_JS"
-                            : "ReactTab_TS"
-                        : "SPFxTab";
-                    const scaffoldInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", template: {
-                            id: `${pluginName}/${templateName}`,
-                            label: `${pluginName}/${templateName}`,
-                            data: {
-                                pluginName: pluginName,
-                                templateName: templateName, //TODO
-                            },
-                        } });
-                    const scaffoldRes = await this._scaffold(scaffoldInputs, ctx);
-                    if (scaffoldRes.isErr()) {
-                        return teamsfx_api_1.err(scaffoldRes.error);
+                if (capabilities.includes(question_2.TabOptionItem.id)) {
+                    const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, feature: constants_2.BuiltInFeaturePluginNames.frontend });
+                    const addFeatureRes = await this._addFeature(addFeatureInputs, ctx);
+                    if (addFeatureRes.isErr()) {
+                        return teamsfx_api_1.err(addFeatureRes.error);
                     }
                 }
-                capabilities = capabilities.filter((c) => c !== question_2.TabOptionItem.id && c !== question_2.TabSPFxItem.id);
-                if (capabilities.length > 0) {
-                    const addModuleInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, capabilities: capabilities });
-                    const addModuleRes = await this._addModule(addModuleInputs, ctx);
-                    if (addModuleRes.isErr()) {
-                        return teamsfx_api_1.err(addModuleRes.error);
+                else if (capabilities.includes(question_2.TabSPFxItem.id)) {
+                    const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, feature: constants_2.BuiltInFeaturePluginNames.spfx });
+                    const addFeatureRes = await this._addFeature(addFeatureInputs, ctx);
+                    if (addFeatureRes.isErr()) {
+                        return teamsfx_api_1.err(addFeatureRes.error);
                     }
-                    // addResource
-                    const addResourceInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "1", resource: constants_2.BuiltInResourcePluginNames.bot });
-                    const addResourceRes = await this._addResource(addResourceInputs, ctx);
-                    if (addResourceRes.isErr()) {
-                        return teamsfx_api_1.err(addResourceRes.error);
-                    }
-                    // scaffold
-                    const templateName = programmingLanguage === "javascript" ? "NodejsBot_JS" : "NodejsBot_TS";
-                    const scaffoldInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "1", resource: constants_2.BuiltInScaffoldPluginNames.bot, template: {
-                            id: `${constants_2.BuiltInScaffoldPluginNames.bot}/${templateName}`,
-                            label: `${constants_2.BuiltInScaffoldPluginNames.bot}/${templateName}`,
-                            data: {
-                                pluginName: constants_2.BuiltInScaffoldPluginNames.bot,
-                                templateName: templateName, //TODO
-                            },
-                        } });
-                    const scaffoldRes = await this._scaffold(scaffoldInputs, ctx);
-                    if (scaffoldRes.isErr()) {
-                        return teamsfx_api_1.err(scaffoldRes.error);
+                }
+                if (capabilities.includes(question_2.BotOptionItem.id) ||
+                    capabilities.includes(question_1.MessageExtensionItem.id)) {
+                    const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, feature: constants_2.BuiltInFeaturePluginNames.bot, capabilities: capabilities });
+                    const addFeatureRes = await this._addFeature(addFeatureInputs, ctx);
+                    if (addFeatureRes.isErr()) {
+                        return teamsfx_api_1.err(addFeatureRes.error);
                     }
                 }
             }
         }
         if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
             await globalState_1.globalStateUpdate(globalStateDescription, true);
+            await globalState_1.globalStateUpdate(automaticNpmInstall, true);
         }
         return teamsfx_api_1.ok(projectPath);
     }
@@ -493,17 +416,7 @@ class FxCore {
         }
         const envInfo = ctx.envInfoV2;
         const result = await ctx.solutionV2.provisionResources(ctx.contextV2, inputs, envInfo, this.tools.tokenProvider);
-        if (result.kind === "success") {
-            ctx.envInfoV2.state = lodash_1.assign(ctx.envInfoV2.state, result.output);
-            return teamsfx_api_1.ok(teamsfx_api_1.Void);
-        }
-        else if (result.kind === "partialSuccess") {
-            ctx.envInfoV2.state = lodash_1.assign(ctx.envInfoV2.state, result.output);
-            return teamsfx_api_1.err(result.error);
-        }
-        else {
-            return teamsfx_api_1.err(result.error);
-        }
+        return result;
     }
     async provisionResourcesV3(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.provision;
@@ -514,13 +427,35 @@ class FxCore {
             ctx.envInfoV3 &&
             ctx.solutionV3.provisionResources) {
             const res = await ctx.solutionV3.provisionResources(ctx.contextV2, inputs, ctx.envInfoV3, exports.TOOLS.tokenProvider);
-            if (res.isOk()) {
-                ctx.envInfoV3 = res.value;
-            }
             return res;
         }
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
+    /**
+     * Only used to provision Teams app with user provided app package
+     * @param inputs
+     * @returns
+     */
+    async provisionTeamsAppForCLI(inputs) {
+        if (!inputs.appPackagePath) {
+            return teamsfx_api_1.err(error_1.InvalidInputError("appPackagePath is not defined", inputs));
+        }
+        const projectSettings = {
+            appName: "fake",
+            projectId: uuid.v4(),
+        };
+        const context = {
+            userInteraction: exports.TOOLS.ui,
+            logProvider: exports.TOOLS.logProvider,
+            telemetryReporter: exports.TOOLS.telemetryReporter,
+            cryptoProvider: new crypto_1.LocalCrypto(projectSettings.projectId),
+            permissionRequestProvider: exports.TOOLS.permissionRequest,
+            projectSetting: projectSettings,
+        };
+        const appStudioV3 = typedi_1.Container.get(constants_2.BuiltInFeaturePluginNames.appStudio);
+        await appStudioV3.registerTeamsApp(context, inputs, tools_2.newEnvInfoV3(), exports.TOOLS.tokenProvider);
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
     async deployArtifacts(inputs) {
         if (isV3())
             return this.deployArtifactsV3(inputs);
@@ -530,7 +465,14 @@ class FxCore {
     async deployArtifactsV2(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.deploy;
         inputs.stage = teamsfx_api_1.Stage.deploy;
-        if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
+        if (!(ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings)) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("deploy input stuff"));
+        }
+        if (utils_1.isPureExistingApp(ctx.projectSettings)) {
+            // existing app scenario, deploy has no effect
+            return teamsfx_api_1.err(new error_1.OperationNotSupportedForExistingAppError("deploy"));
+        }
+        if (!ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
             const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2], ["ctx", "ctx.solutionV2", "ctx.contextV2", "ctx.envInfoV2"]);
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`Deploy input stuff: ${name}`));
         }
@@ -557,7 +499,14 @@ class FxCore {
     async localDebugV2(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.debug;
         inputs.stage = teamsfx_api_1.Stage.debug;
-        if (!ctx || !ctx.solutionV2 || !ctx.contextV2) {
+        if (!(ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings)) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("local debug input stuff"));
+        }
+        if (utils_1.isPureExistingApp(ctx.projectSettings)) {
+            // existing app scenario, local debug has no effect
+            return teamsfx_api_1.err(new error_1.OperationNotSupportedForExistingAppError("localDebug"));
+        }
+        if (!ctx.solutionV2 || !ctx.contextV2) {
             const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2], ["ctx", "ctx.solutionV2", "ctx.contextV2"]);
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`localDebug input stuff (${name})`));
         }
@@ -587,9 +536,9 @@ class FxCore {
         if (ctx &&
             ctx.solutionV3 &&
             ctx.contextV2 &&
-            ctx.localSettings &&
-            ctx.solutionV3.provisionLocalResources) {
-            const res = await ctx.solutionV3.provisionLocalResources(ctx.contextV2, inputs, ctx.localSettings, exports.TOOLS.tokenProvider);
+            ctx.envInfoV3 &&
+            ctx.solutionV3.provisionResources) {
+            const res = await ctx.solutionV3.provisionResources(ctx.contextV2, inputs, ctx.envInfoV3, exports.TOOLS.tokenProvider);
             if (res.isOk()) {
                 ctx.localSettings = res.value;
             }
@@ -637,6 +586,12 @@ class FxCore {
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     async executeUserTask(func, inputs, ctx) {
+        if (isV3())
+            return this.executeUserTaskV3(func, inputs);
+        else
+            return this.executeUserTaskV2(func, inputs);
+    }
+    async executeUserTaskV2(func, inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.userTask;
         inputs.stage = teamsfx_api_1.Stage.userTask;
         const namespace = func.namespace;
@@ -659,6 +614,27 @@ class FxCore {
         }
         return teamsfx_api_1.err(error_1.FunctionRouterError(func));
     }
+    async executeUserTaskV3(func, inputs, ctx) {
+        exports.currentStage = teamsfx_api_1.Stage.userTask;
+        inputs.stage = teamsfx_api_1.Stage.userTask;
+        const namespace = func.namespace;
+        const array = namespace ? namespace.split("/") : [];
+        if ("" !== namespace && array.length > 0) {
+            if (!ctx || !ctx.solutionV3 || !ctx.envInfoV3) {
+                const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV3, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV3], ["ctx", "ctx.solutionV3", "ctx.envInfoV3"]);
+                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`executeUserTask input stuff: ${name}`));
+            }
+            if (!ctx.contextV2)
+                ctx.contextV2 = createV2Context(newProjectSettings());
+            if (ctx.solutionV3.executeUserTask) {
+                const res = await ctx.solutionV3.executeUserTask(ctx.contextV2, inputs, func, ctx.envInfoV3, this.tools.tokenProvider);
+                return res;
+            }
+            else
+                return teamsfx_api_1.err(error_1.FunctionRouterError(func));
+        }
+        return teamsfx_api_1.err(error_1.FunctionRouterError(func));
+    }
     async getQuestions(stage, inputs, ctx) {
         if (!ctx)
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("getQuestions input stuff"));
@@ -729,15 +705,6 @@ class FxCore {
         }
         return ctx.solutionV2.listCollaborator(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
     }
-    async listAllCollaborators(inputs, ctx) {
-        exports.currentStage = teamsfx_api_1.Stage.listAllCollaborators;
-        inputs.stage = teamsfx_api_1.Stage.listAllCollaborators;
-        const projectPath = inputs.projectPath;
-        if (!projectPath) {
-            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
-        }
-        return ctx.solutionV2.listAllCollaborators(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
-    }
     async getSelectedEnv(inputs, ctx) {
         var _a;
         return teamsfx_api_1.ok((_a = ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2) === null || _a === void 0 ? void 0 : _a.envName);
@@ -850,10 +817,7 @@ class FxCore {
         const projectSettings = newProjectSettings();
         projectSettings.appName = appName;
         ctx.projectSettings = projectSettings;
-        if (!inputs.solution) {
-            return teamsfx_api_1.err(error_1.InvalidInputError("solution is undefined", inputs));
-        }
-        const createEnvResult = await this.createEnvWithName(__1.environmentManager.getDefaultEnvName(), projectSettings, inputs);
+        const createEnvResult = await this.createEnvWithName("local", projectSettings, inputs);
         if (createEnvResult.isErr()) {
             return teamsfx_api_1.err(createEnvResult.error);
         }
@@ -863,44 +827,21 @@ class FxCore {
         if (basicFolderRes.isErr()) {
             return teamsfx_api_1.err(basicFolderRes.error);
         }
-        const solution = typedi_1.Container.get(inputs.solution);
-        projectSettings.solutionSettings.name = inputs.solution;
         const context = createV2Context(projectSettings);
         ctx.contextV2 = context;
-        ctx.solutionV3 = solution;
-        return await solution.init(context, inputs);
+        const appStudioV3 = typedi_1.Container.get(constants_2.BuiltInFeaturePluginNames.appStudio);
+        await appStudioV3.init(context, inputs);
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     async init(inputs, ctx) {
         return this._init(inputs, ctx);
     }
-    async _addModule(inputs, ctx) {
-        if (ctx && ctx.solutionV3 && ctx.contextV2) {
-            const addModuleRes = await ctx.solutionV3.addModule(ctx.contextV2, inputs, ctx.localSettings);
-            if (addModuleRes.isErr()) {
-                return teamsfx_api_1.err(addModuleRes.error);
-            }
-            ctx.localSettings = addModuleRes.value; // return back local settings
-        }
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-    async addModule(inputs, ctx) {
-        return this._addModule(inputs, ctx);
-    }
-    async scaffold(inputs, ctx) {
-        return this._scaffold(inputs, ctx);
-    }
-    async _scaffold(inputs, ctx) {
-        if (ctx && ctx.solutionV3 && ctx.contextV2) {
-            return await ctx.solutionV3.scaffold(ctx.contextV2, inputs);
-        }
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-    async addResource(inputs, ctx) {
-        return this._addResource(inputs, ctx);
+    async addFeature(inputs, ctx) {
+        return this._addFeature(inputs, ctx);
     }
-    async _addResource(inputs, ctx) {
-        if (ctx && ctx.solutionV3 && ctx.contextV2) {
-            return await ctx.solutionV3.addResource(ctx.contextV2, inputs);
+    async _addFeature(inputs, ctx) {
+        if (ctx && ctx.solutionV3 && ctx.contextV2 && ctx.solutionV3.addFeature) {
+            return await ctx.solutionV3.addFeature(ctx.contextV2, inputs);
         }
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
@@ -969,7 +910,7 @@ tslib_1.__decorate([
         concurrentLocker_1.ConcurrentLockerMW,
         supportV1ConditionHandler_1.SupportV1ConditionMW(false),
         projectMigrator_1.ProjectMigratorMW,
-        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoaderV3_1.EnvInfoLoaderMW_V3(false),
         solutionLoaderV3_1.SolutionLoaderMW_V3,
         questionModel_1.QuestionModelMW,
@@ -1005,7 +946,7 @@ tslib_1.__decorate([
         concurrentLocker_1.ConcurrentLockerMW,
         supportV1ConditionHandler_1.SupportV1ConditionMW(false),
         projectMigrator_1.ProjectMigratorMW,
-        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoaderV3_1.EnvInfoLoaderMW_V3(false),
         solutionLoaderV3_1.SolutionLoaderMW_V3,
         questionModel_1.QuestionModelMW,
@@ -1043,7 +984,7 @@ tslib_1.__decorate([
         concurrentLocker_1.ConcurrentLockerMW,
         supportV1ConditionHandler_1.SupportV1ConditionMW(true),
         projectMigrator_1.ProjectMigratorMW,
-        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        projectSettingsLoader_1.ProjectSettingsLoaderMW,
         localSettingsLoader_1.LocalSettingsLoaderMW,
         solutionLoaderV3_1.SolutionLoaderMW_V3,
         questionModel_1.QuestionModelMW,
@@ -1109,7 +1050,26 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "executeUserTask", null);
+], FxCore.prototype, "executeUserTaskV2", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        concurrentLocker_1.ConcurrentLockerMW,
+        supportV1ConditionHandler_1.SupportV1ConditionMW(false),
+        projectMigrator_1.ProjectMigratorMW,
+        projectSettingsLoader_1.ProjectSettingsLoaderMW,
+        envInfoLoader_1.EnvInfoLoaderMW(false),
+        localSettingsLoader_1.LocalSettingsLoaderMW,
+        solutionLoader_1.SolutionLoaderMW,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+        envInfoWriter_1.EnvInfoWriterMW(),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "executeUserTaskV3", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1203,21 +1163,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "listCollaborator", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        supportV1ConditionHandler_1.SupportV1ConditionMW(true),
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(true),
-        solutionLoader_1.SolutionLoaderMW,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "listAllCollaborators", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1294,35 +1239,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
-        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
-        localSettingsLoader_1.LocalSettingsLoaderMW,
-        solutionLoaderV3_1.SolutionLoaderMW_V3,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-        projectSettingsWriter_1.ProjectSettingsWriterMW,
-        localSettingsWriter_1.LocalSettingsWriterMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "addModule", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
-        solutionLoaderV3_1.SolutionLoaderMW_V3,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-        projectSettingsWriter_1.ProjectSettingsWriterMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "scaffold", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        projectSettingsLoader_1.ProjectSettingsLoaderMW,
         solutionLoaderV3_1.SolutionLoaderMW_V3,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
@@ -1331,7 +1248,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "addResource", null);
+], FxCore.prototype, "addFeature", null);
 exports.FxCore = FxCore;
 async function createBasicFolderStructure(inputs) {
     if (!inputs.projectPath) {
@@ -1377,9 +1294,6 @@ function newProjectSettings() {
         appName: "",
         projectId: uuid.v4(),
         version: getProjectSettingsVersion(),
-        solutionSettings: {
-            name: "",
-        },
     };
     return projectSettings;
 }