@microsoft/teamsfx-core 3.0.14 → 3.0.15-alpha.2c8841ec2d.0

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

@@ -5,15 +5,13 @@ 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 whitelist_1 = require("../whitelist");
+const mcpAuthScaffold_1 = require("../../mcp/mcpAuthScaffold");
 /** 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 });
 }
@@ -22,33 +20,7 @@ function stringParam(params, key) {
     const value = params[key];
     return typeof value === "string" ? value : undefined;
 }
-/** 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`. */
+/** Registered step for injecting the shared v4 MCP auth action into `m365agents.yml`. */
 exports.mcpAuthInjectYmlAction = {
     validateParams(resolved) {
         if (stringParam(resolved, "ymlPath") === undefined) {
@@ -65,31 +37,17 @@ exports.mcpAuthInjectYmlAction = {
     apply(resolved, ctx) {
         const ymlPath = stringParam(resolved, "ymlPath");
         const authType = stringParam(resolved, "authType");
-        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"));
-        }
-        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 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 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);
+        return (0, mcpAuthScaffold_1.injectMcpAuthAction)(ctx, { ymlPath, authType, mcpServerUrl });
     },
 };
-/** Registered step for appending the MCP credential reference to `env/.env.dev`. */
+/**
+ * Registered step for writing the deterministic `MCP_DA_AUTH_ID_<NS>` registration placeholder into
+ * `env/.env.dev`.
+ */
 exports.mcpAuthPersistCredentialEnv = {
     validateParams(resolved) {
         if (stringParam(resolved, "authType") === undefined) {
@@ -101,19 +59,11 @@ exports.mcpAuthPersistCredentialEnv = {
         return undefined;
     },
     apply(resolved, ctx) {
-        const serverUrl = stringParam(resolved, "mcpServerUrl");
-        if (serverUrl === undefined) {
+        const mcpServerUrl = stringParam(resolved, "mcpServerUrl");
+        if (mcpServerUrl === 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);
-        }
-        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);
+        return (0, mcpAuthScaffold_1.persistMcpAuthRegistrationEnv)(ctx, { mcpServerUrl });
     },
 };
 //# 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":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8D;AAC9D,2CAAyC;AAEzC,+DAA+F;AAE/F,2FAA2F;AAE3F,MAAM,MAAM,GAAG,UAAU,CAAC;AAE1B,qDAAqD;AACxC,QAAA,sBAAsB,GAAG,4BAA4B,CAAC;AAEnE,0DAA0D;AAC7C,QAAA,2BAA2B,GAAG,iCAAiC,CAAC;AAE7E,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,oFAAoF;AACpF,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,yFAAyF;AAC5E,QAAA,sBAAsB,GAAmB;IACpD,cAAc,CAAC,QAAoB;QACjC,IAAI,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;YACnD,OAAO,oCAAoC,CAAC;QAC9C,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO,qCAAqC,CAAC;QAC/C,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;YACxD,OAAO,yCAAyC,CAAC;QACnD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,QAAoB,EAAE,GAAgB;QAC1C,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC3D,IAAI,OAAO,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAClF,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAG,EAAC,WAAW,CAAC,qBAAqB,EAAE,yCAAyC,CAAC,CAAC,CACnF,CAAC;QACJ,CAAC;QACD,OAAO,IAAA,qCAAmB,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IACvE,CAAC;CACF,CAAC;AAEF;;;GAGG;AACU,QAAA,2BAA2B,GAAmB;IACzD,cAAc,CAAC,QAAoB;QACjC,IAAI,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO,qCAAqC,CAAC;QAC/C,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;YACxD,OAAO,yCAAyC,CAAC;QACnD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,QAAoB,EAAE,GAAgB;QAC1C,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC3D,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,IAAA,gBAAG,EAAC,WAAW,CAAC,sBAAsB,EAAE,yCAAyC,CAAC,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,IAAA,+CAA6B,EAAC,GAAG,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;CACF,CAAC"}

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

@@ -1,8 +1,4 @@
-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,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"}
+{"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"}

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

@@ -2,15 +2,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mcpLocalMaterializeServers = exports.STEP_MATERIALIZE_LOCAL_SERVERS = exports.mcpLocalDeps = void 0;
+exports.mcpLocalMaterializeServers = exports.STEP_MATERIALIZE_LOCAL_SERVERS = 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) {
@@ -21,13 +17,6 @@ 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];
@@ -42,13 +31,6 @@ 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)) {
@@ -74,26 +56,24 @@ exports.mcpLocalMaterializeServers = {
         if (stringArrayParam(resolved, "selected") === undefined) {
             return "missing string[] parameter 'selected'";
         }
+        if (stringParam(resolved, "catalog") === undefined) {
+            return "missing string parameter 'catalog'";
+        }
         return undefined;
     },
-    async apply(resolved, ctx) {
+    apply(resolved, ctx) {
         const target = stringParam(resolved, "target");
         const selected = stringArrayParam(resolved, "selected");
-        const catalogRaw = optionalStringParam(resolved, "catalog");
-        if (target === undefined || selected === undefined) {
+        const catalogRaw = stringParam(resolved, "catalog");
+        if (target === undefined || selected === undefined || catalogRaw === undefined) {
             return (0, neverthrow_1.err)(systemError("McpLocalParams", "resolved parameters are not all of the expected type"));
         }
         let parsed;
-        if (catalogRaw === undefined) {
-            parsed = catalogFromServers(await exports.mcpLocalDeps.listServers());
+        try {
+            parsed = JSON.parse(catalogRaw);
         }
-        else {
-            try {
-                parsed = JSON.parse(catalogRaw);
-            }
-            catch (error) {
-                return (0, neverthrow_1.err)(systemError("McpLocalCatalogParse", `local server catalog is not valid JSON: ${errorMessage(error)}`));
-            }
+        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 "../../../component/utils/mcpToolFetcher";
+import { MCPFetchResult } from "../../../common/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,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"}
+{"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"}

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("../../../component/utils/mcpToolFetcher");
+const mcpToolFetcher_1 = require("../../../common/mcpToolFetcher");
 const mcpStaticTools_1 = require("../../mcp/mcpStaticTools");
 /** Materialize static MCP tools and plugin runtime metadata. */
 const SOURCE = "Scaffold";
@@ -55,9 +55,6 @@ 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({
@@ -110,22 +107,12 @@ async function resolveToolsJson(resolved, serverUrl) {
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
-function readRequiredJson(ctx, pluginPath) {
+function readRequiredPlugin(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.`));
     }
-    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);
+    return (0, neverthrow_1.ok)(current);
 }
 function fileName(filePath) {
     const segments = filePath.split("/").filter((segment) => segment.length > 0);
@@ -172,27 +159,22 @@ exports.mcpStaticMaterializeTools = {
         if (!selectedTools.ok) {
             return (0, neverthrow_1.err)(systemError(selectedTools.code, selectedTools.message));
         }
-        const plugin = readRequiredJson(ctx, pluginPath);
+        const plugin = readRequiredPlugin(ctx, pluginPath);
         if (plugin.isErr()) {
             return (0, neverthrow_1.err)(plugin.error);
         }
-        plugin.value.functions = selectedTools.tools.map((tool) => ({
+        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) => ({
             name: tool.name,
             description: tool.description,
-        }));
-        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"));
+        })), mcpServerUrl, fileName(toolsPath));
+        ctx.write(pluginPath, Buffer.from(pluginManifest.toJSON(), "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);
     },

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"metaOs.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/metaOs.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,kDAAkD;AAClD,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAC/D,0DAA0D;AAC1D,eAAO,MAAM,6BAA6B,oCAAoC,CAAC;AAwe/E,oEAAoE;AACpE,eAAO,MAAM,oBAAoB,EAAE,cAmBlC,CAAC;AAEF,uFAAuF;AACvF,eAAO,MAAM,4BAA4B,EAAE,cA2B1C,CAAC"}
+{"version":3,"file":"metaOs.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/metaOs.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,kDAAkD;AAClD,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAC/D,0DAA0D;AAC1D,eAAO,MAAM,6BAA6B,oCAAoC,CAAC;AAsc/E,oEAAoE;AACpE,eAAO,MAAM,oBAAoB,EAAE,cAmBlC,CAAC;AAEF,uFAAuF;AACvF,eAAO,MAAM,4BAA4B,EAAE,cA2B1C,CAAC"}

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

@@ -43,9 +43,6 @@ function stringParam(params, key) {
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isRecordArray(value) {
-    return Array.isArray(value) && value.every(isRecord);
-}
 function nestedRecord(record, key) {
     const value = record[key];
     return isRecord(value) ? value : undefined;
@@ -99,13 +96,20 @@ function readRequiredJsonObject(ctx, filePath, missingErrorName, invalidErrorNam
     return parseJsonObject(raw.value, invalidErrorName, filePath);
 }
 function unifyProjectId(ctx, manifestPath, envPath) {
-    const manifest = readRequiredJsonObject(ctx, manifestPath, "MetaOsManifestMissing", "MetaOsManifestInvalid");
-    if (manifest.isErr()) {
-        return (0, neverthrow_1.err)(manifest.error);
+    const manifestContents = readRequired(ctx, manifestPath, "MetaOsManifestMissing");
+    if (manifestContents.isErr()) {
+        return (0, neverthrow_1.err)(manifestContents.error);
+    }
+    let manifest;
+    try {
+        manifest = teamsfx_api_1.TeamsManifestWrapper.fromJSON(manifestContents.value.toString("utf8"));
+    }
+    catch {
+        return (0, neverthrow_1.err)(systemError("MetaOsManifestInvalid", `'${manifestPath}' is not valid JSON.`));
     }
     const appId = (0, crypto_1.randomUUID)();
-    manifest.value.id = appId;
-    writeJson(ctx, manifestPath, manifest.value);
+    manifest.setId(appId);
+    ctx.write(manifestPath, Buffer.from(manifest.toJSON(), "utf8"));
     const envRaw = ctx.read(envPath);
     const envText = envRaw === undefined ? "" : envRaw.toString("utf8");
     ctx.write(envPath, Buffer.from(withTeamsAppId(envText, appId), "utf8"));
@@ -156,54 +160,38 @@ function uniqueFileName(ctx, baseName, extension) {
         suffix++;
     }
 }
-function uniqueActionName(actions, key, baseName) {
-    let suffix = 0;
-    while (true) {
-        const candidate = suffix === 0 ? baseName : `${baseName}${suffix}`;
-        const exists = actions.some((action) => action[key] === candidate);
-        if (!exists) {
-            return candidate;
-        }
-        suffix++;
-    }
-}
 function updateManifestForDa(ctx, daFilename) {
-    const manifest = readRequiredJsonObject(ctx, MANIFEST_PATH, "MetaOsManifestMissing", "MetaOsManifestInvalid");
-    if (manifest.isErr()) {
-        return (0, neverthrow_1.err)(manifest.error);
+    const manifestContents = readRequired(ctx, MANIFEST_PATH, "MetaOsManifestMissing");
+    if (manifestContents.isErr()) {
+        return (0, neverthrow_1.err)(manifestContents.error);
     }
-    manifest.value.id = DEFAULT_MANIFEST_ID;
-    manifest.value.copilotAgents = {
-        declarativeAgents: [{ id: DEFAULT_DA_ID, file: daFilename }],
-    };
-    const extensions = manifest.value.extensions;
-    if (!isRecordArray(extensions)) {
+    let manifest;
+    try {
+        manifest = teamsfx_api_1.TeamsManifestWrapper.fromJSON(manifestContents.value.toString("utf8"));
+    }
+    catch {
+        return (0, neverthrow_1.err)(systemError("MetaOsManifestInvalid", `'${MANIFEST_PATH}' is not valid JSON.`));
+    }
+    manifest
+        .setId(DEFAULT_MANIFEST_ID)
+        .removeDeclarativeAgent(DEFAULT_DA_ID)
+        .addDeclarativeAgent(DEFAULT_DA_ID, daFilename);
+    if (!manifest.hasExtensions()) {
         return (0, neverthrow_1.err)(systemError("MetaOsManifestShape", "No runtimes found in manifest.extensions."));
     }
-    for (const extension of extensions) {
-        const runtimes = extension.runtimes;
-        if (!isRecordArray(runtimes)) {
-            continue;
-        }
-        for (const runtime of runtimes) {
-            const script = nestedRecord(runtime, "code")?.script;
-            if (typeof script !== "string" || !script.includes(DEFAULT_COMMAND_FILE_NAME)) {
-                continue;
-            }
-            const existingActions = runtime.actions;
-            const actions = isRecordArray(existingActions) ? existingActions : [];
-            const commandNames = {
-                word: uniqueActionName(actions, "id", "addfooter"),
-                excel: uniqueActionName(actions, "id", "fillcolor"),
-                powerpoint: uniqueActionName(actions, "id", "addtexttoslide"),
-            };
-            actions.push({ id: commandNames.word, type: "executeDataFunction" }, { id: commandNames.excel, type: "executeDataFunction" }, { id: commandNames.powerpoint, type: "executeDataFunction" });
-            runtime.actions = actions;
-            writeJson(ctx, MANIFEST_PATH, manifest.value);
-            return (0, neverthrow_1.ok)(commandNames);
-        }
+    const commandIds = manifest.addExtensionRuntimeActions(DEFAULT_COMMAND_FILE_NAME, [
+        { baseId: "addfooter", type: "executeDataFunction" },
+        { baseId: "fillcolor", type: "executeDataFunction" },
+        { baseId: "addtexttoslide", type: "executeDataFunction" },
+    ]);
+    if (commandIds === undefined ||
+        commandIds[0] === undefined ||
+        commandIds[1] === undefined ||
+        commandIds[2] === undefined) {
+        return (0, neverthrow_1.err)(systemError("MetaOsCommandsRuntimeMissing", "No command runtime found in manifest.extensions."));
     }
-    return (0, neverthrow_1.err)(systemError("MetaOsCommandsRuntimeMissing", "No command runtime found in manifest.extensions."));
+    ctx.write(MANIFEST_PATH, Buffer.from(manifest.toJSON(), "utf8"));
+    return (0, neverthrow_1.ok)({ word: commandIds[0], excel: commandIds[1], powerpoint: commandIds[2] });
 }
 function daManifest(appName, actionFilename) {
     return {

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"officeAddin.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/officeAddin.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAM7F,eAAO,MAAM,yCAAyC,wCAAwC,CAAC;AAkK/F,eAAO,MAAM,gCAAgC,EAAE,cAoB9C,CAAC"}
+{"version":3,"file":"officeAddin.d.ts","sourceRoot":"","sources":["../../../../src/v4/runtime/steps/officeAddin.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAA2B,MAAM,oCAAoC,CAAC;AAO7F,eAAO,MAAM,yCAAyC,wCAAwC,CAAC;AAqK/F,eAAO,MAAM,gCAAgC,EAAE,cAoB9C,CAAC"}

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

@@ -7,9 +7,9 @@ const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const officeAddinProject = tslib_1.__importStar(require("office-addin-project"));
-const os = tslib_1.__importStar(require("os"));
 const path = tslib_1.__importStar(require("path"));
 const neverthrow_1 = require("neverthrow");
+const withTempDirectory_1 = require("../withTempDirectory");
 /** Office Add-in post-render import steps. */
 const SOURCE = "Scaffold";
 exports.STEP_IMPORT_EXISTING_OFFICE_ADDIN_PROJECT = "officeaddin/import-existing-project";
@@ -133,22 +133,17 @@ async function importExistingOfficeAddinProject(ctx, sourceFolder, manifestPath)
     }
     const sourceRoot = path.resolve(sourceFolder);
     const manifestRelativePath = path.relative(sourceRoot, containedManifest.value);
-    const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), "m365atk-office-addin-"));
-    try {
+    return (0, withTempDirectory_1.withTempDirectory)("m365atk-office-addin-", (phase) => phase === "operate"
+        ? userError(
+        // eslint-disable-next-line no-secrets/no-secrets
+        "OfficeAddinSourceProjectInvalid", "The Office Add-in project folder could not be imported.")
+        : systemError("OfficeAddinTempDirectoryFailed", `The Office Add-in temporary directory could not complete ${phase}.`), async (tempRoot) => {
         await copySourceFiles(sourceRoot, tempRoot);
         await convertXmlManifestIfNeeded(path.join(tempRoot, manifestRelativePath), tempRoot);
         await overlayRenderedConfig(ctx, tempRoot);
         await writeTempTreeToContext(tempRoot, ctx);
         return (0, neverthrow_1.ok)(undefined);
-    }
-    catch {
-        return (0, neverthrow_1.err)(userError(
-        // eslint-disable-next-line no-secrets/no-secrets
-        "OfficeAddinSourceProjectInvalid", "The Office Add-in project folder could not be imported."));
-    }
-    finally {
-        await fs.remove(tempRoot);
-    }
+    });
 }
 exports.officeAddinImportExistingProject = {
     validateParams(resolved) {