@microsoft/teamsfx-core 3.0.14 → 3.0.15-alpha.006f520fff.0

package/build/v4/inspection/scaffoldCatalog.js

@@ -0,0 +1,66 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inspectScaffoldCatalog = inspectScaffoldCatalog;
+const neverthrow_1 = require("neverthrow");
+const resolveBuildTarget_1 = require("../buildTarget/resolveBuildTarget");
+const createSelector_1 = require("../distribution/createSelector");
+const declarativePackage_1 = require("../distribution/declarativePackage");
+function compareTemplateIds(left, right) {
+    return left < right ? -1 : left > right ? 1 : 0;
+}
+/** Inspect one metadata source without executing any declared scaffold behavior. */
+function inspectScaffoldCatalog(source, kind) {
+    const loaded = source.load();
+    if (loaded.isErr()) {
+        return (0, neverthrow_1.err)(loaded.error);
+    }
+    const selector = (0, createSelector_1.openSelector)(loaded.value, kind);
+    if (selector.isErr()) {
+        return (0, neverthrow_1.err)(selector.error);
+    }
+    const presentation = (0, createSelector_1.openSelectorPresentation)(loaded.value, kind);
+    if (presentation.isErr()) {
+        return (0, neverthrow_1.err)(presentation.error);
+    }
+    const routesByTemplate = new Map();
+    const externalRoutes = [];
+    for (const route of selector.value.routes) {
+        const routeShape = (0, resolveBuildTarget_1.validateSelectorRouteShape)(route);
+        if (routeShape.isErr()) {
+            return (0, neverthrow_1.err)(routeShape.error);
+        }
+        if (route.engine !== "v4") {
+            externalRoutes.push(route);
+            continue;
+        }
+        if (route.templateId !== undefined) {
+            const routes = routesByTemplate.get(route.templateId) ?? [];
+            routes.push(route);
+            routesByTemplate.set(route.templateId, routes);
+        }
+    }
+    const templates = [];
+    const templateIds = [...routesByTemplate.keys()].sort(compareTemplateIds);
+    for (const templateId of templateIds) {
+        const metadata = (0, declarativePackage_1.openDeclarativePackageMetadata)(loaded.value, { kind, templateId });
+        if (metadata.isErr()) {
+            return (0, neverthrow_1.err)(metadata.error);
+        }
+        templates.push({
+            templateId,
+            routes: routesByTemplate.get(templateId) ?? [],
+            descriptor: metadata.value.descriptor,
+            questions: metadata.value.questions,
+            pipeline: metadata.value.pipeline,
+        });
+    }
+    return (0, neverthrow_1.ok)({
+        kind,
+        questions: presentation.value.questions,
+        templates,
+        externalRoutes,
+    });
+}
+//# sourceMappingURL=scaffoldCatalog.js.map

package/build/v4/inspection/scaffoldCatalog.js.map

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

package/build/v4/inspection/scaffoldMetadataSource.d.ts

@@ -0,0 +1,6 @@
+import { ScaffoldMetadataSource } from "./scaffoldCatalog";
+/** Adapt immutable staged metadata archive bytes to the catalog source port. */
+export declare function metadataArchiveSource(bytes: Buffer): ScaffoldMetadataSource;
+/** Adapt the authored `templates/v4` directory to a metadata-only in-memory archive. */
+export declare function authoredDirectoryMetadataSource(root: string): ScaffoldMetadataSource;
+//# sourceMappingURL=scaffoldMetadataSource.d.ts.map

package/build/v4/inspection/scaffoldMetadataSource.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaffoldMetadataSource.d.ts","sourceRoot":"","sources":["../../../src/v4/inspection/scaffoldMetadataSource.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AA+C3D,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,sBAAsB,CAE3E;AAED,wFAAwF;AACxF,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAiBpF"}

package/build/v4/inspection/scaffoldMetadataSource.js

@@ -0,0 +1,78 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.metadataArchiveSource = metadataArchiveSource;
+exports.authoredDirectoryMetadataSource = authoredDirectoryMetadataSource;
+const tslib_1 = require("tslib");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
+const fs = tslib_1.__importStar(require("fs-extra"));
+const neverthrow_1 = require("neverthrow");
+const path = tslib_1.__importStar(require("path"));
+const localizeUtils_1 = require("../../common/localizeUtils");
+const SOURCE = "Scaffold";
+const PACKAGE_METADATA_FILES = new Set(["descriptor.json", "questions.json", "pipeline.json"]);
+function metadataSourceError(error) {
+    const options = {
+        source: SOURCE,
+        name: "ScaffoldMetadataSourceReadFailed",
+        message: (0, localizeUtils_1.getLocalizedString)("core.v4.scaffoldMetadataSourceReadFailed"),
+    };
+    return error instanceof Error ? new teamsfx_api_1.SystemError({ ...options, error }) : new teamsfx_api_1.SystemError(options);
+}
+function isMetadataFile(relativePath) {
+    const segments = relativePath.split("/");
+    if (segments.length === 3 && segments[0] === "_shared" && segments[1] === "questions") {
+        return segments[2].endsWith(".json");
+    }
+    if (segments[0] !== "create" && segments[0] !== "modify") {
+        return false;
+    }
+    if (segments.length === 2 && segments[1] === "selector.json") {
+        return true;
+    }
+    return segments.length > 2 && PACKAGE_METADATA_FILES.has(segments[segments.length - 1]);
+}
+function collectMetadataFiles(directory, relativeDirectory, files) {
+    const entries = fs
+        .readdirSync(directory, { withFileTypes: true })
+        .sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
+    for (const entry of entries) {
+        const relativePath = path.posix.join(relativeDirectory, entry.name);
+        if (entry.isDirectory()) {
+            if (entry.name !== "content" &&
+                !(relativeDirectory.length === 0 && entry.name === "schema")) {
+                collectMetadataFiles(path.join(directory, entry.name), relativePath, files);
+            }
+        }
+        else if (entry.isFile() && isMetadataFile(relativePath)) {
+            files.push(relativePath);
+        }
+    }
+}
+/** Adapt immutable staged metadata archive bytes to the catalog source port. */
+function metadataArchiveSource(bytes) {
+    return { load: () => (0, neverthrow_1.ok)(bytes) };
+}
+/** Adapt the authored `templates/v4` directory to a metadata-only in-memory archive. */
+function authoredDirectoryMetadataSource(root) {
+    return {
+        load: () => {
+            try {
+                const resolvedRoot = path.resolve(root);
+                const files = [];
+                collectMetadataFiles(resolvedRoot, "", files);
+                const zip = new adm_zip_1.default();
+                for (const file of files) {
+                    zip.addFile(`v4/${file}`, fs.readFileSync(path.join(resolvedRoot, file)));
+                }
+                return (0, neverthrow_1.ok)(zip.toBuffer());
+            }
+            catch (error) {
+                return (0, neverthrow_1.err)(metadataSourceError(error));
+            }
+        },
+    };
+}
+//# sourceMappingURL=scaffoldMetadataSource.js.map

package/build/v4/inspection/scaffoldMetadataSource.js.map

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

package/build/v4/mcp/mcpAuthAction.d.ts

@@ -0,0 +1,28 @@
+import { FxError } from "@microsoft/teamsfx-api";
+import { Result } from "neverthrow";
+export declare const MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_WELL_KNOWN_AUTHORIZATION_SERVER_URL>";
+export interface ResolvedMCPAuthEndpoints {
+    authorizationUrl?: string;
+    tokenUrl?: string;
+    refreshUrl?: string;
+    wellKnownUrl?: string;
+}
+export interface MCPAuthActionArgs {
+    authType: string;
+    authName: string;
+    registrationId: string;
+    mcpServerUrl: string;
+    endpoints: ResolvedMCPAuthEndpoints;
+    credentialEnvNames?: {
+        clientId: string;
+        clientSecret?: string;
+        scope?: string;
+    };
+}
+export interface MCPAuthActionResult {
+    yaml: string;
+    wellKnownUrlPlaceholderUsed: boolean;
+}
+/** Add an MCP auth provision action while preserving the surrounding YAML document. */
+export declare function injectMcpAuthActionYaml(yaml: string, args: MCPAuthActionArgs): Result<MCPAuthActionResult, FxError>;
+//# sourceMappingURL=mcpAuthAction.d.ts.map

package/build/v4/mcp/mcpAuthAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpAuthAction.d.ts","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthAction.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAO7C,eAAO,MAAM,kCAAkC,yDACS,CAAC;AAEzD,MAAM,WAAW,wBAAwB;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,wBAAwB,CAAC;IACpC,kBAAkB,CAAC,EAAE;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B,EAAE,OAAO,CAAC;CACtC;AAyHD,uFAAuF;AACvF,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,GACtB,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAmDtC"}

package/build/v4/mcp/mcpAuthAction.js

@@ -0,0 +1,162 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER = void 0;
+exports.injectMcpAuthActionYaml = injectMcpAuthActionYaml;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const neverthrow_1 = require("neverthrow");
+const yaml_1 = require("yaml");
+const SOURCE = "Scaffold";
+const MIN_DCR_YAML_VERSION = "v1.13";
+const SUPPORTED_AUTH_TYPES = new Set(["none", "oauth", "entra-sso", "oauth-dynamic"]);
+exports.MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_WELL_KNOWN_AUTHORIZATION_SERVER_URL>";
+function failure(message) {
+    return (0, neverthrow_1.err)(new teamsfx_api_1.SystemError({ source: SOURCE, name: "McpAuthInjectFailed", message }));
+}
+function registrationId(item) {
+    if (!(0, yaml_1.isMap)(item)) {
+        return undefined;
+    }
+    const output = item.get("writeToEnvironmentFile", true);
+    if (!(0, yaml_1.isMap)(output)) {
+        return undefined;
+    }
+    const value = output.get("configurationId");
+    return typeof value === "string" ? value : undefined;
+}
+function uses(item) {
+    if (!(0, yaml_1.isMap)(item)) {
+        return undefined;
+    }
+    const value = item.get("uses");
+    return typeof value === "string" ? value : undefined;
+}
+function teamsAppId(item) {
+    if (uses(item) !== "teamsApp/create" || !(0, yaml_1.isMap)(item)) {
+        return undefined;
+    }
+    const output = item.get("writeToEnvironmentFile", true);
+    if (!(0, yaml_1.isMap)(output)) {
+        return undefined;
+    }
+    const value = output.get("teamsAppId");
+    return typeof value === "string" ? value : undefined;
+}
+function ensureMinimumVersion(current, minimum) {
+    if (typeof current !== "string") {
+        return undefined;
+    }
+    const parse = (version) => {
+        const match = /^v?(\d+(?:\.\d+){1,2})$/.exec(version);
+        return match?.[1].split(".").map((part) => Number.parseInt(part, 10));
+    };
+    const currentParts = parse(current);
+    const minimumParts = parse(minimum);
+    if (!currentParts || !minimumParts) {
+        return undefined;
+    }
+    const width = Math.max(currentParts.length, minimumParts.length);
+    for (let index = 0; index < width; index++) {
+        const currentPart = currentParts[index] ?? 0;
+        const minimumPart = minimumParts[index] ?? 0;
+        if (currentPart > minimumPart) {
+            return undefined;
+        }
+        if (currentPart < minimumPart) {
+            return minimum;
+        }
+    }
+    return undefined;
+}
+function oauthAction(args, appIdEnvName) {
+    const endpointFields = {};
+    if (args.endpoints.authorizationUrl) {
+        endpointFields.authorizationUrl = args.endpoints.authorizationUrl;
+    }
+    if (args.endpoints.tokenUrl) {
+        endpointFields.tokenUrl = args.endpoints.tokenUrl;
+    }
+    if (args.endpoints.refreshUrl) {
+        endpointFields.refreshUrl = args.endpoints.refreshUrl;
+    }
+    return {
+        uses: "oauth/register",
+        with: {
+            name: args.authName,
+            appId: `\${{${appIdEnvName}}}`,
+            flow: "authorizationCode",
+            ...(args.authType === "oauth"
+                ? { ...endpointFields, identityProvider: "Custom" }
+                : { identityProvider: "MicrosoftEntra" }),
+            baseUrl: args.mcpServerUrl,
+            ...(args.credentialEnvNames
+                ? {
+                    clientId: `\${{${args.credentialEnvNames.clientId}}}`,
+                    ...(args.credentialEnvNames.clientSecret
+                        ? { clientSecret: `\${{${args.credentialEnvNames.clientSecret}}}` }
+                        : {}),
+                    ...(args.credentialEnvNames.scope
+                        ? { scope: `\${{${args.credentialEnvNames.scope}}}` }
+                        : {}),
+                }
+                : {}),
+        },
+        writeToEnvironmentFile: { configurationId: args.registrationId },
+    };
+}
+function dcrAction(args, appIdEnvName, wellKnownUrl) {
+    return {
+        uses: "dcr/register",
+        with: {
+            name: args.authName,
+            appId: `\${{${appIdEnvName}}}`,
+            applicableToApps: "AnyApp",
+            targetAudience: "HomeTenant",
+            wellKnownAuthorizationServer: wellKnownUrl,
+            targetUrlsShouldStartWith: [args.mcpServerUrl],
+        },
+        writeToEnvironmentFile: { configurationId: args.registrationId },
+    };
+}
+/** Add an MCP auth provision action while preserving the surrounding YAML document. */
+function injectMcpAuthActionYaml(yaml, args) {
+    if (!SUPPORTED_AUTH_TYPES.has(args.authType)) {
+        return failure(`Unsupported MCP auth type '${args.authType}'.`);
+    }
+    if (args.authType === "none") {
+        return (0, neverthrow_1.ok)({ yaml, wellKnownUrlPlaceholderUsed: false });
+    }
+    const document = (0, yaml_1.parseDocument)(yaml);
+    if (document.errors.length > 0) {
+        return failure("The rendered m365agents.yml is not valid YAML.");
+    }
+    const provision = document.get("provision", true);
+    if (!(0, yaml_1.isSeq)(provision)) {
+        return failure("The rendered m365agents.yml does not declare a provision sequence.");
+    }
+    const actionUses = args.authType === "oauth-dynamic" ? "dcr/register" : "oauth/register";
+    const alreadyRegistered = provision.items.some((item) => uses(item) === actionUses && registrationId(item) === args.registrationId);
+    if (alreadyRegistered) {
+        return (0, neverthrow_1.ok)({ yaml: document.toString(), wellKnownUrlPlaceholderUsed: false });
+    }
+    provision.items = provision.items.filter((item) => uses(item) !== undefined);
+    const teamsAppIndex = provision.items.findIndex((item) => uses(item) === "teamsApp/create");
+    const appIdEnvName = teamsAppIndex >= 0 ? teamsAppId(provision.items[teamsAppIndex]) : undefined;
+    if (!appIdEnvName) {
+        return failure("The rendered m365agents.yml does not expose a Teams app id.");
+    }
+    const placeholderUsed = args.authType === "oauth-dynamic" && !args.endpoints.wellKnownUrl;
+    const action = args.authType === "oauth-dynamic"
+        ? dcrAction(args, appIdEnvName, args.endpoints.wellKnownUrl ?? exports.MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER)
+        : oauthAction(args, appIdEnvName);
+    provision.items.splice(teamsAppIndex + 1, 0, document.createNode(action));
+    if (args.authType === "oauth-dynamic") {
+        const version = ensureMinimumVersion(document.get("version"), MIN_DCR_YAML_VERSION);
+        if (version) {
+            document.set("version", version);
+        }
+    }
+    return (0, neverthrow_1.ok)({ yaml: document.toString(), wellKnownUrlPlaceholderUsed: placeholderUsed });
+}
+//# sourceMappingURL=mcpAuthAction.js.map

package/build/v4/mcp/mcpAuthAction.js.map

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

package/build/v4/mcp/mcpAuthScaffold.d.ts

@@ -0,0 +1,37 @@
+import { FxError } from "@microsoft/teamsfx-api";
+import { Result } from "neverthrow";
+import { probeMCPServerAuth, resolveMCPOAuthMetadata } from "../../common/mcpToolFetcher";
+import { StepContext } from "../pipeline/runScaffoldPipeline";
+/** Indirection seam so unit tests can stub the network probes on a plain object. */
+export declare const mcpAuthScaffoldDeps: {
+    probeMCPServerAuth: typeof probeMCPServerAuth;
+    resolveMCPOAuthMetadata: typeof resolveMCPOAuthMetadata;
+};
+/**
+ * Inject the `oauth/register` (or `dcr/register`) provision action into the rendered
+ * `m365agents.yml` (idempotent; inserted after `teamsApp/create`, which writes the
+ * `${{TEAMS_APP_ID}}` the action references).
+ */
+export declare function injectMcpAuthAction(ctx: StepContext, args: {
+    ymlPath: string;
+    authType: string;
+    mcpServerUrl: string;
+    credentialFields?: {
+        clientId: boolean;
+        clientSecret: boolean;
+        scope: boolean;
+    };
+}): Promise<Result<void, FxError>>;
+/**
+ * Persist the deterministic registration placeholder and the static credentials collected during
+ * create. The runtime routes `SECRET_*` through its encrypted user-environment storage.
+ */
+export declare function persistMcpAuthRegistrationEnv(ctx: StepContext, args: {
+    authType: string;
+    mcpServerUrl: string;
+    oauthClientId?: string;
+    oauthClientSecret?: string;
+    oauthScopes?: string;
+    entraClientId?: string;
+}): Promise<Result<void, FxError>>;
+//# sourceMappingURL=mcpAuthScaffold.d.ts.map

package/build/v4/mcp/mcpAuthScaffold.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpAuthScaffold.d.ts","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthScaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAkB9D,oFAAoF;AACpF,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AA8DF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;CACjF,GACA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAyChC;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiBhC"}

package/build/v4/mcp/mcpAuthScaffold.js

@@ -0,0 +1,140 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mcpAuthScaffoldDeps = void 0;
+exports.injectMcpAuthAction = injectMcpAuthAction;
+exports.persistMcpAuthRegistrationEnv = persistMcpAuthRegistrationEnv;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const neverthrow_1 = require("neverthrow");
+const localizeUtils_1 = require("../../common/localizeUtils");
+const mcpAuthAction_1 = require("./mcpAuthAction");
+const mcpToolFetcher_1 = require("../../common/mcpToolFetcher");
+const whitelist_1 = require("../runtime/whitelist");
+/**
+ * v4 MCP-auth facade. The v4-owned YAML action mutator produces the create/add auth action shape
+ * for every auth type (`oauth`/`entra-sso` -> `oauth/register`, `oauth-dynamic` -> `dcr/register`
+ * with the v1.13 schema bump).
+ *
+ * Static OAuth and Entra credentials follow the v3 contract: the action references deterministic
+ * environment names and the runtime environment writer persists regular values separately from
+ * `SECRET_*` values. Dynamic registration has no static credential fields.
+ */
+const SOURCE = "Scaffold";
+/** MCP create scaffolding persists collected credentials to the default development environment. */
+const CREATE_ENVIRONMENT = "dev";
+/** Indirection seam so unit tests can stub the network probes on a plain object. */
+exports.mcpAuthScaffoldDeps = {
+    probeMCPServerAuth: mcpToolFetcher_1.probeMCPServerAuth,
+    resolveMCPOAuthMetadata: mcpToolFetcher_1.resolveMCPOAuthMetadata,
+};
+function systemError(name, message) {
+    return new teamsfx_api_1.SystemError({ source: SOURCE, name, message });
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+/** The MCP namespace, registration id, and uppercase server name derived from the server URL. */
+function mcpAuthIdentifiers(mcpServerUrl) {
+    const namespace = (0, whitelist_1.deriveMcpServerName)(mcpServerUrl);
+    const uppercaseNamespace = namespace.toUpperCase();
+    return {
+        namespace,
+        registrationId: `MCP_DA_AUTH_ID_${uppercaseNamespace}`,
+        clientId: `MCP_DA_OAUTH_CLIENT_ID_${uppercaseNamespace}`,
+        clientSecret: `SECRET_MCP_DA_OAUTH_CLIENT_SECRET_${uppercaseNamespace}`,
+        scope: `MCP_DA_OAUTH_SCOPE_${uppercaseNamespace}`,
+    };
+}
+/**
+ * Best-effort resolution of the authorization-server endpoints for `oauth` / `oauth-dynamic`,
+ * mirroring the v3 create flow: probe the server for its `resource_metadata`, then resolve the
+ * well-known OAuth metadata. Any failure yields empty endpoints — the action is still injected and
+ * the developer fills the URLs before provisioning, matching v3's best-effort behavior. `entra-sso`
+ * and `none` need no endpoints (no network).
+ */
+async function resolveEndpoints(authType, mcpServerUrl, warn) {
+    if (authType !== "oauth" && authType !== "oauth-dynamic") {
+        return {};
+    }
+    try {
+        const probe = await exports.mcpAuthScaffoldDeps.probeMCPServerAuth(mcpServerUrl);
+        const metadata = await exports.mcpAuthScaffoldDeps.resolveMCPOAuthMetadata(probe.authMetadataUrl, undefined);
+        return {
+            authorizationUrl: metadata.authorizationUrl,
+            tokenUrl: metadata.tokenUrl,
+            refreshUrl: metadata.refreshUrl,
+            wellKnownUrl: metadata.wellKnownUrl,
+        };
+    }
+    catch (error) {
+        warn?.((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthMetadataMissingError", errorMessage(error)));
+        return {};
+    }
+}
+/**
+ * Inject the `oauth/register` (or `dcr/register`) provision action into the rendered
+ * `m365agents.yml` (idempotent; inserted after `teamsApp/create`, which writes the
+ * `${{TEAMS_APP_ID}}` the action references).
+ */
+async function injectMcpAuthAction(ctx, args) {
+    const current = ctx.read(args.ymlPath);
+    if (current === undefined) {
+        return (0, neverthrow_1.err)(systemError("McpAuthYmlMissing", `Cannot inject the auth action: '${args.ymlPath}' was not produced by the render phase.`));
+    }
+    const identifiers = mcpAuthIdentifiers(args.mcpServerUrl);
+    const endpoints = await resolveEndpoints(args.authType, args.mcpServerUrl, ctx.warn);
+    const injectResult = (0, mcpAuthAction_1.injectMcpAuthActionYaml)(current.toString("utf8"), {
+        authType: args.authType,
+        authName: identifiers.namespace,
+        registrationId: identifiers.registrationId,
+        mcpServerUrl: args.mcpServerUrl,
+        endpoints,
+        ...(args.authType === "oauth" && args.credentialFields?.clientId
+            ? {
+                credentialEnvNames: {
+                    clientId: identifiers.clientId,
+                    ...(args.credentialFields.clientSecret
+                        ? { clientSecret: identifiers.clientSecret }
+                        : {}),
+                    ...(args.credentialFields.scope ? { scope: identifiers.scope } : {}),
+                },
+            }
+            : {}),
+        ...(args.authType === "entra-sso" && args.credentialFields?.clientId
+            ? { credentialEnvNames: { clientId: identifiers.clientId } }
+            : {}),
+    });
+    if (injectResult.isErr()) {
+        return (0, neverthrow_1.err)(injectResult.error);
+    }
+    if (injectResult.value.wellKnownUrlPlaceholderUsed) {
+        ctx.warn?.((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthDcrPlaceholderWarning", args.mcpServerUrl));
+    }
+    ctx.write(args.ymlPath, Buffer.from(injectResult.value.yaml, "utf8"));
+    return (0, neverthrow_1.ok)(undefined);
+}
+/**
+ * Persist the deterministic registration placeholder and the static credentials collected during
+ * create. The runtime routes `SECRET_*` through its encrypted user-environment storage.
+ */
+function persistMcpAuthRegistrationEnv(ctx, args) {
+    const identifiers = mcpAuthIdentifiers(args.mcpServerUrl);
+    const values = { [identifiers.registrationId]: "" };
+    if (args.authType === "oauth") {
+        if (args.oauthClientId !== undefined) {
+            values[identifiers.clientId] = args.oauthClientId;
+        }
+        if (args.oauthClientSecret !== undefined) {
+            values[identifiers.clientSecret] = args.oauthClientSecret;
+        }
+        if (args.oauthScopes?.trim()) {
+            values[identifiers.scope] = args.oauthScopes;
+        }
+    }
+    else if (args.authType === "entra-sso" && args.entraClientId !== undefined) {
+        values[identifiers.clientId] = args.entraClientId;
+    }
+    return ctx.writeEnvironment(CREATE_ENVIRONMENT, values);
+}
+//# sourceMappingURL=mcpAuthScaffold.js.map

package/build/v4/mcp/mcpAuthScaffold.js.map

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

package/build/v4/model/dataModel.d.ts

@@ -13,7 +13,7 @@ export interface TemplateLocator {
 /** Names which declarative package inside the channel zip to open. */
 export interface DeclarativeLocator {
     /** The package namespace: `create` or `modify`. */
-    kind: string;
+    kind: "create" | "modify";
     /** The package id within the kind, e.g. `da/mcp-server`. */
     templateId: string;
 }

package/build/v4/model/dataModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataModel.d.ts","sourceRoot":"","sources":["../../../src/v4/model/dataModel.ts"],"names":[],"mappings":"AAGA,4DAA4D;AAI5D,wEAAwE;AACxE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAIxD,yEAAyE;AACzE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjD,yEAAyE;AACzE,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAI3D,qEAAqE;AACrE,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IACjC,mDAAmD;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,uDAAuD;AACvD,MAAM,WAAW,iBAAiB;IAChC,sFAAsF;IACtF,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAC;CACd"}
+{"version":3,"file":"dataModel.d.ts","sourceRoot":"","sources":["../../../src/v4/model/dataModel.ts"],"names":[],"mappings":"AAGA,4DAA4D;AAI5D,wEAAwE;AACxE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAIxD,yEAAyE;AACzE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjD,yEAAyE;AACzE,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAI3D,qEAAqE;AACrE,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IACjC,mDAAmD;IACnD,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC1B,4DAA4D;IAC5D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,uDAAuD;AACvD,MAAM,WAAW,iBAAiB;IAChC,sFAAsF;IACtF,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAC;CACd"}