@microsoft/teamsfx-core 3.1.0 → 3.1.1

package/build/core/createProjectFrontDoor.js

@@ -0,0 +1,351 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProjectFrontDoor = createProjectFrontDoor;
+const tslib_1 = require("tslib");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const neverthrow_1 = require("neverthrow");
+const v4_1 = require("../v4");
+const featureFlags_1 = require("../common/featureFlags");
+const globalVars_1 = require("../common/globalVars");
+const templateNames_1 = require("../component/generator/templates/templateNames");
+const questionNames_1 = require("../question/questionNames");
+/**
+ * Operation `dispatch-create-by-engine` — the create front door.
+ *
+ * Spec: docs/03-specs/operations/scaffolding/dispatch-create-by-engine.md
+ * Decision: docs/02-architecture/adr/ADR-0014-dispatcher-buildtarget-resolution.md
+ *
+ * The single entry the create surfaces call in place of `FxCore.createProject`.
+ * Behind `TEAMSFX_V4_ENABLED`, the v4 create selector is the live Q1 front door
+ * and the resolved `BuildTarget` is dispatched by its `engine` (INV-3):
+ *   - `v4`             → run the template's own Q2 (`runCreateInputs`) over the
+ *                        same floor, with the create floor appended to the same
+ *                        walk, then `scaffoldV4` the authored package;
+ *   - `surface-action` → return the action's surface signal (no scaffold).
+ *   - `v3` / `v3-core-method` → unsupported when the v4 front door is enabled.
+ * Flag off is a pure pass-through to the unmodified `createV3` (INV-1): the
+ * selector is never walked, so v3 behavior is byte-identical.
+ *
+ * This orchestrator is a seam outside the v4 world (INV-4): it touches the v3
+ * `Inputs` and calls `createV3`, which v4 may not. Every effectful step is an
+ * injected dependency, so the dispatch is verifiable without I/O; the floor read
+ * is injectable too (INV-6).
+ */
+const SOURCE = "Scaffold";
+/** The only shipped create `surface-action`: open GitHub Copilot Chat (the v3 `startWithGithubCopilot` shape). */
+const OPEN_GITHUB_COPILOT_CHAT = "open-github-copilot-chat";
+const V4_TO_V3_TEMPLATE_ID = {
+    "basic-custom-engine-agent": templateNames_1.TemplateNames.BasicCustomEngineAgent,
+    "weather-agent": templateNames_1.TemplateNames.WeatherAgent,
+    "graph-connector": templateNames_1.TemplateNames.GraphConnector,
+    "custom-copilot-basic": templateNames_1.TemplateNames.CustomCopilotBasic,
+    "custom-copilot-rag-customize": templateNames_1.TemplateNames.CustomCopilotRagCustomize,
+    "custom-copilot-rag-azure-ai-search": templateNames_1.TemplateNames.CustomCopilotRagAzureAISearch,
+    "custom-copilot-rag-custom-api": templateNames_1.TemplateNames.CustomCopilotRagCustomApi,
+    "teams-collaborator-agent": templateNames_1.TemplateNames.TeamsCollaboratorAgent,
+    "non-sso-tab": templateNames_1.TemplateNames.Tab,
+    "default-message-extension": templateNames_1.TemplateNames.DefaultMessageExtension,
+    "default-bot": templateNames_1.TemplateNames.DefaultBot,
+    "office-addin-wxpo-taskpane": templateNames_1.TemplateNames.WXPTaskpane,
+    "office-addin-excel-cfshortcut": templateNames_1.TemplateNames.ExcelCFShortcut,
+    "office-addin-excel-customfunctions": templateNames_1.TemplateNames.ExcelCustomFunctions,
+    "office-addin-sso-naa": templateNames_1.TemplateNames.OfficeAddinSsoNaa,
+    "declarative-agent-meta-os-upgrade-project": "declarative-agent-meta-os-upgrade-project",
+    "office-addin-config": templateNames_1.TemplateNames.OfficeAddinCommon,
+    "da/no-action": templateNames_1.TemplateNames.DeclarativeAgentBasic,
+    "da/graph-connector": templateNames_1.TemplateNames.DeclarativeAgentWithGraphConnector,
+    "da/typespec": templateNames_1.TemplateNames.DeclarativeAgentWithTypeSpec,
+    "da/skill": templateNames_1.TemplateNames.DeclarativeAgentWithSkill,
+    "da/api-plugin-from-scratch": templateNames_1.TemplateNames.DeclarativeAgentWithActionFromScratch,
+    "da/api-plugin-from-scratch-bearer": templateNames_1.TemplateNames.DeclarativeAgentWithActionFromScratchBearer,
+    "da/api-plugin-from-scratch-oauth": templateNames_1.TemplateNames.DeclarativeAgentWithActionFromScratchOAuth,
+    "da/api-plugin-from-existing-api": templateNames_1.TemplateNames.DeclarativeAgentWithActionFromExistingApiSpec,
+    "da/mcp-server-static": templateNames_1.TemplateNames.DeclarativeAgentWithActionFromMCP,
+    "da/mcp-server": templateNames_1.TemplateNames.DeclarativeAgentWithActionFromMCP,
+};
+const NON_V4_INPUT_KEYS = new Set([
+    "capabilities",
+    "folder",
+    "isM365",
+    "nonInteractive",
+    "platform",
+    "projectId",
+    "runtime",
+    questionNames_1.QuestionNames.TemplateName,
+]);
+/** The default `featureFlagManager`-backed reader (a flag is on per its env var / VS Code setting). */
+function defaultFlagReader(name) {
+    return (0, featureFlags_1.readBooleanFeatureFlag)(name);
+}
+/** Read the shipped bundled-floor channel zip (the default `readFloorBytes`). */
+function readBundledFloorBytes() {
+    return fs_extra_1.default.readFileSync(path_1.default.join((0, v4_1.bundledFloorDir)(), "templates.zip"));
+}
+function readSnapshotBytes(snapshot, kind) {
+    return snapshot.bytes(kind);
+}
+function isV4NeutralInput(key, value) {
+    return (!NON_V4_INPUT_KEYS.has(key) &&
+        !key.includes("-") &&
+        (typeof value === "string" ||
+            (Array.isArray(value) && value.every((item) => typeof item === "string"))));
+}
+function neutralAnswersFromInputs(inputs) {
+    const answers = {};
+    for (const [key, value] of Object.entries(inputs)) {
+        if (isV4NeutralInput(key, value)) {
+            answers[key] = value;
+        }
+    }
+    const officeAddinFolder = inputs[questionNames_1.QuestionNames.OfficeAddinFolder];
+    if (typeof officeAddinFolder === "string" && answers.officeAddinFolder === undefined) {
+        answers.officeAddinFolder = officeAddinFolder;
+    }
+    const officeAddinManifest = inputs[questionNames_1.QuestionNames.OfficeAddinManifest];
+    if (typeof officeAddinManifest === "string" && answers.officeAddinManifest === undefined) {
+        answers.officeAddinManifest = officeAddinManifest;
+    }
+    return answers;
+}
+function selectorPrefillFromInputs(inputs) {
+    const answers = {};
+    for (const [key, value] of Object.entries(neutralAnswersFromInputs(inputs))) {
+        if (typeof value === "string") {
+            answers[key] = value;
+        }
+    }
+    return answers;
+}
+function templateNameForV4(target) {
+    return V4_TO_V3_TEMPLATE_ID[target.templateId] ?? target.templateId;
+}
+function applyV4CreateFloorAnswers(inputs, answers) {
+    const folder = answers[questionNames_1.QuestionNames.Folder];
+    if (typeof folder === "string") {
+        inputs[questionNames_1.QuestionNames.Folder] = folder;
+    }
+    const appName = answers[questionNames_1.QuestionNames.AppName];
+    if (typeof appName === "string") {
+        inputs[questionNames_1.QuestionNames.AppName] = appName;
+    }
+}
+/** Map the host `Platform` onto the selector's `surface` axis (drives option `condition`s). */
+function surfaceOf(platform) {
+    switch (platform) {
+        case teamsfx_api_1.Platform.CLI:
+        case teamsfx_api_1.Platform.CLI_HELP:
+            return "cli";
+        case teamsfx_api_1.Platform.VS:
+            return "vs";
+        default:
+            return "vscode";
+    }
+}
+/** Dispatch a resolved `surface-action` target onto its surface signal (no scaffold). */
+function dispatchSurfaceAction(target) {
+    if (target.templateId === OPEN_GITHUB_COPILOT_CHAT) {
+        return (0, neverthrow_1.ok)({ projectPath: "", shouldInvokeTeamsAgent: true });
+    }
+    return (0, neverthrow_1.err)(new teamsfx_api_1.SystemError({
+        source: SOURCE,
+        name: "UnsupportedCreateAction",
+        message: `The create front door does not handle the '${target.templateId}' surface action.`,
+    }));
+}
+function unsupportedCreateTarget(target) {
+    return new teamsfx_api_1.SystemError({
+        source: SOURCE,
+        name: "UnsupportedCreateEngine",
+        message: `The create front door does not dispatch the '${target.engine}' engine.`,
+    });
+}
+/**
+ * Run the create front door for `inputs`, dispatching the resolved engine.
+ *
+ * @param inputs the create inputs (carries `platform`; mutated in place by the
+ *               v4 floor collection before the hand-off to `scaffoldV4`)
+ * @param deps   the injected seams (see `CreateFrontDoorDeps`)
+ * @returns the created project (drop-in for `FxCore.createProject`), or a
+ *          `UserError` / `SystemError` (a surface cancellation or a route break)
+ */
+async function createProjectFrontDoor(inputs, deps) {
+    const flagReader = deps.flagReader ?? defaultFlagReader;
+    // INV-1: flag off ⇒ a pure pass-through to the unmodified v3 createProject.
+    if (!flagReader(featureFlags_1.FeatureFlags.V4Enabled.name)) {
+        return deps.createV3(inputs);
+    }
+    const ui = deps.ui ?? globalVars_1.TOOLS.ui;
+    const surface = surfaceOf(inputs.platform);
+    let snapshot = deps.artifactSnapshot;
+    let floorBytes;
+    const interactive = !inputs.nonInteractive;
+    // Dispatch one resolved BuildTarget by its engine (INV-3). Returns a scaffolded
+    // result, or `{ kind: "back" }` when a backable Q2 was exited at its first prompt
+    // (the caller re-enters Q1). `snapshot` / `floorBytes` are read lazily and shared.
+    async function dispatchByEngine(target, baseStep, backable) {
+        switch (target.engine) {
+            case "surface-action": {
+                const action = dispatchSurfaceAction(target);
+                return action.isErr() ? (0, neverthrow_1.err)(action.error) : (0, neverthrow_1.ok)({ kind: "result", result: action.value });
+            }
+            case "v3-core-method":
+                return (0, neverthrow_1.err)(unsupportedCreateTarget(target));
+            case "v4": {
+                inputs[questionNames_1.QuestionNames.TemplateName] = templateNameForV4(target);
+                const runInputs = deps.runInputs ?? v4_1.runCreateInputsWalk;
+                const locator = { kind: "create", templateId: target.templateId };
+                // Q2 + common floor, over the same floor, continuing Q1's step numbering.
+                const entryParams = {
+                    ...(target.answers ?? {}),
+                    ...neutralAnswersFromInputs(inputs),
+                };
+                let inputBytes;
+                if (snapshot === undefined) {
+                    inputBytes = floorBytes ?? (deps.readFloorBytes ?? readBundledFloorBytes)();
+                }
+                else {
+                    const metadataBytes = await readSnapshotBytes(snapshot, "metadata");
+                    if (metadataBytes.isErr()) {
+                        return (0, neverthrow_1.err)(metadataBytes.error);
+                    }
+                    inputBytes = metadataBytes.value;
+                }
+                const outcome = await runInputs(inputBytes, locator, entryParams, ui, {
+                    flagReader,
+                    surface,
+                    inputs,
+                    baseStep,
+                    backable,
+                });
+                if (outcome.isErr()) {
+                    return (0, neverthrow_1.err)(outcome.error);
+                }
+                if (outcome.value.kind === "back") {
+                    return (0, neverthrow_1.ok)({ kind: "back" });
+                }
+                const answers = outcome.value.answers;
+                applyV4CreateFloorAnswers(inputs, answers);
+                // The scaffold contract is a plain BuildTarget; do not leak Q1 walk metadata.
+                const scaffoldTarget = {
+                    templateId: target.templateId,
+                    engine: target.engine,
+                    answers: target.answers,
+                };
+                if (snapshot !== undefined) {
+                    const fullBytes = await readSnapshotBytes(snapshot, "templates");
+                    if (fullBytes.isErr()) {
+                        return (0, neverthrow_1.err)(fullBytes.error);
+                    }
+                    const scaffolded = await deps.scaffoldV4(inputs, scaffoldTarget, answers, flagReader, {
+                        source: (0, v4_1.templateSourceFromArtifactSnapshot)(snapshot),
+                        bytes: fullBytes.value,
+                    });
+                    return scaffolded.isErr()
+                        ? (0, neverthrow_1.err)(scaffolded.error)
+                        : (0, neverthrow_1.ok)({ kind: "result", result: scaffolded.value });
+                }
+                const scaffolded = await deps.scaffoldV4(inputs, scaffoldTarget, answers, flagReader);
+                return scaffolded.isErr()
+                    ? (0, neverthrow_1.err)(scaffolded.error)
+                    : (0, neverthrow_1.ok)({ kind: "result", result: scaffolded.value });
+            }
+        }
+    }
+    // A surface that already resolved the leaf template — the CLI in non-interactive
+    // mode presets `template-name` from its `-c` capability — pins the BuildTarget by
+    // id: the Q1 selector is a *router*, so re-walking it would re-prompt. Resolve the
+    // engine from the template's route and dispatch once (no cross-phase back; INV-8).
+    const presetTemplateId = inputs[questionNames_1.QuestionNames.TemplateName];
+    if (presetTemplateId) {
+        if (snapshot === undefined && deps.resolveArtifactSnapshot !== undefined) {
+            const resolved = await deps.resolveArtifactSnapshot("templates");
+            if (resolved.isErr()) {
+                return (0, neverthrow_1.err)(resolved.error);
+            }
+            snapshot = resolved.value;
+        }
+        if (snapshot === undefined) {
+            floorBytes = (deps.readFloorBytes ?? readBundledFloorBytes)();
+        }
+        else {
+            const fullBytes = await readSnapshotBytes(snapshot, "templates");
+            if (fullBytes.isErr()) {
+                return (0, neverthrow_1.err)(fullBytes.error);
+            }
+            floorBytes = fullBytes.value;
+        }
+        const resolveByTemplateId = deps.resolveByTemplateId ?? v4_1.resolveCreateTargetByTemplateId;
+        const target = resolveByTemplateId(floorBytes, presetTemplateId);
+        if (target.isErr()) {
+            return (0, neverthrow_1.err)(target.error);
+        }
+        const dispatched = await dispatchByEngine(target.value, 0, false);
+        if (dispatched.isErr()) {
+            return (0, neverthrow_1.err)(dispatched.error);
+        }
+        // The preset path is not backable (baseStep 0, backable false), so `done` is the live branch.
+        return dispatched.value.kind === "back"
+            ? (0, neverthrow_1.err)(unsupportedCreateTarget(target.value))
+            : (0, neverthrow_1.ok)(dispatched.value.result);
+    }
+    // Otherwise walk Q1 (INV-2). The selector bytes are stable across the cross-phase
+    // back re-entry loop, so resolve them once; each iteration re-walks Q1 (retaining
+    // its history for `resume`) and dispatches, re-entering Q1 on a Q2-first back so
+    // Q1 and Q2 form one continuous back-navigable wizard (INV-10). The loop is scoped
+    // below the preset check, so a prior iteration's `template-name` never short-circuits Q1.
+    if (snapshot === undefined && deps.resolveArtifactSnapshot !== undefined) {
+        const resolved = await deps.resolveArtifactSnapshot("create-selector");
+        if (resolved.isErr()) {
+            return (0, neverthrow_1.err)(resolved.error);
+        }
+        snapshot = resolved.value;
+    }
+    let selectorBytes;
+    if (snapshot === undefined) {
+        floorBytes = (deps.readFloorBytes ?? readBundledFloorBytes)();
+        selectorBytes = floorBytes;
+    }
+    else {
+        const selector = await readSnapshotBytes(snapshot, "create-selector");
+        if (selector.isErr()) {
+            return (0, neverthrow_1.err)(selector.error);
+        }
+        selectorBytes = selector.value;
+    }
+    const runSelector = deps.runSelector ?? v4_1.runCreateSelector;
+    let resumeHistory = undefined;
+    for (;;) {
+        const selectorDeps = {
+            flagReader,
+            interactive,
+            prefilled: selectorPrefillFromInputs(inputs),
+            resume: resumeHistory === undefined ? undefined : { history: resumeHistory },
+        };
+        const target = snapshot === undefined
+            ? await runSelector(selectorBytes, ui, surface, selectorDeps)
+            : await runSelector(selectorBytes, ui, surface, {
+                ...selectorDeps,
+                selectorBytesKind: "json",
+                v4Registry: deps.v4Registry,
+            });
+        if (target.isErr()) {
+            return (0, neverthrow_1.err)(target.error);
+        }
+        // Q2 continues Q1's step numbering (baseStep = promptCount) and is backable: a
+        // back at its first prompt re-enters Q1 with the retained history (INV-10).
+        const dispatched = await dispatchByEngine(target.value, target.value.promptCount, true);
+        if (dispatched.isErr()) {
+            return (0, neverthrow_1.err)(dispatched.error);
+        }
+        if (dispatched.value.kind === "back") {
+            resumeHistory = target.value.history;
+            continue;
+        }
+        return (0, neverthrow_1.ok)(dispatched.value.result);
+    }
+}
+//# sourceMappingURL=createProjectFrontDoor.js.map

package/build/core/createProjectFrontDoor.js.map

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

package/build/core/middleware/concurrentLocker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"concurrentLocker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AA6B1E,eAAO,MAAM,kBAAkB,EAAE,UAoFhC,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAKzD"}
+{"version":3,"file":"concurrentLocker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AA6B1E,eAAO,MAAM,kBAAkB,EAAE,UAkFhC,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAKzD"}

package/build/core/middleware/concurrentLocker.js

@@ -10,11 +10,11 @@ const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const os = tslib_1.__importStar(require("os"));
 const path = tslib_1.__importStar(require("path"));
-const proper_lockfile_1 = require("proper-lockfile");
+const properLock = tslib_1.__importStar(require("proper-lockfile"));
 const globalVars_1 = require("../../common/globalVars");
-const projectSettingsHelper_1 = require("../../common/projectSettingsHelper");
+const projectSettingsHelper = tslib_1.__importStar(require("../../common/projectSettingsHelper"));
 const telemetry_1 = require("../../common/telemetry");
-const utils_1 = require("../../common/utils");
+const commonUtils = tslib_1.__importStar(require("../../common/utils"));
 const common_1 = require("../../error/common");
 const callback_1 = require("../callback");
 const projectSettingsLoader_1 = require("./projectSettingsLoader");
@@ -34,12 +34,9 @@ const ConcurrentLockerMW = async (ctx, next) => {
         return;
     }
     let configFolder = "";
-    if ((0, projectSettingsHelper_1.isValidProjectV3)(inputs.projectPath)) {
+    if (projectSettingsHelper.isValidProjectV3(inputs.projectPath)) {
         configFolder = path.join(inputs.projectPath);
     }
-    else if ((0, projectSettingsHelper_1.isValidProjectV2)(inputs.projectPath)) {
-        configFolder = path.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
-    }
     else {
         ctx.result = (0, teamsfx_api_1.err)(new common_1.InvalidProjectError(inputs.projectPath));
         return;
@@ -54,7 +51,7 @@ const ConcurrentLockerMW = async (ctx, next) => {
     let retryNum = 0;
     for (let i = 0; i < 10; ++i) {
         try {
-            await (0, proper_lockfile_1.lock)(configFolder, { lockfilePath: lockfilePath });
+            await properLock.lock(configFolder, { lockfilePath: lockfilePath });
             acquired = true;
             for (const f of callback_1.CallbackRegistry.get(teamsfx_api_1.CoreCallbackEvent.lock)) {
                 await f(taskName);
@@ -68,7 +65,7 @@ const ConcurrentLockerMW = async (ctx, next) => {
                 await next();
             }
             finally {
-                await (0, proper_lockfile_1.unlock)(configFolder, { lockfilePath: lockfilePath });
+                await properLock.unlock(configFolder, { lockfilePath: lockfilePath });
                 for (const f of callback_1.CallbackRegistry.get(teamsfx_api_1.CoreCallbackEvent.unlock)) {
                     await f(taskName);
                 }
@@ -78,7 +75,7 @@ const ConcurrentLockerMW = async (ctx, next) => {
         }
         catch (e) {
             if (e["code"] === "ELOCKED") {
-                await (0, utils_1.waitSeconds)(1);
+                await commonUtils.waitSeconds(1);
                 ++retryNum;
                 continue;
             }

package/build/core/middleware/concurrentLocker.js.map

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

package/build/core/middleware/errorHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6B,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAe,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAI7E;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,UAc5B,CAAC;AA0BF,wBAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,GAAG,KAAK,CAoBxE"}
+{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAe,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAK7E;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,UAqB5B,CAAC;AA0BF,wBAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,GAAG,KAAK,CAoBxE"}

package/build/core/middleware/errorHandler.js

@@ -6,6 +6,7 @@ exports.ErrorHandlerMW = void 0;
 exports.convertError = convertError;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const globalVars_1 = require("../../common/globalVars");
+const settingsUtil_1 = require("../../component/utils/settingsUtil");
 const common_1 = require("../../error/common");
 /**
  * in case there're some uncatched exceptions, this middleware will act as a guard
@@ -15,6 +16,14 @@ const ErrorHandlerMW = async (ctx, next) => {
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     if (inputs?.locale)
         (0, globalVars_1.setLocale)(inputs.locale);
+    if (inputs?.projectPath) {
+        try {
+            await settingsUtil_1.settingsUtil.readSettings(inputs.projectPath, false);
+        }
+        catch {
+            // Ignore trackingId preload failure and continue normal flow.
+        }
+    }
     try {
         await next();
     }

package/build/core/middleware/errorHandler.js.map

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

package/build/core/middleware/fileLocker.js

@@ -4,12 +4,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFileLock = withFileLock;
 const tslib_1 = require("tslib");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs = tslib_1.__importStar(require("fs-extra"));
-const proper_lockfile_1 = require("proper-lockfile");
-const concurrentLocker_1 = require("./concurrentLocker");
 const path_1 = tslib_1.__importDefault(require("path"));
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const utils_1 = require("../../common/utils");
+const properLock = tslib_1.__importStar(require("proper-lockfile"));
+const commonUtils = tslib_1.__importStar(require("../../common/utils"));
+const concurrentLocker_1 = require("./concurrentLocker");
 async function withFileLock(filePath, callback) {
     if (!(await fs.pathExists(filePath))) {
         throw new Error(`File not found: ${filePath}`);
@@ -20,12 +20,12 @@ async function withFileLock(filePath, callback) {
     let release = null;
     for (let i = 0; i < 10; i++) {
         try {
-            release = await (0, proper_lockfile_1.lock)(filePath, { lockfilePath: lockfilePath });
+            release = await properLock.lock(filePath, { lockfilePath: lockfilePath });
             break;
         }
         catch (e) {
             if (e.code === "ELOCKED") {
-                await (0, utils_1.waitSeconds)(1);
+                await commonUtils.waitSeconds(1);
             }
             else {
                 throw e;

package/build/core/middleware/fileLocker.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileLocker.js","sourceRoot":"","sources":["../../../src/core/middleware/fileLocker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;AAQb,oCAgCC;;AAvCD,qDAA+B;AAC/B,qDAAuC;AACvC,yDAAmD;AACnD,wDAAwB;AACxB,wDAA0D;AAC1D,8CAAiD;AAE1C,KAAK,UAAU,YAAY,CAAI,QAAgB,EAAE,QAA0B;IAChF,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,mBAAmB,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,gCAAa,EAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,8BAAgB,OAAO,CAAC,CAAC;IACxE,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAEhC,IAAI,OAAO,GAAiC,IAAI,CAAC;IACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAA,sBAAI,EAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;YAC/D,MAAM;QACR,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAA,mBAAW,EAAC,CAAC,CAAC,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,oBAAoB,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,EAAE,CAAC;IAC1B,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC"}
+{"version":3,"file":"fileLocker.js","sourceRoot":"","sources":["../../../src/core/middleware/fileLocker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;AAQb,oCAgCC;;AAvCD,wDAA0D;AAC1D,qDAA+B;AAC/B,wDAAwB;AACxB,oEAA8C;AAC9C,wEAAkD;AAClD,yDAAmD;AAE5C,KAAK,UAAU,YAAY,CAAI,QAAgB,EAAE,QAA0B;IAChF,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,mBAAmB,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,gCAAa,EAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,8BAAgB,OAAO,CAAC,CAAC;IACxE,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAEhC,IAAI,OAAO,GAAiC,IAAI,CAAC;IACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1E,MAAM;QACR,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,oBAAoB,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,EAAE,CAAC;IAC1B,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC"}

package/build/core/middleware/utils/v3MigrationUtils.d.ts

@@ -1,41 +1,8 @@
-import { MigrationContext } from "./migrationContext";
-import { FileType } from "./MigrationUtils";
-import { Platform } from "@microsoft/teamsfx-api";
-import { CoreHookContext } from "../../types";
 import { VersionInfo, VersionState } from "../../../common/versionMetadata";
-import { VersionForMigration } from "../types";
-export declare function readJsonFile(context: MigrationContext, filePath: string): Promise<any>;
-export declare function readBicepContent(context: MigrationContext): Promise<any>;
-export declare function getTemplateFolderPath(context: MigrationContext): string;
-export declare function fsReadDirSync(context: MigrationContext, _path: string): string[];
-export declare const validDomain: {
-    botWithValid: string;
-    tab: string;
-    bot: string;
-};
-export declare function jsonObjectNamesConvertV3(obj: any, prefix: string, parentKeyName: string, filetype: FileType, bicepContent: any): string;
+import { CoreHookContext } from "../../types";
 export declare function getProjectVersion(ctx: CoreHookContext): Promise<VersionInfo>;
-export declare function migrationNotificationMessage(versionForMigration: VersionForMigration): string;
-export declare function outputCancelMessage(version: string, platform: Platform): void;
 export declare function getProjectVersionFromPath(projectPath: string): Promise<VersionInfo>;
 export declare function getTrackingIdFromPath(projectPath: string): Promise<string>;
 export declare function getVersionState(info: VersionInfo): VersionState;
 export declare function getParameterFromCxt(ctx: CoreHookContext, key: string, defaultValue?: string): string;
-export declare function getCapabilityStatus(projectSettings: any): {
-    TabSso: boolean;
-    BotSso: boolean;
-    Tab: boolean;
-};
-export declare function generateAppIdUri(capabilities: {
-    TabSso: boolean;
-    BotSso: boolean;
-}): string;
-export declare function replaceAppIdUri(manifest: string, appIdUri: string): string;
-export declare function readAndConvertUserdata(context: MigrationContext, filePath: string, bicepContent: any): Promise<string>;
-export declare function updateAndSaveManifestForSpfx(context: MigrationContext, manifest: string): Promise<void>;
-export declare function isValidDomainForBotOutputKey(bicepContent: string): boolean;
-export declare function addMissingValidDomainForManifest(manifestPath: string, tab: boolean, bot: boolean, isValidDomain: boolean): Promise<void>;
-export declare function tryExtractEnvFromUserdata(filename: string): string;
-export declare function buildEnvFileName(envName: string): string;
-export declare function buildEnvUserFileName(envName: string): string;
 //# sourceMappingURL=v3MigrationUtils.d.ts.map

package/build/core/middleware/utils/v3MigrationUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v3MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/v3MigrationUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"v3MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/v3MigrationUtils.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,WAAW,EAEX,YAAY,EACb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,CAGlF;AAED,wBAAsB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAsCzF;AAED,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgBhF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,YAAY,CAmB/D;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAIR"}