@microsoft/teamsfx-core 3.1.0 → 3.1.1

package/build/question/scaffold/vsc/rootNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"rootNode.js","sourceRoot":"","sources":["../../../../src/question/scaffold/vsc/rootNode.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAelC,wDAEC;AAMD,sDAEC;;AAvBD,wDAAgF;AAChF,gEAA0B;AAC1B,oDAAoB;AACpB,wDAAwB;AACxB,2DAAmD;AACnD,gFAA+E;AAC/E,4CAAqD;AACrD,oDAAiD;AAEjD;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,WAAqB,sBAAQ,CAAC,MAAM;IACzE,OAAO,UAAU,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,WAAqB,sBAAQ,CAAC,MAAM;IACxE,OAAO,UAAU,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB,EAAE,QAAkB;IACtD,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,IAAI,MAAM,CAAC,8BAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/F,IAAI,QAAgB,CAAC;IACrB,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC,IAAA,iCAAgB,GAAE,IAAI,kBAAE,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;QAC7D,QAAQ,GAAG,cAAc,CAAC;QAC1B,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,2BAAkB,GAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3D,MAAM,GAAG,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,OAAO,GAAG,kBAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,kBAAK,EAAE,WAAW,EAAE,IAAI,CAAC,6BAA6B,QAAQ,SAAS,MAAM,KAAK,QAAQ,EAAE,CAAC,CAAC;IAC9F,OAAO,IAAA,6BAAa,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"rootNode.js","sourceRoot":"","sources":["../../../../src/question/scaffold/vsc/rootNode.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAgBlC,wDAEC;AAMD,sDAEC;;AAxBD,wDAAgF;AAChF,gEAA0B;AAC1B,oDAAoB;AACpB,wDAAwB;AACxB,+DAAgF;AAChF,2DAAmD;AACnD,oGAA8E;AAC9E,gEAA0C;AAC1C,oDAAiD;AAEjD;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,WAAqB,sBAAQ,CAAC,MAAM;IACzE,OAAO,UAAU,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,WAAqB,sBAAQ,CAAC,MAAM;IACxE,OAAO,UAAU,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB,EAAE,QAAkB;IACtD,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,IAAI,MAAM,CAAC,8BAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/F,6EAA6E;IAC7E,4EAA4E;IAC5E,4EAA4E;IAC5E,8EAA8E;IAC9E,2EAA2E;IAC3E,0EAA0E;IAC1E,0EAA0E;IAC1E,+EAA+E;IAC/E,0EAA0E;IAC1E,gFAAgF;IAChF,0EAA0E;IAC1E,MAAM,SAAS,GAAG,iCAAkB,CAAC,eAAe,CAAC,2BAAY,CAAC,SAAS,CAAC,CAAC;IAE7E,IAAI,QAAgB,CAAC;IACrB,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,kBAAE,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1F,QAAQ,GAAG,cAAc,CAAC;QAC1B,MAAM,GAAG,OAAO,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,GAAG,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,OAAO,GAAG,kBAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,kBAAK,EAAE,WAAW,EAAE,IAAI,CAAC,6BAA6B,QAAQ,SAAS,MAAM,KAAK,QAAQ,EAAE,CAAC,CAAC;IAC9F,OAAO,IAAA,6BAAa,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC"}

package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts

@@ -1,4 +1,13 @@
 import { IQTreeNode, OptionItem, Platform } from "@microsoft/teamsfx-api";
+import * as fs from "fs-extra";
+import { fetchMCPTools, readMCPToolsFromFile, probeMCPServerAuth } from "../../../component/utils/mcpToolFetcher";
+export declare const teamsProjectTypeDeps: {
+    pathExists: typeof fs.pathExists;
+    readJSON: typeof fs.readJSON;
+    fetchMCPTools: typeof fetchMCPTools;
+    readMCPToolsFromFile: typeof readMCPToolsFromFile;
+    probeMCPServerAuth: typeof probeMCPServerAuth;
+};
 /**
  * Extract the Teams Agents and Apps sub-tree from the combined wizardNode.json.
  * Used by TDP (Teams Developer Portal) flow.
@@ -19,7 +28,64 @@ export declare function tabProjectTypeNode(platform?: Platform): IQTreeNode;
 export declare function meProjectTypeNode(): IQTreeNode;
 export declare function m365SearchMeSubNode(): IQTreeNode;
 export declare function MCPServerTypeNode(): IQTreeNode;
+/**
+ * Question node for providing an MCP tools definition file.
+ * Shown when:
+ * - The MCP server requires auth (auto-detected), or
+ * - The user wants to provide tools manually.
+ * In CLI non-interactive mode, this is provided via --mcp-tools-file.
+ */
+export declare function MCPToolsFileNode(): IQTreeNode;
+/**
+ * Question node for CLI pre-fetch tool selection.
+ * Attempts to auto-fetch tools from the MCP server URL, then presents them for selection.
+ * For CLI platform only — VS Code has its own tool fetching via vscode.lm.tools.
+ */
+export declare function MCPCliPreFetchToolsNode(): IQTreeNode;
 export declare function MCPLocalServerSelectionNode(): IQTreeNode;
+/**
+ * Shared static option list for the `mcp-da-auth-type` single-select question.
+ * Kebab-case values so CLI flags (`--mcp-da-auth-type entra-sso` etc.) match the
+ * scaffold inputs and the scenario doc.
+ *
+ * `oauth-dynamic` (Dynamic Client Registration) is gated behind both
+ * `TEAMSFX_MCP_FOR_DA_DT` and `TEAMSFX_MCP_FOR_DA_DCR` because the DCR
+ * provisioning flow currently piggybacks on the DT-mode env-file plumbing.
+ */
+export declare function MCPForDAAuthTypeStaticOptions(): OptionItem[];
+export declare function MCPForDAFetchAuthTypeStaticOptions(): OptionItem[];
+/**
+ * Follow-up question nodes shown after the user picks an `mcp-da-auth-type`
+ * value. Unconditional per SCN-DA-CREATE-WITH-MCP-SERVER step 6a/6b: the
+ * answers are always collected; the TEAMSFX_MCP_FOR_DA_DT flag only governs
+ * how the answers reach `oauth/register` (env-file persistence + ${{...}}
+ * refs when on; in-process bridge `process.env["oauth-client-id"]` etc. when
+ * off).
+ *
+ * - `oauth` (static OAuth): client id (required) + client secret (required, password)
+ *   + scopes (optional).
+ * - `entra-sso`: only client id (required).
+ * - `oauth-dynamic` / `none`: no follow-up questions.
+ */
+export declare function MCPForDAAuthCredentialNodes(): IQTreeNode[];
+/**
+ * Reject an MCP server URL that cannot be one.
+ *
+ * A value with no scheme never reaches the network: axios cannot build a request from it, so
+ * the probe throws, reports no status, and would be classified `undetermined` — letting a
+ * plainly malformed URL through. Rule it out syntactically first.
+ *
+ * ADR-0020: of the answers a server actually gives, block only on 404, the one no valid MCP
+ * endpoint was ever measured giving. The other `notEndpoint` shapes (403, 405, 200 without a
+ * JSON-RPC envelope) only warn after scaffolding, because a 403 can come from a WAF sitting in
+ * front of a perfectly good endpoint and wrongly blocking a legitimate URL is worse than
+ * missing a wrong one. `undetermined` — 5xx, timeouts, unreachable hosts — never blocks, so
+ * scaffolding does not fail closed because the network did.
+ *
+ * Shared by the create flow and the "add MCP server" action flow so both reject the same URLs.
+ */
+export declare function validateMCPServerUrl(value: string): Promise<string | undefined>;
 export declare function MCPForDAServerUrlNode(): IQTreeNode;
+export declare const CreateNewPluginManifestSentinel = "__createNewPluginManifest__";
 export declare function updateActionWithMCP(): IQTreeNode;
 //# sourceMappingURL=teamsProjectTypeNode.d.ts.map

package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"teamsProjectTypeNode.d.ts","sourceRoot":"","sources":["../../../../src/question/scaffold/vsc/teamsProjectTypeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,UAAU,EACV,UAAU,EACV,QAAQ,EACT,MAAM,wBAAwB,CAAC;AA4BhC;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,UAAU,CAMhD;AAED,qBAAa,uBAAuB;IAClC,MAAM,CAAC,WAAW,SAAc;IAChC,MAAM,CAAC,WAAW,SAAc;IAChC,MAAM,CAAC,UAAU,SAAa;IAE9B,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU;IAU5D,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU;IAU5D,MAAM,CAAC,EAAE,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU;CAW5D;AAED,wBAAgB,oBAAoB,IAAI,UAAU,CAuBjD;AAwBD,wBAAgB,0BAA0B,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU,CAwB3F;AAED,wBAAgB,kBAAkB,IAAI,UAAU,CAmB/C;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU,CAwCnF;AAED,wBAAgB,iBAAiB,IAAI,UAAU,CAkB9C;AAED,wBAAgB,mBAAmB,IAAI,UAAU,CA4ChD;AAED,wBAAgB,iBAAiB,IAAI,UAAU,CA0C9C;AAED,wBAAgB,2BAA2B,IAAI,UAAU,CA+BxD;AAED,wBAAgB,qBAAqB,IAAI,UAAU,CAUlD;AAED,wBAAgB,mBAAmB,IAAI,UAAU,CA+EhD"}
+{"version":3,"file":"teamsProjectTypeNode.d.ts","sourceRoot":"","sources":["../../../../src/question/scaffold/vsc/teamsProjectTypeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,UAAU,EAEV,UAAU,EACV,QAAQ,EACT,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,UAAU,CAAC;AAI/B,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,yCAAyC,CAAC;AAyBjD,eAAO,MAAM,oBAAoB;;;;;;CAMhC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,UAAU,CAMhD;AAED,qBAAa,uBAAuB;IAClC,MAAM,CAAC,WAAW,SAAc;IAChC,MAAM,CAAC,WAAW,SAAc;IAChC,MAAM,CAAC,UAAU,SAAa;IAE9B,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU;IAU5D,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU;IAU5D,MAAM,CAAC,EAAE,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU;CAW5D;AAED,wBAAgB,oBAAoB,IAAI,UAAU,CAmBjD;AAwBD,wBAAgB,0BAA0B,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU,CAwB3F;AAED,wBAAgB,kBAAkB,IAAI,UAAU,CAmB/C;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,GAAE,QAA0B,GAAG,UAAU,CAwCnF;AAED,wBAAgB,iBAAiB,IAAI,UAAU,CAkB9C;AAED,wBAAgB,mBAAmB,IAAI,UAAU,CA4ChD;AAED,wBAAgB,iBAAiB,IAAI,UAAU,CA8D9C;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,CAqC7C;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,IAAI,UAAU,CA2BpD;AAED,wBAAgB,2BAA2B,IAAI,UAAU,CA+BxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,IAAI,UAAU,EAAE,CA+B5D;AAED,wBAAgB,kCAAkC,IAAI,UAAU,EAAE,CAsBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,2BAA2B,IAAI,UAAU,EAAE,CA4D1D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAerF;AAED,wBAAgB,qBAAqB,IAAI,UAAU,CA4ClD;AAED,eAAO,MAAM,+BAA+B,gCAAgC,CAAC;AAE7E,wBAAgB,mBAAmB,IAAI,UAAU,CAyKhD"}

package/build/question/scaffold/vsc/teamsProjectTypeNode.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TeamsProjectTypeOptions = void 0;
+exports.CreateNewPluginManifestSentinel = exports.TeamsProjectTypeOptions = exports.teamsProjectTypeDeps = void 0;
 exports.getTeamsProjectNode = getTeamsProjectNode;
 exports.customCopilotRagNode = customCopilotRagNode;
 exports.notificationBotTriggerNode = notificationBotTriggerNode;
@@ -11,20 +11,35 @@ exports.tabProjectTypeNode = tabProjectTypeNode;
 exports.meProjectTypeNode = meProjectTypeNode;
 exports.m365SearchMeSubNode = m365SearchMeSubNode;
 exports.MCPServerTypeNode = MCPServerTypeNode;
+exports.MCPToolsFileNode = MCPToolsFileNode;
+exports.MCPCliPreFetchToolsNode = MCPCliPreFetchToolsNode;
 exports.MCPLocalServerSelectionNode = MCPLocalServerSelectionNode;
+exports.MCPForDAAuthTypeStaticOptions = MCPForDAAuthTypeStaticOptions;
+exports.MCPForDAFetchAuthTypeStaticOptions = MCPForDAFetchAuthTypeStaticOptions;
+exports.MCPForDAAuthCredentialNodes = MCPForDAAuthCredentialNodes;
+exports.validateMCPServerUrl = validateMCPServerUrl;
 exports.MCPForDAServerUrlNode = MCPForDAServerUrlNode;
 exports.updateActionWithMCP = updateActionWithMCP;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const featureFlags_1 = require("../../../common/featureFlags");
 const localizeUtils_1 = require("../../../common/localizeUtils");
+const mcpToolFetcher_1 = require("../../../component/utils/mcpToolFetcher");
 const odrProvider_1 = require("../../../component/utils/odrProvider");
 const create_1 = require("../../create");
 const questionNames_1 = require("../../questionNames");
 const commonNodes_1 = require("../commonNodes");
 const CapabilityOptions_1 = require("./CapabilityOptions");
 const rootNode_1 = require("./rootNode");
+exports.teamsProjectTypeDeps = {
+    pathExists: fs.pathExists,
+    readJSON: fs.readJSON,
+    fetchMCPTools: mcpToolFetcher_1.fetchMCPTools,
+    readMCPToolsFromFile: mcpToolFetcher_1.readMCPToolsFromFile,
+    probeMCPServerAuth: mcpToolFetcher_1.probeMCPServerAuth,
+};
 /**
  * Extract the Teams Agents and Apps sub-tree from the combined wizardNode.json.
  * Used by TDP (Teams Developer Portal) flow.
@@ -67,8 +82,8 @@ function customCopilotRagNode() {
         data: {
             type: "singleSelect",
             name: questionNames_1.QuestionNames.CustomCopilotRag,
-            title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.capability.customCopilotRagOption.label"),
-            placeholder: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.capability.customCopilotRag.placeholder"),
+            title: (0, localizeUtils_1.getLocalizedString)("template.teams.rag.label"),
+            placeholder: (0, localizeUtils_1.getLocalizedString)("template.teams.rag.source.placeholder"),
             staticOptions: [
                 CapabilityOptions_1.CustomCopilotRagOptions.customize(),
                 CapabilityOptions_1.CustomCopilotRagOptions.azureAISearch(),
@@ -282,11 +297,112 @@ function MCPServerTypeNode() {
             {
                 condition: { equals: "remote" },
                 data: MCPForDAServerUrlNode().data,
+                children: [
+                    MCPToolsFileNode(),
+                    MCPCliPreFetchToolsNode(),
+                    {
+                        // VS Code: gated on TEAMSFX_MCP_FOR_DA_DT — shipped behavior (DT off)
+                        // defers auth-type pick to the post-create fetch-mcp-tools CodeLens
+                        // flow per SCN-DA-CREATE-WITH-MCP-SERVER. CLI keeps the inline pick.
+                        condition: (inputs) => inputs.platform !== teamsfx_api_1.Platform.VSCode ||
+                            featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADT),
+                        data: {
+                            type: "singleSelect",
+                            name: questionNames_1.QuestionNames.MCPForDAAuthType,
+                            title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.AuthType.title"),
+                            staticOptions: MCPForDAAuthTypeStaticOptions(),
+                            default: "oauth",
+                        },
+                        children: MCPForDAAuthCredentialNodes(),
+                    },
+                ],
             },
             MCPLocalServerSelectionNode(),
         ],
     };
 }
+/**
+ * Question node for providing an MCP tools definition file.
+ * Shown when:
+ * - The MCP server requires auth (auto-detected), or
+ * - The user wants to provide tools manually.
+ * In CLI non-interactive mode, this is provided via --mcp-tools-file.
+ */
+function MCPToolsFileNode() {
+    return {
+        data: {
+            name: questionNames_1.QuestionNames.MCPToolsFilePath,
+            title: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFilePath.title"),
+            type: "text",
+            placeholder: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFilePath.placeholder"),
+            additionalValidationOnAccept: {
+                validFunc: async (value, inputs) => {
+                    if (!value)
+                        return undefined;
+                    const filePath = value;
+                    if (!(await exports.teamsProjectTypeDeps.pathExists(filePath))) {
+                        return (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileNotFound", filePath);
+                    }
+                    try {
+                        const tools = await exports.teamsProjectTypeDeps.readMCPToolsFromFile(filePath);
+                        if (inputs) {
+                            inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools] = tools;
+                        }
+                    }
+                    catch (e) {
+                        return e.message;
+                    }
+                    return undefined;
+                },
+            },
+        },
+        // This node is only shown when:
+        // 1. CLI platform (no VS Code MCP gateway), AND
+        // 2. Either auth is required, or auto-fetch returned no tools
+        condition: (inputs) => {
+            // In VS Code, tools are fetched by the extension handler, so skip this node
+            if (inputs.platform === teamsfx_api_1.Platform.VSCode)
+                return false;
+            // Show if no available tools were populated by auto-fetch
+            const tools = inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools];
+            return !tools || (Array.isArray(tools) && tools.length === 0);
+        },
+    };
+}
+/**
+ * Question node for CLI pre-fetch tool selection.
+ * Attempts to auto-fetch tools from the MCP server URL, then presents them for selection.
+ * For CLI platform only — VS Code has its own tool fetching via vscode.lm.tools.
+ */
+function MCPCliPreFetchToolsNode() {
+    return {
+        condition: (inputs) => {
+            // Only show in CLI when tools are available (either fetched or loaded from file)
+            if (inputs.platform === teamsfx_api_1.Platform.VSCode)
+                return false;
+            const tools = inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools];
+            return tools && Array.isArray(tools) && tools.length > 0;
+        },
+        data: {
+            type: "multiSelect",
+            name: questionNames_1.QuestionNames.MCPForDAPreFetchTools,
+            title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.PreFetchTools.title"),
+            staticOptions: [],
+            dynamicOptions: (inputs) => {
+                const availableTools = inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools];
+                return availableTools.map((tool) => ({
+                    id: tool.name,
+                    label: tool.name,
+                    detail: tool.description || "",
+                }));
+            },
+            default: (inputs) => {
+                const availableTools = inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools] || [];
+                return availableTools.map((tool) => tool.name);
+            },
+        },
+    };
+}
 function MCPLocalServerSelectionNode() {
     return {
         condition: { equals: "local" },
@@ -316,6 +432,166 @@ function MCPLocalServerSelectionNode() {
         children: [],
     };
 }
+/**
+ * Shared static option list for the `mcp-da-auth-type` single-select question.
+ * Kebab-case values so CLI flags (`--mcp-da-auth-type entra-sso` etc.) match the
+ * scaffold inputs and the scenario doc.
+ *
+ * `oauth-dynamic` (Dynamic Client Registration) is gated behind both
+ * `TEAMSFX_MCP_FOR_DA_DT` and `TEAMSFX_MCP_FOR_DA_DCR` because the DCR
+ * provisioning flow currently piggybacks on the DT-mode env-file plumbing.
+ */
+function MCPForDAAuthTypeStaticOptions() {
+    const showDCR = featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADT) &&
+        featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADCR);
+    const options = [
+        {
+            id: "oauth",
+            label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuth"),
+            detail: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuth.Detail"),
+        },
+    ];
+    if (showDCR) {
+        options.push({
+            id: "oauth-dynamic",
+            label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuthDynamic"),
+            detail: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuthDynamic.Detail"),
+        });
+    }
+    options.push({
+        id: "entra-sso",
+        label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.EntraSSO"),
+        detail: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.EntraSSO.Detail"),
+    }, {
+        id: "none",
+        label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.None"),
+        detail: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.None.Detail"),
+    });
+    return options;
+}
+function MCPForDAFetchAuthTypeStaticOptions() {
+    const options = [];
+    if (featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADCR)) {
+        options.push({
+            id: "oauth-dynamic",
+            label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuthDynamic"),
+            detail: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuthDynamic.Detail"),
+        });
+    }
+    options.push({
+        id: "oauth",
+        label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuth"),
+        detail: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuth.Detail"),
+    }, {
+        id: "entra-sso",
+        label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.EntraSSO"),
+        detail: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.EntraSSO.Detail"),
+    });
+    return options;
+}
+/**
+ * Follow-up question nodes shown after the user picks an `mcp-da-auth-type`
+ * value. Unconditional per SCN-DA-CREATE-WITH-MCP-SERVER step 6a/6b: the
+ * answers are always collected; the TEAMSFX_MCP_FOR_DA_DT flag only governs
+ * how the answers reach `oauth/register` (env-file persistence + ${{...}}
+ * refs when on; in-process bridge `process.env["oauth-client-id"]` etc. when
+ * off).
+ *
+ * - `oauth` (static OAuth): client id (required) + client secret (required, password)
+ *   + scopes (optional).
+ * - `entra-sso`: only client id (required).
+ * - `oauth-dynamic` / `none`: no follow-up questions.
+ */
+function MCPForDAAuthCredentialNodes() {
+    const clientIdNode = {
+        condition: (inputs) => {
+            const authType = inputs[questionNames_1.QuestionNames.MCPForDAAuthType];
+            return authType === "oauth" || authType === "entra-sso";
+        },
+        data: {
+            name: questionNames_1.QuestionNames.MCPForDAClientId,
+            type: "text",
+            title: (inputs) => inputs[questionNames_1.QuestionNames.MCPForDAAuthType] === "entra-sso"
+                ? (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.EntraClientId.title")
+                : (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ClientId.title"),
+            placeholder: (inputs) => inputs[questionNames_1.QuestionNames.MCPForDAAuthType] === "entra-sso"
+                ? (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.EntraClientId.placeholder")
+                : (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ClientId.placeholder"),
+            validation: {
+                validFunc: (value, inputs) => {
+                    if (!value || value.trim().length === 0) {
+                        return inputs?.[questionNames_1.QuestionNames.MCPForDAAuthType] === "entra-sso"
+                            ? (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.EntraClientId.required")
+                            : (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ClientId.required");
+                    }
+                    return undefined;
+                },
+            },
+        },
+    };
+    const clientSecretNode = {
+        condition: (inputs) => inputs[questionNames_1.QuestionNames.MCPForDAAuthType] === "oauth",
+        data: {
+            name: questionNames_1.QuestionNames.MCPForDAClientSecret,
+            type: "text",
+            password: true,
+            title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ClientSecret.title"),
+            placeholder: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ClientSecret.placeholder"),
+            validation: {
+                validFunc: (value) => {
+                    if (!value || value.trim().length === 0) {
+                        return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ClientSecret.required");
+                    }
+                    return undefined;
+                },
+            },
+        },
+    };
+    const scopesNode = {
+        condition: (inputs) => inputs[questionNames_1.QuestionNames.MCPForDAAuthType] === "oauth",
+        data: {
+            name: questionNames_1.QuestionNames.MCPForDAScopes,
+            type: "text",
+            title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Scopes.title"),
+            placeholder: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Scopes.placeholder"),
+            required: false,
+        },
+    };
+    return [clientIdNode, clientSecretNode, scopesNode];
+}
+/**
+ * Reject an MCP server URL that cannot be one.
+ *
+ * A value with no scheme never reaches the network: axios cannot build a request from it, so
+ * the probe throws, reports no status, and would be classified `undetermined` — letting a
+ * plainly malformed URL through. Rule it out syntactically first.
+ *
+ * ADR-0020: of the answers a server actually gives, block only on 404, the one no valid MCP
+ * endpoint was ever measured giving. The other `notEndpoint` shapes (403, 405, 200 without a
+ * JSON-RPC envelope) only warn after scaffolding, because a 403 can come from a WAF sitting in
+ * front of a perfectly good endpoint and wrongly blocking a legitimate URL is worse than
+ * missing a wrong one. `undetermined` — 5xx, timeouts, unreachable hosts — never blocks, so
+ * scaffolding does not fail closed because the network did.
+ *
+ * Shared by the create flow and the "add MCP server" action flow so both reject the same URLs.
+ */
+async function validateMCPServerUrl(value) {
+    let parsed;
+    try {
+        parsed = new URL(value);
+    }
+    catch {
+        return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ServerUrl.invalidUrl");
+    }
+    if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+        return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ServerUrl.invalidUrl");
+    }
+    const probe = await exports.teamsProjectTypeDeps.probeMCPServerAuth(value);
+    if (probe.endpointStatus === "notEndpoint" && probe.responseStatus === 404) {
+        return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ServerUrl.notAnMcpEndpoint");
+    }
+    return undefined;
+}
 function MCPForDAServerUrlNode() {
     return {
         condition: { equals: CapabilityOptions_1.ActionStartOptions.mcp().id },
@@ -324,19 +600,132 @@ function MCPForDAServerUrlNode() {
             title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ServerUrl.title"),
             type: "text",
             placeholder: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.ServerUrl.placeholder"),
+            additionalValidationOnAccept: {
+                validFunc: async (value, inputs) => {
+                    if (!value || !inputs)
+                        return undefined;
+                    const rejection = await validateMCPServerUrl(value);
+                    if (rejection) {
+                        return rejection;
+                    }
+                    // For CLI: attempt to auto-fetch tools from the server
+                    if (inputs.platform !== teamsfx_api_1.Platform.VSCode) {
+                        try {
+                            const result = await exports.teamsProjectTypeDeps.fetchMCPTools(value);
+                            if (result.requiresAuth) {
+                                inputs["_mcpAuthRequired"] = true;
+                                inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools] = [];
+                                if (result.authMetadataUrl) {
+                                    inputs[questionNames_1.QuestionNames.MCPForDAAuthMetadataUrl] = result.authMetadataUrl;
+                                }
+                                inputs[questionNames_1.QuestionNames.MCPForDAAuth] = "OAuthPluginVault";
+                            }
+                            else if (result.tools.length > 0) {
+                                inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools] = result.tools;
+                                inputs[questionNames_1.QuestionNames.MCPForDATool] = "pre-fetch";
+                                inputs[questionNames_1.QuestionNames.MCPForDAAuth] = "NoneAuth";
+                            }
+                            else {
+                                inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools] = [];
+                                inputs[questionNames_1.QuestionNames.MCPForDAAuth] = "NoneAuth";
+                            }
+                        }
+                        catch {
+                            inputs[questionNames_1.QuestionNames.MCPForDAAvailableTools] = [];
+                            inputs[questionNames_1.QuestionNames.MCPForDAAuth] = "NoneAuth";
+                        }
+                    }
+                    return undefined;
+                },
+            },
         },
     };
 }
+exports.CreateNewPluginManifestSentinel = "__createNewPluginManifest__";
 function updateActionWithMCP() {
     return {
         data: {
             type: "singleFile",
             name: questionNames_1.QuestionNames.PluginManifestFilePath,
             title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.File.title"),
-            defaultFolder: (inputs) => path_1.default.normalize(inputs.projectPath),
-            default: (inputs) => path_1.default.normalize(path_1.default.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.DefaultPluginManifestFileName)),
+            defaultFolder: (inputs) => path_1.default.normalize(path_1.default.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName)),
+            filters: { files: ["json"] },
+            possibleFiles: async (inputs) => {
+                const projectPath = inputs.projectPath;
+                const items = [];
+                // List every action plugin file referenced by the declarative agent
+                // manifest so the user can update an existing one.
+                try {
+                    const teamsManifestPath = path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName);
+                    if (await exports.teamsProjectTypeDeps.pathExists(teamsManifestPath)) {
+                        const teamsManifest = await exports.teamsProjectTypeDeps.readJSON(teamsManifestPath);
+                        const declarativeAgentRelativePath = teamsManifest?.copilotAgents?.declarativeAgents?.[0]?.file;
+                        if (declarativeAgentRelativePath) {
+                            const declarativeAgentPath = path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName, declarativeAgentRelativePath);
+                            if (await exports.teamsProjectTypeDeps.pathExists(declarativeAgentPath)) {
+                                const da = await exports.teamsProjectTypeDeps.readJSON(declarativeAgentPath);
+                                const actions = da?.actions ?? [];
+                                const seen = new Set();
+                                for (const action of actions) {
+                                    if (!action?.file)
+                                        continue;
+                                    const absPath = path_1.default.normalize(path_1.default.join(path_1.default.dirname(declarativeAgentPath), action.file));
+                                    if (seen.has(absPath))
+                                        continue;
+                                    seen.add(absPath);
+                                    items.push({
+                                        id: absPath,
+                                        label: `$(file) ${path_1.default.basename(absPath)}`,
+                                        description: path_1.default.dirname(absPath),
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
+                catch {
+                    // best-effort — fall through to just the create-new option
+                }
+                items.push({
+                    id: exports.CreateNewPluginManifestSentinel,
+                    label: `$(new-file) ${(0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.File.createNew.label")}`,
+                });
+                return items;
+            },
         },
         children: [
+            {
+                condition: (inputs) => inputs[questionNames_1.QuestionNames.PluginManifestFilePath] === exports.CreateNewPluginManifestSentinel,
+                data: {
+                    type: "text",
+                    name: questionNames_1.QuestionNames.NewPluginManifestFileName,
+                    title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.File.createNew.title"),
+                    placeholder: teamsfx_api_1.DefaultPluginManifestFileName,
+                    default: teamsfx_api_1.DefaultPluginManifestFileName,
+                    validation: {
+                        validFunc: async (input, inputs) => {
+                            const trimmed = input.trim();
+                            if (!trimmed) {
+                                return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.File.createNew.validation.empty");
+                            }
+                            if (!trimmed.toLowerCase().endsWith(".json")) {
+                                return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.File.createNew.validation.extension");
+                            }
+                            if (path_1.default.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\")) {
+                                return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.File.createNew.validation.relative");
+                            }
+                            const projectPath = inputs?.projectPath;
+                            if (projectPath) {
+                                const target = path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName, trimmed);
+                                if (await exports.teamsProjectTypeDeps.pathExists(target)) {
+                                    return (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.File.createNew.validation.exists", trimmed);
+                                }
+                            }
+                            return undefined;
+                        },
+                    },
+                },
+            },
             {
                 data: {
                     type: "multiSelect",
@@ -356,16 +745,20 @@ function updateActionWithMCP() {
                     },
                     default: async (inputs) => {
                         const pluginManifestFilePath = inputs[questionNames_1.QuestionNames.PluginManifestFilePath];
-                        if (!pluginManifestFilePath) {
+                        // Skip when the user chose "Create a new ai-plugin.json" (the value
+                        // is a sentinel id, not a real path) or when the file doesn't exist
+                        // yet. The plugin manifest will be created later in addPluginFromMCP /
+                        // updateActionWithMCP, so there are no pre-selected tools to default.
+                        if (!pluginManifestFilePath ||
+                            pluginManifestFilePath === exports.CreateNewPluginManifestSentinel ||
+                            !(await exports.teamsProjectTypeDeps.pathExists(pluginManifestFilePath))) {
                             return [];
                         }
-                        const pluginManifest = await fs.readJSON(pluginManifestFilePath);
+                        const pluginManifest = await exports.teamsProjectTypeDeps.readJSON(pluginManifestFilePath);
                         const serverUrl = inputs[questionNames_1.QuestionNames.MCPForDAServerUrl];
                         const result = [];
                         pluginManifest.runtimes
-                            .filter((runtime) => runtime.type === "RemoteMCPServer" &&
-                            runtime.spec.url === serverUrl &&
-                            !runtime.spec["enable_dynamic_discovery"])
+                            .filter((runtime) => runtime.type === "RemoteMCPServer" && runtime.spec.url === serverUrl)
                             .forEach((runtime) => {
                             result.push(...runtime["run_for_functions"]);
                         });
@@ -381,18 +774,12 @@ function updateActionWithMCP() {
                     type: "singleSelect",
                     name: questionNames_1.QuestionNames.MCPForDAAuthType,
                     title: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.AuthType.title"),
-                    staticOptions: [
-                        {
-                            id: "oauth",
-                            label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.OAuth"),
-                        },
-                        {
-                            id: "entraSSO",
-                            label: (0, localizeUtils_1.getLocalizedString)("core.createProjectQuestion.mcpForDa.Auth.EntraSSO"),
-                        },
-                    ],
-                    default: "oauth",
+                    staticOptions: MCPForDAFetchAuthTypeStaticOptions(),
+                    default: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADCR)
+                        ? "oauth-dynamic"
+                        : "oauth",
                 },
+                children: [],
             },
         ],
     };