@microsoft/teamsfx-core 3.0.15-beta.2026072312.0 → 3.0.15

package/build/v4/runtime/scaffold.js

@@ -8,6 +8,24 @@ const buildRenderContext_1 = require("../renderContext/buildRenderContext");
 const runScaffoldPipeline_1 = require("../pipeline/runScaffoldPipeline");
 const packageParse_1 = require("./packageParse");
 const selectLanguageContent_1 = require("./selectLanguageContent");
+/** v4 scaffold composition over an injected runtime. See create-mcp-server spec. */
+const SANDBOXED_TEAM_FLAG = "TEAMSFX_SANDBOXED_TEAM";
+const sandboxFileNames = new Set([
+    "teamsapp.sandbox.yml.tpl",
+    "m365agents.sandbox.yml.tpl",
+    ".env.sandbox",
+    ".env.sandbox.user.tpl",
+]);
+function filterSandboxContent(content, runtime) {
+    if (runtime.exprPort.flags(SANDBOXED_TEAM_FLAG)) {
+        return content;
+    }
+    return content.filter((entry) => {
+        const normalizedPath = entry.path.replace(/\\/g, "/");
+        const fileName = normalizedPath.slice(normalizedPath.lastIndexOf("/") + 1);
+        return !sandboxFileNames.has(fileName);
+    });
+}
 /** Scaffold one template package against an injected runtime. */
 async function scaffold(request, runtime) {
     const replaceMap = (0, packageParse_1.parseReplaceMap)(request.descriptor);
@@ -28,7 +46,8 @@ async function scaffold(request, runtime) {
     const renderVars = { ...baseVars.value, ...request.callerFloor };
     // Select the active language subtree before render.
     const language = request.callerFloor.language || selectLanguageContent_1.COMMON_LANGUAGE;
-    const content = (0, selectLanguageContent_1.selectLanguageContent)(request.descriptor, request.content, language);
+    const selectedContent = (0, selectLanguageContent_1.selectLanguageContent)(request.descriptor, request.content, language);
+    const content = filterSandboxContent(selectedContent, runtime);
     return (0, runScaffoldPipeline_1.runScaffoldPipeline)(pipeline.value, content, renderVars, request.targetDir, runtime.port);
 }
 //# sourceMappingURL=scaffold.js.map

package/build/v4/runtime/scaffold.js.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../src/v4/runtime/scaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AA2ClC,4BAiCC;AAzED,2CAAyC;AAGzC,4EAAyE;AACzE,yEAKyC;AACzC,iDAAmF;AACnF,mEAAiF;AA4BjF,iEAAiE;AAC1D,KAAK,UAAU,QAAQ,CAC5B,OAAwB,EACxB,OAAwB;IAExB,MAAM,UAAU,GAAG,IAAA,8BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC;QACvB,OAAO,IAAA,gBAAG,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,MAAM,QAAQ,GAAG,IAAA,4BAAa,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;QACrB,OAAO,IAAA,gBAAG,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,iFAAiF;IACjF,MAAM,YAAY,GAAG,IAAA,gCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,IAAA,uCAAkB,EACjC,UAAU,CAAC,KAAK,EAChB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,QAAQ,EAChB,YAAY,CACb,CAAC;IACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;QACrB,OAAO,IAAA,gBAAG,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IACD,sFAAsF;IACtF,MAAM,UAAU,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAEjE,oDAAoD;IACpD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,IAAI,uCAAe,CAAC;IACjE,MAAM,OAAO,GAAG,IAAA,6CAAqB,EAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAErF,OAAO,IAAA,yCAAmB,EAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACnG,CAAC"}
+{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../src/v4/runtime/scaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAkElC,4BAkCC;AAjGD,2CAAyC;AAGzC,4EAAyE;AACzE,yEAKyC;AACzC,iDAAmF;AACnF,mEAAiF;AAEjF,oFAAoF;AAEpF,MAAM,mBAAmB,GAAG,wBAAwB,CAAC;AACrD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,0BAA0B;IAC1B,4BAA4B;IAC5B,cAAc;IACd,uBAAuB;CACxB,CAAC,CAAC;AA0BH,SAAS,oBAAoB,CAC3B,OAA4B,EAC5B,OAAwB;IAExB,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAChD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9B,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3E,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,iEAAiE;AAC1D,KAAK,UAAU,QAAQ,CAC5B,OAAwB,EACxB,OAAwB;IAExB,MAAM,UAAU,GAAG,IAAA,8BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC;QACvB,OAAO,IAAA,gBAAG,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,MAAM,QAAQ,GAAG,IAAA,4BAAa,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;QACrB,OAAO,IAAA,gBAAG,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,iFAAiF;IACjF,MAAM,YAAY,GAAG,IAAA,gCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,IAAA,uCAAkB,EACjC,UAAU,CAAC,KAAK,EAChB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,QAAQ,EAChB,YAAY,CACb,CAAC;IACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;QACrB,OAAO,IAAA,gBAAG,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IACD,sFAAsF;IACtF,MAAM,UAAU,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAEjE,oDAAoD;IACpD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,IAAI,uCAAe,CAAC;IACjE,MAAM,eAAe,GAAG,IAAA,6CAAqB,EAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7F,MAAM,OAAO,GAAG,oBAAoB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAA,yCAAmB,EAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACnG,CAAC"}

package/build/v4/runtime/steps/daAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daAction.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/daAction.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,6DAA6D;AAC7D,eAAO,MAAM,6BAA6B,uCAAuC,CAAC;AAWlF,gFAAgF;AAChF,eAAO,MAAM,8BAA8B,EAAE,cAqB5C,CAAC"}
+{"version":3,"file":"daAction.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/daAction.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,6DAA6D;AAC7D,eAAO,MAAM,6BAA6B,uCAAuC,CAAC;AA0HlF,gFAAgF;AAChF,eAAO,MAAM,8BAA8B,EAAE,cAgE5C,CAAC"}

package/build/v4/runtime/steps/daAction.js

@@ -3,7 +3,9 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.daActionRegisterPluginManifest = exports.STEP_REGISTER_PLUGIN_MANIFEST = void 0;
+const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const path_1 = tslib_1.__importDefault(require("path"));
 const neverthrow_1 = require("neverthrow");
 /** Declarative Agent manifest mutation steps for modify flows. */
 const SOURCE = "Scaffold";
@@ -16,6 +18,88 @@ function stringParam(params, key) {
     const value = params[key];
     return typeof value === "string" ? value : undefined;
 }
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isAction(value) {
+    return (isRecord(value) &&
+        typeof value.id === "string" &&
+        typeof value.file === "string" &&
+        Object.values(value).every((item) => typeof item === "string"));
+}
+function parseJsonObject(json, errorName, filePath) {
+    let parsed;
+    try {
+        parsed = JSON.parse(json.toString("utf8"));
+    }
+    catch {
+        return (0, neverthrow_1.err)(systemError(errorName, `'${filePath}' is not valid JSON.`));
+    }
+    if (!isRecord(parsed)) {
+        return (0, neverthrow_1.err)(systemError(errorName, `'${filePath}' must be a JSON object.`));
+    }
+    return (0, neverthrow_1.ok)(parsed);
+}
+function firstFileFromArray(value) {
+    if (!Array.isArray(value)) {
+        return undefined;
+    }
+    const first = value[0];
+    return isRecord(first) && typeof first.file === "string" ? first.file : undefined;
+}
+function nestedRecord(value, key) {
+    if (!isRecord(value)) {
+        return undefined;
+    }
+    const nested = value[key];
+    return isRecord(nested) ? nested : undefined;
+}
+function declarativeAgentFile(teamsManifest) {
+    const copilotExtensions = nestedRecord(teamsManifest, "copilotExtensions");
+    const legacy = firstFileFromArray(copilotExtensions?.declarativeCopilots);
+    if (legacy !== undefined) {
+        return legacy;
+    }
+    const copilotAgents = nestedRecord(teamsManifest, "copilotAgents");
+    const current = firstFileFromArray(copilotAgents?.declarativeAgents);
+    if (current !== undefined) {
+        return current;
+    }
+    return firstFileFromArray(teamsManifest.declarativeAgents);
+}
+function normalizeTargetPath(entryPath) {
+    return entryPath.replace(/\\/g, "/");
+}
+function resolveSiblingPath(baseFile, relativeFile) {
+    return normalizeTargetPath(path_1.default.posix.normalize(path_1.default.posix.join(path_1.default.posix.dirname(baseFile), relativeFile)));
+}
+function pluginFileRelativeToAgent(agentManifestPath, pluginManifestPath) {
+    return normalizeTargetPath(path_1.default.posix.relative(path_1.default.posix.dirname(agentManifestPath), pluginManifestPath));
+}
+function actionId(pluginManifestPath) {
+    const basename = path_1.default.posix.basename(pluginManifestPath, path_1.default.posix.extname(pluginManifestPath));
+    return basename.startsWith("ai-plugin-") ? basename.substring("ai-plugin-".length) : basename;
+}
+function upsertAction(manifest, action) {
+    const existing = manifest.actions;
+    const actions = Array.isArray(existing) ? existing.filter(isAction) : [];
+    const index = actions.findIndex((item) => item.file === action.file);
+    if (index === -1) {
+        actions.push(action);
+    }
+    else {
+        actions[index] = action;
+    }
+    manifest.actions = actions;
+    return actions;
+}
+function readRequired(ctx, filePath, errorName) {
+    const current = ctx.read(filePath);
+    if (current === undefined) {
+        return (0, neverthrow_1.err)(systemError(errorName, `Cannot read '${filePath}'.`));
+    }
+    return (0, neverthrow_1.ok)(current);
+}
 /** Registered step for adding a rendered API plugin manifest as a DA action. */
 exports.daActionRegisterPluginManifest = {
     validateParams(resolved) {
@@ -33,9 +117,33 @@ exports.daActionRegisterPluginManifest = {
         if (teamsManifestPath === undefined || pluginManifestPath === undefined) {
             return (0, neverthrow_1.err)(systemError("DaActionRegisterParams", "resolved parameters are not all strings"));
         }
-        return ctx
-            .manifestWrapper("declarativeAgent")
-            .registerDeclarativeAgentAction(teamsManifestPath, pluginManifestPath);
+        const teamsManifestRaw = readRequired(ctx, teamsManifestPath, "DaActionTeamsManifestMissing");
+        if (teamsManifestRaw.isErr()) {
+            return (0, neverthrow_1.err)(teamsManifestRaw.error);
+        }
+        const teamsManifest = parseJsonObject(teamsManifestRaw.value, "DaActionTeamsManifestInvalid", teamsManifestPath);
+        if (teamsManifest.isErr()) {
+            return (0, neverthrow_1.err)(teamsManifest.error);
+        }
+        const agentFile = declarativeAgentFile(teamsManifest.value);
+        if (agentFile === undefined) {
+            return (0, neverthrow_1.err)(systemError("DaActionManifestFileMissing", `The Teams manifest '${teamsManifestPath}' does not reference a declarative agent manifest.`));
+        }
+        const agentManifestPath = resolveSiblingPath(teamsManifestPath, agentFile);
+        const agentManifestRaw = readRequired(ctx, agentManifestPath, "DaActionManifestMissing");
+        if (agentManifestRaw.isErr()) {
+            return (0, neverthrow_1.err)(agentManifestRaw.error);
+        }
+        const agentManifest = parseJsonObject(agentManifestRaw.value, "DaActionManifestInvalid", agentManifestPath);
+        if (agentManifest.isErr()) {
+            return (0, neverthrow_1.err)(agentManifest.error);
+        }
+        upsertAction(agentManifest.value, {
+            id: actionId(pluginManifestPath),
+            file: pluginFileRelativeToAgent(agentManifestPath, pluginManifestPath),
+        });
+        ctx.write(agentManifestPath, Buffer.from(JSON.stringify(agentManifest.value, null, 2) + "\n", "utf8"));
+        return (0, neverthrow_1.ok)(undefined);
     },
 };
 //# sourceMappingURL=daAction.js.map

package/build/v4/runtime/steps/daAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"daAction.js","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/daAction.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8D;AAC9D,2CAAyC;AAGzC,kEAAkE;AAElE,MAAM,MAAM,GAAG,UAAU,CAAC;AAE1B,6DAA6D;AAChD,QAAA,6BAA6B,GAAG,oCAAoC,CAAC;AAElF,SAAS,WAAW,CAAC,IAAY,EAAE,OAAe;IAChD,OAAO,IAAI,yBAAW,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,WAAW,CAAC,MAAkB,EAAE,GAAW;IAClD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC;AAED,gFAAgF;AACnE,QAAA,8BAA8B,GAAmB;IAC5D,cAAc,CAAC,QAAoB;QACjC,IAAI,WAAW,CAAC,QAAQ,EAAE,mBAAmB,CAAC,KAAK,SAAS,EAAE,CAAC;YAC7D,OAAO,8CAA8C,CAAC;QACxD,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,EAAE,oBAAoB,CAAC,KAAK,SAAS,EAAE,CAAC;YAC9D,OAAO,+CAA+C,CAAC;QACzD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,QAAoB,EAAE,GAAgB;QAC1C,MAAM,iBAAiB,GAAG,WAAW,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;QACrE,MAAM,kBAAkB,GAAG,WAAW,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;QACvE,IAAI,iBAAiB,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACxE,OAAO,IAAA,gBAAG,EAAC,WAAW,CAAC,wBAAwB,EAAE,yCAAyC,CAAC,CAAC,CAAC;QAC/F,CAAC;QAED,OAAO,GAAG;aACP,eAAe,CAAC,kBAAkB,CAAC;aACnC,8BAA8B,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC3E,CAAC;CACF,CAAC"}
+{"version":3,"file":"daAction.js","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/daAction.ts"],"names":[],"mappings":"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"}

package/build/v4/runtime/steps/mcpAuth.d.ts

@@ -3,11 +3,8 @@ import { RegisteredStep } from "../../pipeline/runScaffoldPipeline";
 export declare const STEP_INJECT_YML_ACTION = "mcp-auth/inject-yml-action";
 /** Engine step name `mcp-auth/persist-credential-env`. */
 export declare const STEP_PERSIST_CREDENTIAL_ENV = "mcp-auth/persist-credential-env";
-/** Registered step for injecting the shared v4 MCP auth action into `m365agents.yml`. */
+/** Registered step for injecting the auth registration action into `m365agents.yml`. */
 export declare const mcpAuthInjectYmlAction: RegisteredStep;
-/**
- * Registered step for writing the deterministic `MCP_DA_AUTH_ID_<NS>` registration placeholder into
- * `env/.env.dev`.
- */
+/** Registered step for appending the MCP credential reference to `env/.env.dev`. */
 export declare const mcpAuthPersistCredentialEnv: RegisteredStep;
 //# sourceMappingURL=mcpAuth.d.ts.map

package/build/v4/runtime/steps/mcpAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcpAuth.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/mcpAuth.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAO7F,qDAAqD;AACrD,eAAO,MAAM,sBAAsB,+BAA+B,CAAC;AAEnE,0DAA0D;AAC1D,eAAO,MAAM,2BAA2B,oCAAoC,CAAC;AAY7E,yFAAyF;AACzF,eAAO,MAAM,sBAAsB,EAAE,cAqCpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,EAAE,cA4BzC,CAAC"}
+{"version":3,"file":"mcpAuth.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/mcpAuth.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAO7F,qDAAqD;AACrD,eAAO,MAAM,sBAAsB,+BAA+B,CAAC;AAEnE,0DAA0D;AAC1D,eAAO,MAAM,2BAA2B,oCAAoC,CAAC;AAgD7E,wFAAwF;AACxF,eAAO,MAAM,sBAAsB,EAAE,cA4CpC,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,2BAA2B,EAAE,cAyBzC,CAAC"}

package/build/v4/runtime/steps/mcpAuth.js

@@ -5,13 +5,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mcpAuthPersistCredentialEnv = exports.mcpAuthInjectYmlAction = exports.STEP_PERSIST_CREDENTIAL_ENV = exports.STEP_INJECT_YML_ACTION = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const neverthrow_1 = require("neverthrow");
-const mcpAuthScaffold_1 = require("../../mcp/mcpAuthScaffold");
+const whitelist_1 = require("../whitelist");
 /** MCP auth post-render steps for the create flow. See create-mcp-server scenario spec. */
 const SOURCE = "Scaffold";
 /** Engine step name `mcp-auth/inject-yml-action`. */
 exports.STEP_INJECT_YML_ACTION = "mcp-auth/inject-yml-action";
 /** Engine step name `mcp-auth/persist-credential-env`. */
 exports.STEP_PERSIST_CREDENTIAL_ENV = "mcp-auth/persist-credential-env";
+/** The create flow scaffolds the `dev` environment; this is its credential file. */
+const CREATE_ENV_FILE = "env/.env.dev";
 function systemError(name, message) {
     return new teamsfx_api_1.SystemError({ source: SOURCE, name, message });
 }
@@ -20,14 +22,39 @@ function stringParam(params, key) {
     const value = params[key];
     return typeof value === "string" ? value : undefined;
 }
-/** Registered step for injecting the shared v4 MCP auth action into `m365agents.yml`. */
+/** The credential env-var / registration id for a server URL (e.g. `MCP_DA_AUTH_ID_APIGITHUBC`). */
+function registrationId(serverUrl) {
+    return "MCP_DA_AUTH_ID_" + (0, whitelist_1.deriveMcpServerName)(serverUrl).toUpperCase();
+}
+/** The registration action a given auth type uses. */
+function authActionUses(authType) {
+    return authType === "entra-sso" ? "microsoftEntra/register" : "oauth/register";
+}
+/** Insert an action block as the first entry under the top-level `provision:` key. */
+function injectUnderProvision(yml, block) {
+    const lines = yml.split("\n");
+    const index = lines.findIndex((line) => line.trim() === "provision:");
+    if (index === -1) {
+        return yml + "\nprovision:\n" + block + "\n";
+    }
+    lines.splice(index + 1, 0, block);
+    return lines.join("\n");
+}
+function containsRegistrationAction(yml, authType, serverUrl) {
+    return (yml.includes(`- uses: ${authActionUses(authType)}`) &&
+        yml.includes(`registrationId: ${registrationId(serverUrl)}`));
+}
+/** True if the dotenv content already declares `name=…` (idempotency guard). */
+function containsEnvVar(envContent, name) {
+    return envContent.split("\n").some((line) => line.startsWith(name + "="));
+}
+/** Registered step for injecting the auth registration action into `m365agents.yml`. */
 exports.mcpAuthInjectYmlAction = {
     validateParams(resolved) {
         if (stringParam(resolved, "ymlPath") === undefined) {
             return "missing string parameter 'ymlPath'";
         }
-        const authType = stringParam(resolved, "authType");
-        if (authType === undefined) {
+        if (stringParam(resolved, "authType") === undefined) {
             return "missing string parameter 'authType'";
         }
         if (stringParam(resolved, "mcpServerUrl") === undefined) {
@@ -38,32 +65,34 @@ exports.mcpAuthInjectYmlAction = {
     apply(resolved, ctx) {
         const ymlPath = stringParam(resolved, "ymlPath");
         const authType = stringParam(resolved, "authType");
-        const mcpServerUrl = stringParam(resolved, "mcpServerUrl");
-        if (ymlPath === undefined || authType === undefined || mcpServerUrl === undefined) {
-            return Promise.resolve((0, neverthrow_1.err)(systemError("McpAuthInjectParams", "resolved parameters are not all strings")));
+        const serverUrl = stringParam(resolved, "mcpServerUrl");
+        if (ymlPath === undefined || authType === undefined || serverUrl === undefined) {
+            return (0, neverthrow_1.err)(systemError("McpAuthInjectYmlParams", "resolved parameters are not all strings"));
         }
-        return (0, mcpAuthScaffold_1.injectMcpAuthAction)(ctx, {
-            ymlPath,
-            authType,
-            mcpServerUrl,
-            credentialFields: {
-                clientId: authType === "oauth"
-                    ? Boolean(stringParam(resolved, "oauthClientId")?.trim())
-                    : Boolean(stringParam(resolved, "entraClientId")?.trim()),
-                clientSecret: Boolean(stringParam(resolved, "oauthClientSecret")?.trim()),
-                scope: Boolean(stringParam(resolved, "oauthScopes")?.trim()),
-            },
-        });
+        const current = ctx.read(ymlPath);
+        if (current === undefined) {
+            return (0, neverthrow_1.err)(systemError("McpAuthYmlMissing", `Cannot inject the auth action: '${ymlPath}' was not produced by the render phase.`));
+        }
+        const yml = current.toString("utf8");
+        if (containsRegistrationAction(yml, authType, serverUrl)) {
+            return (0, neverthrow_1.ok)(undefined);
+        }
+        const block = [
+            `  - uses: ${authActionUses(authType)}`,
+            `    with:`,
+            `      name: ${(0, whitelist_1.deriveMcpServerName)(serverUrl)}`,
+            `    writeToEnvironmentFile:`,
+            `      registrationId: ${registrationId(serverUrl)}`,
+        ].join("\n");
+        const injected = injectUnderProvision(yml, block);
+        ctx.write(ymlPath, Buffer.from(injected, "utf8"));
+        return (0, neverthrow_1.ok)(undefined);
     },
 };
-/**
- * Registered step for writing the deterministic `MCP_DA_AUTH_ID_<NS>` registration placeholder into
- * `env/.env.dev`.
- */
+/** Registered step for appending the MCP credential reference to `env/.env.dev`. */
 exports.mcpAuthPersistCredentialEnv = {
     validateParams(resolved) {
-        const authType = stringParam(resolved, "authType");
-        if (authType === undefined) {
+        if (stringParam(resolved, "authType") === undefined) {
             return "missing string parameter 'authType'";
         }
         if (stringParam(resolved, "mcpServerUrl") === undefined) {
@@ -72,19 +101,19 @@ exports.mcpAuthPersistCredentialEnv = {
         return undefined;
     },
     apply(resolved, ctx) {
-        const authType = stringParam(resolved, "authType");
-        const mcpServerUrl = stringParam(resolved, "mcpServerUrl");
-        if (authType === undefined || mcpServerUrl === undefined) {
-            return Promise.resolve((0, neverthrow_1.err)(systemError("McpAuthPersistParams", "resolved parameters are not all strings")));
+        const serverUrl = stringParam(resolved, "mcpServerUrl");
+        if (serverUrl === undefined) {
+            return (0, neverthrow_1.err)(systemError("McpAuthPersistParams", "resolved parameters are not all strings"));
+        }
+        const varName = registrationId(serverUrl);
+        const current = ctx.read(CREATE_ENV_FILE);
+        const base = current ? current.toString("utf8") : "";
+        if (containsEnvVar(base, varName)) {
+            return (0, neverthrow_1.ok)(undefined);
         }
-        return (0, mcpAuthScaffold_1.persistMcpAuthRegistrationEnv)(ctx, {
-            authType,
-            mcpServerUrl,
-            oauthClientId: stringParam(resolved, "oauthClientId"),
-            oauthClientSecret: stringParam(resolved, "oauthClientSecret"),
-            oauthScopes: stringParam(resolved, "oauthScopes"),
-            entraClientId: stringParam(resolved, "entraClientId"),
-        });
+        const separator = base.length > 0 && !base.endsWith("\n") ? "\n" : "";
+        ctx.write(CREATE_ENV_FILE, Buffer.from(base + separator + varName + "=\n", "utf8"));
+        return (0, neverthrow_1.ok)(undefined);
     },
 };
 //# sourceMappingURL=mcpAuth.js.map

package/build/v4/runtime/steps/mcpAuth.js.map

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

package/build/v4/runtime/steps/mcpLocal.d.ts

@@ -1,4 +1,8 @@
+import { type ODRServer } from "../../../component/utils/odrProvider";
 import { RegisteredStep } from "../../pipeline/runScaffoldPipeline";
+export declare const mcpLocalDeps: {
+    listServers: () => Promise<ODRServer[]>;
+};
 /** Engine step name `mcp-local/materialize-servers`. */
 export declare const STEP_MATERIALIZE_LOCAL_SERVERS = "mcp-local/materialize-servers";
 /** Registered step for writing `.vscode/mcp.json` in the local branch. */

package/build/v4/runtime/steps/mcpLocal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcpLocal.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/mcpLocal.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,wDAAwD;AACxD,eAAO,MAAM,8BAA8B,kCAAkC,CAAC;AA6D9E,0EAA0E;AAC1E,eAAO,MAAM,0BAA0B,EAAE,cA+CxC,CAAC"}
+{"version":3,"file":"mcpLocal.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/mcpLocal.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,eAAO,MAAM,YAAY;uBACN,OAAO,CAAC,SAAS,EAAE,CAAC;CACtC,CAAC;AAEF,wDAAwD;AACxD,eAAO,MAAM,8BAA8B,kCAAkC,CAAC;AA6E9E,0EAA0E;AAC1E,eAAO,MAAM,0BAA0B,EAAE,cAgDxC,CAAC"}

package/build/v4/runtime/steps/mcpLocal.js

@@ -2,11 +2,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mcpLocalMaterializeServers = exports.STEP_MATERIALIZE_LOCAL_SERVERS = void 0;
+exports.mcpLocalMaterializeServers = exports.STEP_MATERIALIZE_LOCAL_SERVERS = exports.mcpLocalDeps = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const neverthrow_1 = require("neverthrow");
+const odrProvider_1 = require("../../../component/utils/odrProvider");
 /** Materialize local MCP stdio servers. See create-mcp-server scenario spec. */
 const SOURCE = "Scaffold";
+exports.mcpLocalDeps = {
+    listServers: () => odrProvider_1.ODRProvider.listServers(),
+};
 /** Engine step name `mcp-local/materialize-servers`. */
 exports.STEP_MATERIALIZE_LOCAL_SERVERS = "mcp-local/materialize-servers";
 function systemError(name, message) {
@@ -17,6 +21,13 @@ function stringParam(params, key) {
     const value = params[key];
     return typeof value === "string" ? value : undefined;
 }
+function optionalStringParam(params, key) {
+    const value = stringParam(params, key);
+    if (value === undefined || /^\{\{[A-Za-z_][A-Za-z0-9_.]*\}\}$/.test(value)) {
+        return undefined;
+    }
+    return value;
+}
 /** Read a `with` value as the multiSelect `string[]`, or `undefined`. */
 function stringArrayParam(params, key) {
     const value = params[key];
@@ -31,6 +42,13 @@ function isRecord(value) {
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function catalogFromServers(servers) {
+    const catalog = {};
+    for (const server of servers) {
+        catalog[server.name] = { command: server.command, args: server.args };
+    }
+    return catalog;
+}
 /** Build one stdio server from its catalog record. */
 function toLocalServer(id, entry) {
     if (!isRecord(entry)) {
@@ -56,24 +74,26 @@ exports.mcpLocalMaterializeServers = {
         if (stringArrayParam(resolved, "selected") === undefined) {
             return "missing string[] parameter 'selected'";
         }
-        if (stringParam(resolved, "catalog") === undefined) {
-            return "missing string parameter 'catalog'";
-        }
         return undefined;
     },
-    apply(resolved, ctx) {
+    async apply(resolved, ctx) {
         const target = stringParam(resolved, "target");
         const selected = stringArrayParam(resolved, "selected");
-        const catalogRaw = stringParam(resolved, "catalog");
-        if (target === undefined || selected === undefined || catalogRaw === undefined) {
+        const catalogRaw = optionalStringParam(resolved, "catalog");
+        if (target === undefined || selected === undefined) {
             return (0, neverthrow_1.err)(systemError("McpLocalParams", "resolved parameters are not all of the expected type"));
         }
         let parsed;
-        try {
-            parsed = JSON.parse(catalogRaw);
+        if (catalogRaw === undefined) {
+            parsed = catalogFromServers(await exports.mcpLocalDeps.listServers());
         }
-        catch (error) {
-            return (0, neverthrow_1.err)(systemError("McpLocalCatalogParse", `local server catalog is not valid JSON: ${errorMessage(error)}`));
+        else {
+            try {
+                parsed = JSON.parse(catalogRaw);
+            }
+            catch (error) {
+                return (0, neverthrow_1.err)(systemError("McpLocalCatalogParse", `local server catalog is not valid JSON: ${errorMessage(error)}`));
+            }
         }
         if (!isRecord(parsed)) {
             return (0, neverthrow_1.err)(systemError("McpLocalCatalogShape", "local server catalog is not a JSON object"));

package/build/v4/runtime/steps/mcpLocal.js.map

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

package/build/v4/runtime/steps/mcpStatic.d.ts

@@ -1,4 +1,4 @@
-import { MCPFetchResult } from "../../../common/mcpToolFetcher";
+import { MCPFetchResult } from "../../../component/utils/mcpToolFetcher";
 import { RegisteredStep } from "../../pipeline/runScaffoldPipeline";
 export declare const mcpStaticDeps: {
     fetchTools: (serverUrl: string) => Promise<MCPFetchResult>;

package/build/v4/runtime/steps/mcpStatic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcpStatic.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/mcpStatic.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAiB,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,eAAO,MAAM,aAAa;4BACA,MAAM,KAAG,OAAO,CAAC,cAAc,CAAC;CACzD,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,iCAAiC,iCAAiC,CAAC;AA2IhF,0FAA0F;AAC1F,eAAO,MAAM,yBAAyB,EAAE,cAqFvC,CAAC"}
+{"version":3,"file":"mcpStatic.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/mcpStatic.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAiB,MAAM,yCAAyC,CAAC;AAExF,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,eAAO,MAAM,aAAa;4BACA,MAAM,KAAG,OAAO,CAAC,cAAc,CAAC;CACzD,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,iCAAiC,iCAAiC,CAAC;AAgKhF,0FAA0F;AAC1F,eAAO,MAAM,yBAAyB,EAAE,cAoFvC,CAAC"}

package/build/v4/runtime/steps/mcpStatic.js

@@ -7,7 +7,7 @@ const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const neverthrow_1 = require("neverthrow");
-const mcpToolFetcher_1 = require("../../../common/mcpToolFetcher");
+const mcpToolFetcher_1 = require("../../../component/utils/mcpToolFetcher");
 const mcpStaticTools_1 = require("../../mcp/mcpStaticTools");
 /** Materialize static MCP tools and plugin runtime metadata. */
 const SOURCE = "Scaffold";
@@ -55,6 +55,9 @@ function hasOptionalArrayParamValue(params, key) {
         value === "" ||
         (typeof value === "string" && isUnresolvedToken(value)));
 }
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function mcpToolsJsonFromFetchResult(serverUrl, result) {
     if (result.requiresAuth) {
         return (0, neverthrow_1.err)(new teamsfx_api_1.UserError({
@@ -107,12 +110,22 @@ async function resolveToolsJson(resolved, serverUrl) {
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
-function readRequiredPlugin(ctx, pluginPath) {
+function readRequiredJson(ctx, pluginPath) {
     const current = ctx.read(pluginPath);
     if (current === undefined) {
         return (0, neverthrow_1.err)(systemError("McpStaticPluginMissing", `Cannot materialize static MCP tools because '${pluginPath}' was not produced by the render phase.`));
     }
-    return (0, neverthrow_1.ok)(current);
+    let parsed;
+    try {
+        parsed = JSON.parse(current.toString("utf8"));
+    }
+    catch (error) {
+        return (0, neverthrow_1.err)(systemError("McpStaticPluginParse", `Cannot parse '${pluginPath}' as JSON: ${errorMessage(error)}`));
+    }
+    if (!isRecord(parsed)) {
+        return (0, neverthrow_1.err)(systemError("McpStaticPluginShape", `'${pluginPath}' is not a JSON object`));
+    }
+    return (0, neverthrow_1.ok)(parsed);
 }
 function fileName(filePath) {
     const segments = filePath.split("/").filter((segment) => segment.length > 0);
@@ -159,22 +172,27 @@ exports.mcpStaticMaterializeTools = {
         if (!selectedTools.ok) {
             return (0, neverthrow_1.err)(systemError(selectedTools.code, selectedTools.message));
         }
-        const plugin = readRequiredPlugin(ctx, pluginPath);
+        const plugin = readRequiredJson(ctx, pluginPath);
         if (plugin.isErr()) {
             return (0, neverthrow_1.err)(plugin.error);
         }
-        let pluginManifest;
-        try {
-            pluginManifest = teamsfx_api_1.APIPluginManifestWrapper.fromJSON(plugin.value.toString("utf8"));
-        }
-        catch (error) {
-            return (0, neverthrow_1.err)(systemError(error instanceof SyntaxError ? "McpStaticPluginParse" : "McpStaticPluginShape", `Cannot parse '${pluginPath}' as an API plugin manifest: ${errorMessage(error)}`));
-        }
-        pluginManifest.materializeRemoteMcpTools(selectedTools.tools.map((tool) => ({
+        plugin.value.functions = selectedTools.tools.map((tool) => ({
             name: tool.name,
             description: tool.description,
-        })), mcpServerUrl, fileName(toolsPath));
-        ctx.write(pluginPath, Buffer.from(pluginManifest.toJSON(), "utf8"));
+        }));
+        plugin.value.runtimes = [
+            {
+                type: "RemoteMCPServer",
+                spec: {
+                    url: mcpServerUrl,
+                    mcp_tool_description: {
+                        file: fileName(toolsPath),
+                    },
+                },
+                run_for_functions: selectedTools.tools.map((tool) => tool.name),
+            },
+        ];
+        ctx.write(pluginPath, Buffer.from(JSON.stringify(plugin.value, null, 4) + "\n", "utf8"));
         ctx.write(toolsPath, Buffer.from(JSON.stringify({ tools: selectedTools.tools.map((tool) => tool.raw) }, null, 4) + "\n", "utf8"));
         return (0, neverthrow_1.ok)(undefined);
     },