@microsoft/teamsfx-core 3.0.14-alpha.36cd4ecbcb.0 → 3.0.14-alpha.3f4824bc25.0

package/build/core/FxCore.declarativeAgent.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FxCoreDeclarativeAgentPart = void 0;
+exports.FxCoreDeclarativeAgentPart = exports.fxCoreDeclarativeAgentDeps = void 0;
 const tslib_1 = require("tslib");
 const hooks_1 = require("@feathersjs/hooks");
 const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
@@ -14,7 +14,7 @@ const globalVars_1 = require("../common/globalVars");
 const localizeUtils_1 = require("../common/localizeUtils");
 const telemetry_1 = require("../common/telemetry");
 const versionMetadata_1 = require("../common/versionMetadata");
-const actionInjector_1 = require("../component/configManager/actionInjector");
+const featureFlags_1 = require("../common/featureFlags");
 const constants_1 = require("../component/constants");
 const errors_1 = require("../component/driver/teamsApp/errors");
 const results_1 = require("../component/driver/teamsApp/results");
@@ -26,7 +26,7 @@ const helper_1 = require("../component/generator/declarativeAgent/helper");
 const helper_2 = require("../component/generator/openApiSpec/helper");
 const questionMW_1 = require("../component/middleware/questionMW");
 const common_1 = require("../component/utils/common");
-const mcpToolFetcher_1 = require("../component/utils/mcpToolFetcher");
+const mcpAuthScaffolder_1 = require("../component/utils/mcpAuthScaffolder");
 const pathUtils_1 = require("../component/utils/pathUtils");
 const common_2 = require("../error/common");
 const constants_2 = require("../question/constants");
@@ -35,6 +35,13 @@ const concurrentLocker_1 = require("./middleware/concurrentLocker");
 const errorHandler_1 = require("./middleware/errorHandler");
 // Non-translatable CLI command template used in warning messages
 const mcpAddActionHint = "atk add action --api-plugin-type mcp --mcp-da-server-url <server-url> --mcp-tools-file-path <path-to-tools-json> --interactive false";
+exports.fxCoreDeclarativeAgentDeps = {
+    addExistingPlugin: helper_1.addExistingPlugin,
+    createNewActionPluginManifest: helper_1.createNewActionPluginManifest,
+    deriveMCPServerNameFromUrl: helper_1.deriveMCPServerNameFromUrl,
+    generateFromApiSpec: helper_2.generateFromApiSpec,
+    generateScaffoldingSummary: helper_2.generateScaffoldingSummary,
+};
 class FxCoreDeclarativeAgentPart {
     async updateActionWithMCP(inputs) {
         const context = (0, globalVars_1.createContext)();
@@ -60,7 +67,7 @@ class FxCoreDeclarativeAgentPart {
                 return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("declarativeAgents", teamsManifestPath)));
             }
             const declarativeAgentManifestPath = path.join(projectPath, teamsfx_api_1.AppPackageFolderName, declarativeAgentRelativePath);
-            const createRes = await (0, helper_1.createNewActionPluginManifest)(projectPath, desiredFileName, declarativeAgentManifestPath);
+            const createRes = await exports.fxCoreDeclarativeAgentDeps.createNewActionPluginManifest(projectPath, desiredFileName, declarativeAgentManifestPath);
             if (createRes.isErr()) {
                 return (0, teamsfx_api_1.err)(createRes.error);
             }
@@ -76,19 +83,12 @@ class FxCoreDeclarativeAgentPart {
         const serverName = inputs[constants_2.QuestionNames.MCPForDAServerName];
         const mcpAuth = inputs[constants_2.QuestionNames.MCPForDAAuth];
         const authType = inputs[constants_2.QuestionNames.MCPForDAAuthType];
-        let oauthAuthorizationUrl = undefined;
-        let oauthTokenUrl = undefined;
-        let oauthRefreshUrl = undefined;
+        let mcpAuthEndpoints = {};
         let registrationId = undefined;
         if (mcpAuth === "OAuthPluginVault") {
             try {
                 registrationId = `MCP_DA_AUTH_ID_${serverName.toUpperCase()}`;
-                if (authType === "oauth") {
-                    const metadata = await (0, mcpToolFetcher_1.resolveMCPOAuthMetadata)(inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl], inputs[constants_2.QuestionNames.MCPForDAAuthWellKnownUrl]);
-                    oauthAuthorizationUrl = metadata.authorizationUrl;
-                    oauthTokenUrl = metadata.tokenUrl;
-                    oauthRefreshUrl = metadata.refreshUrl;
-                }
+                mcpAuthEndpoints = await (0, mcpAuthScaffolder_1.resolveMCPAuthEndpoints)(authType, inputs);
             }
             catch (error) {
                 void context.userInteraction.showMessage("error", (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthMetadataMissingError", error.message), false);
@@ -104,14 +104,20 @@ class FxCoreDeclarativeAgentPart {
             const error = new teamsfx_api_1.UserError("MCPForDAPreFetchToolsNotFound", "PreFetchToolsNotFound", (0, localizeUtils_1.getDefaultString)("core.MCPForDA.preFetchToolsNotFound"), (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.preFetchToolsNotFound"));
             return (0, teamsfx_api_1.err)(error);
         }
+        const pluginFunctions = Array.isArray(aiPluginContent.functions)
+            ? aiPluginContent.functions
+            : [];
+        const pluginRuntimes = Array.isArray(aiPluginContent.runtimes) ? aiPluginContent.runtimes : [];
         const toolsSelectedPrevious = [];
-        aiPluginContent.runtimes
-            .filter((runtime) => (runtime.type === "RemoteMCPServer" && runtime.spec.url === mcpServerUrl) ||
+        pluginRuntimes
+            .filter((runtime) => (runtime.type === "RemoteMCPServer" && runtime.spec?.url === mcpServerUrl) ||
             runtime.type === "LocalPlugin")
             .forEach((runtime) => {
-            toolsSelectedPrevious.push(...runtime.run_for_functions);
+            if (Array.isArray(runtime.run_for_functions)) {
+                toolsSelectedPrevious.push(...runtime.run_for_functions);
+            }
         });
-        aiPluginContent.functions = aiPluginContent.functions.filter((func) => !toolsSelectedPrevious.includes(func.name));
+        aiPluginContent.functions = pluginFunctions.filter((func) => !toolsSelectedPrevious.includes(func.name));
         aiPluginContent.functions = [
             ...aiPluginContent.functions,
             ...mcpToolsDetail
@@ -136,9 +142,9 @@ class FxCoreDeclarativeAgentPart {
                 }
             }),
         ];
-        const matchedRuntime = aiPluginContent.runtimes.find((runtime) => runtime.type === "RemoteMCPServer" && runtime.spec.url === mcpServerUrl);
-        aiPluginContent.runtimes = aiPluginContent.runtimes.filter((runtime) => (runtime.type !== "RemoteMCPServer" && runtime.type !== "LocalPlugin") ||
-            runtime.spec.url !== mcpServerUrl);
+        const matchedRuntime = pluginRuntimes.find((runtime) => runtime.type === "RemoteMCPServer" && runtime.spec?.url === mcpServerUrl);
+        aiPluginContent.runtimes = pluginRuntimes.filter((runtime) => (runtime.type !== "RemoteMCPServer" && runtime.type !== "LocalPlugin") ||
+            runtime.spec?.url !== mcpServerUrl);
         if (inputs[constants_2.QuestionNames.MCPLocalServerIdentifier] != null) {
             aiPluginContent.runtimes.push({
                 type: "LocalPlugin",
@@ -181,19 +187,21 @@ class FxCoreDeclarativeAgentPart {
                     },
                 },
                 run_for_functions: mcpToolsSelected,
-                auth: mcpAuth === "OAuthPluginVault" && !!registrationId
-                    ? {
-                        type: "OAuthPluginVault",
-                        reference_id: `$\{\{${registrationId}\}\}`,
-                    }
-                    : {
-                        type: "None",
-                    },
+                auth: (0, mcpAuthScaffolder_1.deriveMCPManifestOAuth)(authType, registrationId) ?? {
+                    type: "None",
+                },
             });
         }
         if (mcpAuth === "OAuthPluginVault" && !!registrationId) {
             // insert oauth info in teamsapp.yaml
-            await actionInjector_1.ActionInjector.injectCreateOAuthActionForMCP(pathUtils_1.pathUtils.getYmlFilePath(projectPath), authType, serverName, registrationId, mcpServerUrl, oauthAuthorizationUrl, oauthTokenUrl, oauthRefreshUrl);
+            await (0, mcpAuthScaffolder_1.injectMCPAuthActionToYml)({
+                ymlPath: pathUtils_1.pathUtils.getYmlFilePath(projectPath),
+                authType,
+                authName: serverName,
+                registrationId,
+                mcpServerUrl,
+                endpoints: mcpAuthEndpoints,
+            });
         }
         void context.userInteraction
             .showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.updatePluginManifest", aiPluginFilePathRelative), false, "Provision")
@@ -238,10 +246,21 @@ class FxCoreDeclarativeAgentPart {
         // The CLI flow (below) keeps the original non-interactive behavior of
         // probing the MCP server, fetching tools and writing ai-plugin.json + yaml
         // OAuth registration, since the CLI has no equivalent notification UX.
-        if (isGenerateFromMCP && inputs.platform === teamsfx_api_1.Platform.VSCode) {
+        //
+        // Under the Dynamic Tool Discovery (DT) flag this early redirect is skipped
+        // so that VS Code runs the same inline scaffolder as the CLI — the
+        // CodeLens "fetch action" hop is absorbed into add-action itself.
+        if (isGenerateFromMCP &&
+            inputs.platform === teamsfx_api_1.Platform.VSCode &&
+            !featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADT)) {
             return await this.addPluginFromMCP(inputs, context);
         }
-        const teamsManifestPath = inputs[constants_2.QuestionNames.ManifestPath];
+        // VS Code MCP inline flow (DT on) skips the Teams-manifest picker; infer
+        // the path from `projectPath/appPackage/manifest.json` to match the leaner
+        // `updateActionWithMCP` UX. CLI and non-MCP flows still supply ManifestPath
+        // via the question tree / `--manifest-file`.
+        const teamsManifestPath = inputs[constants_2.QuestionNames.ManifestPath] ??
+            path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName);
         const appPackageFolder = path.dirname(teamsManifestPath);
         // validate the project is valid for adding plugin
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
@@ -265,7 +284,13 @@ class FxCoreDeclarativeAgentPart {
             return (0, teamsfx_api_1.err)(declarativeCopilotManifesRes.error);
         }
         const declarativeCopilotManifest = declarativeCopilotManifesRes.value;
-        let confirmMessage = (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm", path.relative(inputs.projectPath, appPackageFolder));
+        const mcpAuthTypeChoice = inputs[constants_2.QuestionNames.MCPForDAAuthType];
+        const mcpTouchesYml = isGenerateFromMCP && mcpAuthTypeChoice && mcpAuthTypeChoice !== "none";
+        let confirmMessage = (0, localizeUtils_1.getLocalizedString)(isGenerateFromMCP
+            ? mcpTouchesYml
+                ? "core.addApi.confirm.mcp.teamsYaml"
+                : "core.addApi.confirm.mcp"
+            : "core.addApi.confirm", path.relative(inputs.projectPath, appPackageFolder), ...(mcpTouchesYml ? [versionMetadata_1.MetadataV4.configFile] : []));
         // Will be used if generating from API spec
         let specParser = undefined;
         let authNameAndSchemes = [];
@@ -281,12 +306,20 @@ class FxCoreDeclarativeAgentPart {
             }
         }
         // confirm
-        const confirmRes = await context.userInteraction.showMessage("warn", confirmMessage, true, (0, localizeUtils_1.getLocalizedString)("core.addApi.continue"));
-        if (confirmRes.isErr()) {
-            return (0, teamsfx_api_1.err)(confirmRes.error);
-        }
-        else if (confirmRes.value !== (0, localizeUtils_1.getLocalizedString)("core.addApi.continue")) {
-            return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
+        // VS Code MCP inline flow (DT on) skips the confirmation modal to match
+        // the leaner `updateActionWithMCP` UX; writes happen as soon as the last
+        // required answer is provided. CLI interactive and other flows still show it.
+        const skipConfirmModal = isGenerateFromMCP &&
+            inputs.platform === teamsfx_api_1.Platform.VSCode &&
+            featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADT);
+        if (!skipConfirmModal) {
+            const confirmRes = await context.userInteraction.showMessage("warn", confirmMessage, true, (0, localizeUtils_1.getLocalizedString)("core.addApi.continue"));
+            if (confirmRes.isErr()) {
+                return (0, teamsfx_api_1.err)(confirmRes.error);
+            }
+            else if (confirmRes.value !== (0, localizeUtils_1.getLocalizedString)("core.addApi.continue")) {
+                return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
+            }
         }
         // find the next available action id
         let actionId = "";
@@ -303,7 +336,7 @@ class FxCoreDeclarativeAgentPart {
             destinationPluginManifestPath =
                 await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
             const destinationApiSpecPath = await PluginManifestUtils_1.pluginManifestUtils.getDefaultNextAvailableApiSpecPath(inputs[constants_2.QuestionNames.ApiSpecLocation].trim(), path.join(appPackageFolder, teamsfx_api_1.DefaultApiSpecFolderName));
-            const generateRes = await (0, helper_2.generateFromApiSpec)(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.addPlugin, m365_spec_parser_1.ProjectType.Copilot, {
+            const generateRes = await exports.fxCoreDeclarativeAgentDeps.generateFromApiSpec(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.addPlugin, m365_spec_parser_1.ProjectType.Copilot, {
                 destinationApiSpecFilePath: destinationApiSpecPath,
                 pluginManifestFilePath: destinationPluginManifestPath,
             }, inputs[constants_2.QuestionNames.ApiSpecLocation].trim());
@@ -312,7 +345,7 @@ class FxCoreDeclarativeAgentPart {
             }
             const warnings = generateRes.value.warnings;
             if (warnings && warnings.length > 0) {
-                const warnSummary = await (0, helper_2.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(inputs.projectPath, destinationApiSpecPath), path.relative(inputs.projectPath, destinationPluginManifestPath), inputs.projectPath);
+                const warnSummary = await exports.fxCoreDeclarativeAgentDeps.generateScaffoldingSummary(warnings, manifestRes.value, path.relative(inputs.projectPath, destinationApiSpecPath), path.relative(inputs.projectPath, destinationPluginManifestPath), inputs.projectPath);
                 context.logProvider.info(warnSummary + "\n");
             }
             const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_1.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
@@ -333,175 +366,260 @@ class FxCoreDeclarativeAgentPart {
             if (!mcpServerUrl) {
                 return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(teamsfx_api_1.Stage.addPlugin, "MissingMCPServerUrl", (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.missingServerUrl"), (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.missingServerUrl")));
             }
-            // Load tools from file if provided and not yet loaded
-            const existingTools = inputs[constants_2.QuestionNames.MCPForDAAvailableTools];
-            if (toolsFilePath && (!existingTools || existingTools.length === 0)) {
-                try {
-                    const { readMCPToolsFromFile } = await Promise.resolve().then(() => tslib_1.__importStar(require("../component/utils/mcpToolFetcher")));
-                    const fileTools = await readMCPToolsFromFile(toolsFilePath);
-                    inputs[constants_2.QuestionNames.MCPForDAAvailableTools] = fileTools;
-                    if (!inputs[constants_2.QuestionNames.MCPForDAPreFetchTools]) {
-                        inputs[constants_2.QuestionNames.MCPForDAPreFetchTools] = fileTools.map((t) => t.name);
-                    }
-                }
-                catch {
-                    mcpWarnings.push({
-                        type: "mcpToolsFileReadError",
-                        content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileReadError", toolsFilePath, mcpAddActionHint),
-                    });
-                }
-            }
-            // Probe auth if tools were loaded from file but auth not yet detected
-            if (inputs[constants_2.QuestionNames.MCPForDAAvailableTools]?.length > 0 &&
-                !inputs[constants_2.QuestionNames.MCPForDAAuth] &&
-                mcpServerUrl) {
-                try {
-                    const { probeMCPServerAuth } = await Promise.resolve().then(() => tslib_1.__importStar(require("../component/utils/mcpToolFetcher")));
-                    const authProbe = await probeMCPServerAuth(mcpServerUrl);
-                    if (authProbe.requiresAuth) {
-                        inputs[constants_2.QuestionNames.MCPForDAAuth] = "OAuthPluginVault";
-                        if (authProbe.authMetadataUrl) {
-                            inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl] = authProbe.authMetadataUrl;
-                        }
-                    }
-                }
-                catch {
-                    // Auth probe failed - continue without auth
+            // Dynamic Tool Discovery flow: skip static tool fetching entirely;
+            // write ai-plugin.json with a `ModelContextProtocol` runtime that the
+            // agent host probes for tools at runtime, then inject the OAuth/DCR step.
+            if (featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.MCPForDADT)) {
+                destinationPluginManifestPath =
+                    await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
+                // Namespace the action by the MCP server host (shared rule with the
+                // create flow) so actions targeting different MCP servers get distinct
+                // namespaces. The derived value is alphanumeric + lowercase, satisfying
+                // the plugin manifest schema (which rejects `_` and other punctuation).
+                const namespace = (0, helper_1.deriveMCPNamespaceFromUrl)(mcpServerUrl);
+                const pluginManifest = {
+                    $schema: "https://developer.microsoft.com/json-schemas/copilot/plugin/v2.4/schema.json",
+                    schema_version: "v2.4",
+                    name_for_human: "MCP Action",
+                    description_for_human: "Action powered by MCP server",
+                    contact_email: "publisher-email@example.com",
+                    namespace,
+                    functions: [],
+                    runtimes: [
+                        {
+                            type: "RemoteMCPServer",
+                            spec: { url: mcpServerUrl },
+                            run_for_functions: ["*"],
+                        },
+                    ],
+                };
+                const authType = inputs[constants_2.QuestionNames.MCPForDAAuthType];
+                if (authType === "none") {
+                    pluginManifest.runtimes[0].auth = { type: "None" };
                 }
-            }
-            // Auto-fetch tools if not yet loaded (CLI flow for no-auth servers)
-            const currentTools = inputs[constants_2.QuestionNames.MCPForDAAvailableTools];
-            if ((!currentTools || currentTools.length === 0) && mcpServerUrl) {
-                try {
-                    const { fetchMCPTools } = await Promise.resolve().then(() => tslib_1.__importStar(require("../component/utils/mcpToolFetcher")));
-                    const result = await fetchMCPTools(mcpServerUrl);
-                    if (!result.requiresAuth && result.tools.length > 0) {
-                        inputs[constants_2.QuestionNames.MCPForDAAvailableTools] = result.tools;
-                        if (!inputs[constants_2.QuestionNames.MCPForDAPreFetchTools]) {
-                            inputs[constants_2.QuestionNames.MCPForDAPreFetchTools] = result.tools.map((t) => t.name);
-                        }
+                else if (authType) {
+                    const serverName = (0, helper_1.deriveMCPServerNameFromUrl)(mcpServerUrl).toUpperCase();
+                    const registrationId = (0, helper_1.deriveMCPRegistrationIdFromUrl)(mcpServerUrl);
+                    const manifestOAuth = (0, mcpAuthScaffolder_1.deriveMCPManifestOAuth)(authType, registrationId);
+                    if (manifestOAuth) {
+                        pluginManifest.runtimes[0].auth = manifestOAuth;
                     }
-                    else if (result.requiresAuth) {
-                        // Store auth metadata for later use
-                        inputs[constants_2.QuestionNames.MCPForDAAuth] = "OAuthPluginVault";
-                        if (result.authMetadataUrl) {
-                            inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl] = result.authMetadataUrl;
+                    try {
+                        const endpoints = await (0, mcpAuthScaffolder_1.resolveMCPAuthEndpoints)(authType, inputs);
+                        const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath);
+                        if (ymlPath) {
+                            await (0, mcpAuthScaffolder_1.injectMCPAuthActionToYml)({
+                                ymlPath,
+                                authType,
+                                // Per SCN-DA-CREATE-WITH-MCP-SERVER the `name:` of the injected
+                                // oauth/dcr step matches the ai-plugin.json `namespace`, not the
+                                // declarativeAgent action id (which stays the template default).
+                                authName: namespace,
+                                registrationId,
+                                mcpServerUrl,
+                                endpoints,
+                                persistCredentialEnvRefs: true,
+                                serverName,
+                            });
                         }
-                        mcpWarnings.push({
-                            type: "mcpAuthRequired",
-                            content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.authRequired", mcpServerUrl, mcpAddActionHint),
+                        await (0, mcpAuthScaffolder_1.persistMCPAuthCredentialEnvVars)({
+                            projectPath: inputs.projectPath,
+                            authType,
+                            serverName,
+                            clientId: inputs[constants_2.QuestionNames.MCPForDAClientId],
+                            clientSecret: inputs[constants_2.QuestionNames.MCPForDAClientSecret],
+                            scopes: inputs[constants_2.QuestionNames.MCPForDAScopes],
                         });
                     }
-                    else {
+                    catch (error) {
                         mcpWarnings.push({
-                            type: "mcpNoToolsFetched",
-                            content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.noToolsFetched", mcpServerUrl, mcpAddActionHint),
+                            type: "mcpAuthMetadataError",
+                            content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthMetadataMissingError", error.message),
                         });
                     }
                 }
-                catch {
-                    mcpWarnings.push({
-                        type: "mcpFetchError",
-                        content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.fetchError", mcpServerUrl, mcpAddActionHint),
-                    });
+                await fs_extra_1.default.ensureFile(destinationPluginManifestPath);
+                await fs_extra_1.default.writeJSON(destinationPluginManifestPath, pluginManifest, { spaces: 4 });
+                const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_1.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
+                if (addActionRes.isErr()) {
+                    return (0, teamsfx_api_1.err)(addActionRes.error);
                 }
-            }
-            // If no tools available (auth required or fetch failed), skip creating plugin - just warn
-            const mcpTools = inputs[constants_2.QuestionNames.MCPForDAAvailableTools];
-            const mcpToolsSelected = inputs[constants_2.QuestionNames.MCPForDAPreFetchTools] || [];
-            if (!mcpTools || mcpTools.length === 0 || mcpToolsSelected.length === 0) {
                 if (mcpWarnings.length > 0) {
                     for (const warning of mcpWarnings) {
                         context.logProvider.warning(warning.content);
                     }
                 }
-                return (0, teamsfx_api_1.ok)(undefined);
             }
-            destinationPluginManifestPath =
-                await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
-            const pluginManifest = {
-                $schema: "https://developer.microsoft.com/json-schemas/copilot/plugin/v2.4/schema.json",
-                schema_version: "v2.4",
-                name_for_human: "MCP Action",
-                description_for_human: "Action powered by MCP server",
-                contact_email: "publisher-email@example.com",
-                namespace: "mcpAction",
-                functions: [],
-                runtimes: [],
-            };
-            if (mcpTools && mcpTools.length > 0 && mcpToolsSelected.length > 0) {
-                const selectedTools = mcpTools.filter((tool) => mcpToolsSelected.includes(tool.name));
-                pluginManifest.functions = selectedTools.map((tool) => ({
-                    name: tool.name,
-                    description: tool.description || "",
-                }));
-                // Write mcp-tools file with full tool definitions (no field filtering)
-                const mcpToolsFile = `mcp-tools-${suffix}.json`;
-                const mcpToolsOutputPath = path.join(appPackageFolder, mcpToolsFile);
-                await fs_extra_1.default.writeJSON(mcpToolsOutputPath, { tools: selectedTools }, { spaces: 4 });
-                pluginManifest.runtimes = [
-                    {
-                        type: "RemoteMCPServer",
-                        spec: {
-                            url: mcpServerUrl,
-                            mcp_tool_description: {
-                                file: mcpToolsFile,
-                            },
-                        },
-                        run_for_functions: pluginManifest.functions.map((f) => f.name),
-                    },
-                ];
-                // Auth handling
-                const mcpAuth = inputs[constants_2.QuestionNames.MCPForDAAuth];
-                if (mcpAuth === "OAuthPluginVault") {
-                    const authType = inputs[constants_2.QuestionNames.MCPForDAAuthType];
-                    if (!authType) {
-                        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(teamsfx_api_1.Stage.addPlugin, "MissingMCPAuthType", (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.missingAuthType"), (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.missingAuthType")));
+            else {
+                // Load tools from file if provided and not yet loaded
+                const existingTools = inputs[constants_2.QuestionNames.MCPForDAAvailableTools];
+                if (toolsFilePath && (!existingTools || existingTools.length === 0)) {
+                    try {
+                        const { readMCPToolsFromFile } = await Promise.resolve().then(() => tslib_1.__importStar(require("../component/utils/mcpToolFetcher")));
+                        const fileTools = await readMCPToolsFromFile(toolsFilePath);
+                        inputs[constants_2.QuestionNames.MCPForDAAvailableTools] = fileTools;
+                        if (!inputs[constants_2.QuestionNames.MCPForDAPreFetchTools]) {
+                            inputs[constants_2.QuestionNames.MCPForDAPreFetchTools] = fileTools.map((t) => t.name);
+                        }
                     }
-                    const registrationId = `MCP_DA_AUTH_ID_${actionId.toUpperCase()}`;
-                    pluginManifest.runtimes[0].auth = {
-                        type: "OAuthPluginVault",
-                        reference_id: `$\{\{${registrationId}\}\}`,
-                    };
-                    // Resolve OAuth metadata and inject oauth/register into m365agents.yml
+                    catch {
+                        mcpWarnings.push({
+                            type: "mcpToolsFileReadError",
+                            content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileReadError", toolsFilePath, mcpAddActionHint),
+                        });
+                    }
+                }
+                // Probe auth if tools were loaded from file but auth not yet detected
+                if (inputs[constants_2.QuestionNames.MCPForDAAvailableTools]?.length > 0 &&
+                    !inputs[constants_2.QuestionNames.MCPForDAAuth] &&
+                    mcpServerUrl) {
                     try {
-                        let authorizationUrl;
-                        let tokenUrl;
-                        let refreshUrl;
-                        if (authType === "oauth") {
-                            const metadata = await (0, mcpToolFetcher_1.resolveMCPOAuthMetadata)(inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl]);
-                            authorizationUrl = metadata.authorizationUrl;
-                            tokenUrl = metadata.tokenUrl;
-                            refreshUrl = metadata.refreshUrl;
+                        const { probeMCPServerAuth } = await Promise.resolve().then(() => tslib_1.__importStar(require("../component/utils/mcpToolFetcher")));
+                        const authProbe = await probeMCPServerAuth(mcpServerUrl);
+                        if (authProbe.requiresAuth) {
+                            inputs[constants_2.QuestionNames.MCPForDAAuth] = "OAuthPluginVault";
+                            if (authProbe.authMetadataUrl) {
+                                inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl] = authProbe.authMetadataUrl;
+                            }
                         }
-                        const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath);
-                        if (ymlPath) {
-                            await actionInjector_1.ActionInjector.injectCreateOAuthActionForMCP(ymlPath, authType, actionId, registrationId, mcpServerUrl, authorizationUrl, tokenUrl, refreshUrl);
+                    }
+                    catch {
+                        // Auth probe failed - continue without auth
+                    }
+                }
+                // Auto-fetch tools if not yet loaded (CLI flow for no-auth servers)
+                const currentTools = inputs[constants_2.QuestionNames.MCPForDAAvailableTools];
+                if ((!currentTools || currentTools.length === 0) && mcpServerUrl) {
+                    try {
+                        const { fetchMCPTools } = await Promise.resolve().then(() => tslib_1.__importStar(require("../component/utils/mcpToolFetcher")));
+                        const result = await fetchMCPTools(mcpServerUrl);
+                        if (!result.requiresAuth && result.tools.length > 0) {
+                            inputs[constants_2.QuestionNames.MCPForDAAvailableTools] = result.tools;
+                            if (!inputs[constants_2.QuestionNames.MCPForDAPreFetchTools]) {
+                                inputs[constants_2.QuestionNames.MCPForDAPreFetchTools] = result.tools.map((t) => t.name);
+                            }
+                        }
+                        else if (result.requiresAuth) {
+                            // Store auth metadata for later use
+                            inputs[constants_2.QuestionNames.MCPForDAAuth] = "OAuthPluginVault";
+                            if (result.authMetadataUrl) {
+                                inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl] = result.authMetadataUrl;
+                            }
+                            mcpWarnings.push({
+                                type: "mcpAuthRequired",
+                                content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.authRequired", mcpServerUrl, mcpAddActionHint),
+                            });
+                        }
+                        else {
+                            mcpWarnings.push({
+                                type: "mcpNoToolsFetched",
+                                content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.noToolsFetched", mcpServerUrl, mcpAddActionHint),
+                            });
                         }
                     }
-                    catch (error) {
+                    catch {
                         mcpWarnings.push({
-                            type: "mcpAuthMetadataError",
-                            content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthMetadataMissingError", error.message),
+                            type: "mcpFetchError",
+                            content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.fetchError", mcpServerUrl, mcpAddActionHint),
                         });
                     }
                 }
-            }
-            await fs_extra_1.default.ensureFile(destinationPluginManifestPath);
-            await fs_extra_1.default.writeJSON(destinationPluginManifestPath, pluginManifest, { spaces: 4 });
-            const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_1.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
-            if (addActionRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addActionRes.error);
-            }
-            // Surface warnings for CLI
-            if (mcpWarnings.length > 0) {
-                for (const warning of mcpWarnings) {
-                    context.logProvider.warning(warning.content);
+                // If no tools available (auth required or fetch failed), skip creating plugin - just warn
+                const mcpTools = inputs[constants_2.QuestionNames.MCPForDAAvailableTools];
+                const mcpToolsSelected = inputs[constants_2.QuestionNames.MCPForDAPreFetchTools] || [];
+                if (!mcpTools || mcpTools.length === 0 || mcpToolsSelected.length === 0) {
+                    if (mcpWarnings.length > 0) {
+                        for (const warning of mcpWarnings) {
+                            context.logProvider.warning(warning.content);
+                        }
+                    }
+                    return (0, teamsfx_api_1.ok)(undefined);
+                }
+                destinationPluginManifestPath =
+                    await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
+                const pluginManifest = {
+                    $schema: "https://developer.microsoft.com/json-schemas/copilot/plugin/v2.4/schema.json",
+                    schema_version: "v2.4",
+                    name_for_human: "MCP Action",
+                    description_for_human: "Action powered by MCP server",
+                    contact_email: "publisher-email@example.com",
+                    namespace: "mcpAction",
+                    functions: [],
+                    runtimes: [],
+                };
+                if (mcpTools && mcpTools.length > 0 && mcpToolsSelected.length > 0) {
+                    const selectedTools = mcpTools.filter((tool) => mcpToolsSelected.includes(tool.name));
+                    pluginManifest.functions = selectedTools.map((tool) => ({
+                        name: tool.name,
+                        description: tool.description || "",
+                    }));
+                    // Write mcp-tools file with full tool definitions (no field filtering)
+                    const mcpToolsFile = `mcp-tools-${suffix}.json`;
+                    const mcpToolsOutputPath = path.join(appPackageFolder, mcpToolsFile);
+                    await fs_extra_1.default.writeJSON(mcpToolsOutputPath, { tools: selectedTools }, { spaces: 4 });
+                    pluginManifest.runtimes = [
+                        {
+                            type: "RemoteMCPServer",
+                            spec: {
+                                url: mcpServerUrl,
+                                mcp_tool_description: {
+                                    file: mcpToolsFile,
+                                },
+                            },
+                            run_for_functions: pluginManifest.functions.map((f) => f.name),
+                        },
+                    ];
+                    // Auth handling
+                    const mcpAuth = inputs[constants_2.QuestionNames.MCPForDAAuth];
+                    if (mcpAuth === "OAuthPluginVault") {
+                        const authType = inputs[constants_2.QuestionNames.MCPForDAAuthType];
+                        if (!authType) {
+                            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(teamsfx_api_1.Stage.addPlugin, "MissingMCPAuthType", (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.missingAuthType"), (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.missingAuthType")));
+                        }
+                        const registrationId = `MCP_DA_AUTH_ID_${actionId.toUpperCase()}`;
+                        const manifestOAuth = (0, mcpAuthScaffolder_1.deriveMCPManifestOAuth)(authType, registrationId);
+                        if (manifestOAuth) {
+                            pluginManifest.runtimes[0].auth = manifestOAuth;
+                        }
+                        // Resolve OAuth metadata and inject oauth/register into m365agents.yml
+                        try {
+                            const endpoints = await (0, mcpAuthScaffolder_1.resolveMCPAuthEndpoints)(authType, inputs);
+                            const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath);
+                            if (ymlPath) {
+                                await (0, mcpAuthScaffolder_1.injectMCPAuthActionToYml)({
+                                    ymlPath,
+                                    authType,
+                                    authName: actionId,
+                                    registrationId,
+                                    mcpServerUrl,
+                                    endpoints,
+                                });
+                            }
+                        }
+                        catch (error) {
+                            mcpWarnings.push({
+                                type: "mcpAuthMetadataError",
+                                content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthMetadataMissingError", error.message),
+                            });
+                        }
+                    }
+                }
+                await fs_extra_1.default.ensureFile(destinationPluginManifestPath);
+                await fs_extra_1.default.writeJSON(destinationPluginManifestPath, pluginManifest, { spaces: 4 });
+                const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_1.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
+                if (addActionRes.isErr()) {
+                    return (0, teamsfx_api_1.err)(addActionRes.error);
+                }
+                // Surface warnings for CLI
+                if (mcpWarnings.length > 0) {
+                    for (const warning of mcpWarnings) {
+                        context.logProvider.warning(warning.content);
+                    }
                 }
             }
         }
         else {
-            const addPluginRes = await (0, helper_1.addExistingPlugin)(declarativeCopilotManifestPath, inputs[constants_2.QuestionNames.PluginManifestFilePath].trim(), inputs[constants_2.QuestionNames.PluginOpenApiSpecFilePath].trim(), actionId, context, teamsfx_api_1.Stage.addPlugin);
+            const addPluginRes = await exports.fxCoreDeclarativeAgentDeps.addExistingPlugin(declarativeCopilotManifestPath, inputs[constants_2.QuestionNames.PluginManifestFilePath].trim(), inputs[constants_2.QuestionNames.PluginOpenApiSpecFilePath].trim(), actionId, context, teamsfx_api_1.Stage.addPlugin);
             if (addPluginRes.isErr()) {
                 return (0, teamsfx_api_1.err)(addPluginRes.error);
             }
@@ -541,7 +659,7 @@ class FxCoreDeclarativeAgentPart {
         }
         // Derive a server entry name from the URL host using the same logic as the
         // "DA with MCP" scaffolding template variable `ServerName`.
-        const serverName = (0, helper_1.deriveMCPServerNameFromUrl)(mcpServerUrl);
+        const serverName = exports.fxCoreDeclarativeAgentDeps.deriveMCPServerNameFromUrl(mcpServerUrl);
         const mcpConfigDir = path.join(projectPath, ".vscode");
         const mcpConfigPath = path.join(mcpConfigDir, "mcp.json");
         let mcpConfig = { servers: {} };