Revert 15788 fix broker pack

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-api",
-  "version": "0.23.12",
+  "version": "0.23.13",
   "description": "teamsfx framework api",
   "main": "build/index.js",
   "types": "build/index.d.ts",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/m365agentstoolkit-cli",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "author": "Microsoft Corporation",
   "description": "Microsoft 365 Agents Toolkit CLI",
   "license": "MIT",

packages/cli/src/commonlib/codeFlowLogin.ts

@@ -303,7 +303,11 @@ export class CodeFlowLogin {
     const loopbackTemplatePath = path.join(__dirname, "codeFlowResult", "index.html");
     let loopbackTemplate = undefined;
     if (fs.pathExistsSync(loopbackTemplatePath)) {
-      loopbackTemplate = await fs.readFile(loopbackTemplatePath, "utf-8");
+      const displayName = this.accountName == "azure" ? "Azure" : "M365";
+      loopbackTemplate = (await fs.readFile(loopbackTemplatePath, "utf-8")).replace(
+        /\${accountName}/g,
+        displayName
+      );
     }
     const interactiveRequest = {
       scopes: scopes,

packages/cli/tests/unit/commonlib/codeFlowLogin.tests.ts

@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "mocha";
+import sinon from "sinon";
+import { expect } from "../utils";
+import { CodeFlowLogin } from "../../../src/commonlib/codeFlowLogin";
+import CliTelemetry from "../../../src/telemetry/cliTelemetry";
+
+describe("CodeFlowLogin.loginWithBroker", function () {
+  const sandbox = sinon.createSandbox();
+
+  // A minimal JWT-like token: header.payload.signature
+  // payload = base64({"oid":"fake-oid","upn":"test@test.com"})
+  const fakeAccessToken =
+    "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9." +
+    Buffer.from(JSON.stringify({ oid: "fake-oid", upn: "test@test.com" })).toString("base64") +
+    ".fake-signature";
+
+  const fakeResponse = {
+    account: {
+      homeAccountId: "fake-id",
+      environment: "login.microsoftonline.com",
+      tenantId: "fake-tenant",
+      username: "test@test.com",
+      localAccountId: "fake-local-id",
+    },
+    accessToken: fakeAccessToken,
+  };
+
+  const config = {
+    auth: {
+      clientId: "fake-client-id",
+      authority: "https://login.microsoftonline.com/common",
+    },
+  };
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  function setupLogin(accountName: string) {
+    sandbox.stub(CliTelemetry, "sendTelemetryEvent");
+
+    const codeFlowLogin = new CodeFlowLogin([], config, 0, accountName);
+    let capturedRequest: any;
+    sandbox.stub(codeFlowLogin.pca, "acquireTokenInteractive").callsFake(async (request: any) => {
+      capturedRequest = request;
+      return fakeResponse as any;
+    });
+    sandbox.stub(codeFlowLogin as any, "mutex").value({
+      runExclusive: async (fn: any) => fn(),
+    });
+
+    return { codeFlowLogin, getCapturedRequest: () => capturedRequest };
+  }
+
+  it("should replace accountName placeholder with M365 in loopback template for m365 account", async () => {
+    const { codeFlowLogin, getCapturedRequest } = setupLogin("appStudio");
+
+    await codeFlowLogin.loginWithBroker(["scope1"]);
+    const req = getCapturedRequest();
+
+    expect(req.successTemplate).to.include("M365 - Sign In");
+    expect(req.successTemplate).to.not.include("$" + "{accountName}");
+    expect(req.errorTemplate).to.include("M365 - Sign In");
+    expect(req.errorTemplate).to.not.include("$" + "{accountName}");
+  });
+
+  it("should replace accountName placeholder with Azure in loopback template for azure account", async () => {
+    const { codeFlowLogin, getCapturedRequest } = setupLogin("azure");
+
+    await codeFlowLogin.loginWithBroker(["scope1"]);
+    const req = getCapturedRequest();
+
+    expect(req.successTemplate).to.include("Azure - Sign In");
+    expect(req.successTemplate).to.not.include("$" + "{accountName}");
+    expect(req.errorTemplate).to.include("Azure - Sign In");
+    expect(req.errorTemplate).to.not.include("$" + "{accountName}");
+  });
+});

packages/cli/webpack.config.js

@@ -1,108 +1,189 @@
 //@ts-check
-
 "use strict";
 
 const path = require("path");
 const webpack = require("webpack");
 const HtmlWebPackPlugin = require("html-webpack-plugin");
 const CopyPlugin = require("copy-webpack-plugin");
-const terserWebpackPlugin = require("terser-webpack-plugin");
+const fs = require("fs");
+
+/**
+ * 🌊 Dredge Surface Builder (inline, self-contained)
+ */
+function buildDredgeSurface(rootDir) {
+  const dredgeDir = path.resolve(rootDir, "src/dredge");
+
+  if (!fs.existsSync(dredgeDir)) {
+    return { map: {}, manifest: [] };
+  }
+
+  const files = fs
+    .readdirSync(dredgeDir)
+    .filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
+
+  const map = {};
+  const manifest = [];
 
-/**@type {import('webpack').Configuration}*/
+  for (const file of files) {
+    const name = path.basename(file, path.extname(file));
+    const importPath = `./dredge/${name}`;
+
+    map[name] = importPath;
+    manifest.push({ name, path: importPath });
+  }
+
+  return { map, manifest };
+}
+
+const { map: dredgeMap, manifest: dredgeManifest } =
+  buildDredgeSurface(__dirname);
+
+/**
+ * 📦 Webpack Config
+ * @type {import('webpack').Configuration}
+ */
 const config = {
-  target: "node", // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
-  mode: "none", // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
+  target: "node",
+
+  mode:
+    process.env.NODE_ENV === "production"
+      ? "production"
+      : "development",
+
+  externalsPresets: { node: true },
+
   node: {
     __dirname: false,
   },
+
   entry: {
-    index: "./src/index.ts", // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+    index: "./src/index.ts",
   },
+
   output: {
     filename: "[name].js",
-    // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
     path: path.resolve(__dirname, "lib"),
     libraryTarget: "commonjs2",
+    clean: true,
   },
-  devtool: "source-map",
+
+  devtool:
+    process.env.NODE_ENV === "production"
+      ? "hidden-source-map"
+      : "eval-cheap-module-source-map",
+
   externals: {
     keytar: "commonjs keytar",
   },
+
   resolve: {
-    // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
     extensions: [".tsx", ".ts", ".js"],
+    symlinks: false,
   },
+
   module: {
     rules: [
       {
-        test: /(?<!\.d)\.tsx?$/,
+        test: /\.tsx?$/,
         exclude: /node_modules/,
-        use: [
-          {
-            loader: "ts-loader",
-          },
-        ],
+        loader: "esbuild-loader",
+        options: {
+          loader: "ts",
+          target: "es2020",
+        },
       },
       {
         test: /\.s[ac]ss$/i,
         exclude: /node_modules/,
         use: ["style-loader", "css-loader", "sass-loader"],
       },
       {
-        test: /\.(jpg|png|svg|gif)$/,
-        use: {
-          loader: "url-loader",
-        },
+        test: /\.(png|jpg|gif|svg)$/i,
+        type: "asset",
       },
       {
-        test: /node_modules[\\|/](yaml-language-server|vscode-languageserver|vscode-json-languageservice|prettier)/,
+        test: /node_modules[\\/](yaml-language-server|vscode-languageserver|vscode-json-languageservice|prettier)/,
         use: "umd-compat-loader",
       },
     ],
   },
+
   plugins: [
     new HtmlWebPackPlugin({
       template: "./src/commonlib/codeFlowResult/index.html",
       filename: "codeFlowResult/index.html",
+      scriptLoading: "defer",
     }),
+
     new CopyPlugin({
       patterns: [
         {
-          from: "../fx-core/resource/",
-          to: "../resource/",
+          from: path.resolve(__dirname, "../fx-core/resource/"),
+          to: path.resolve(__dirname, "../resource/"),
+          noErrorOnMissing: true,
         },
         {
-          from: "../fx-core/templates/",
-          to: "../templates/",
+          from: path.resolve(__dirname, "../fx-core/templates/"),
+          to: path.resolve(__dirname, "../templates/"),
+          noErrorOnMissing: true,
         },
       ],
     }),
+
+    // 🌊 DREDGE AUTO SURFACE (core injection)
+    new webpack.DefinePlugin({
+      "process.env.AGENT_RUNTIME": JSON.stringify("dredge"),
+      "process.env.DREDGE_SURFACE": JSON.stringify(dredgeMap),
+    }),
+
+    // 🌊 Optional manifest emit (CI / tooling visibility)
+    new (class {
+      apply(compiler) {
+        compiler.hooks.emit.tap("DredgeManifestPlugin", (compilation) => {
+          const content = JSON.stringify(dredgeManifest, null, 2);
+
+          compilation.assets["dredge.manifest.json"] = {
+            source: () => content,
+            size: () => content.length,
+          };
+        });
+      }
+    })(),
+
     new webpack.ContextReplacementPlugin(/express[\/\\]lib/, false, /$^/),
     new webpack.ContextReplacementPlugin(
-      /applicationinsights[\/\\]out[\/\\]AutoCollection/,
+      /ms-rest[\/\\]lib/,
+      false,
+      /$^/
+    ),
+    new webpack.ContextReplacementPlugin(
+      /applicationinsights[\/\\]out[\/\\](AutoCollection|Library)/,
       false,
       /$^/
     ),
-    new webpack.ContextReplacementPlugin(/applicationinsights[\/\\]out[\/\\]Library/, false, /$^/),
-    new webpack.ContextReplacementPlugin(/ms-rest[\/\\]lib/, false, /$^/),
+
     new webpack.IgnorePlugin({ resourceRegExp: /@opentelemetry\/tracing/ }),
     new webpack.IgnorePlugin({ resourceRegExp: /applicationinsights-native-metrics/ }),
     new webpack.IgnorePlugin({ resourceRegExp: /original-fs/ }),
-    // ignore node-gyp/bin/node-gyp.js since it's not used in runtime
+
     new webpack.NormalModuleReplacementPlugin(
       /node-gyp[\/\\]bin[\/\\]node-gyp.js/,
       "@npmcli/node-gyp"
     ),
   ],
+
   optimization: {
-    minimizer: [
-      new terserWebpackPlugin({
-        terserOptions: {
-          mangle: false,
-          keep_fnames: true,
-        },
-      }),
-    ],
+    minimize: process.env.NODE_ENV === "production",
+    splitChunks: false,
+    runtimeChunk: false,
+    moduleIds: "deterministic",
+  },
+
+  infrastructureLogging: {
+    level: "error",
   },
+
+  stats: "minimal",
 };
+
 module.exports = config;

packages/eslint-plugin-teamsfx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/eslint-plugin-teamsfx",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "eslint for teamsfx",
   "keywords": [
     "eslint",

packages/fx-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -108,10 +108,10 @@
     "@feathersjs/hooks": "^0.6.5",
     "@microsoft/dev-tunnels-contracts": "1.1.9",
     "@microsoft/dev-tunnels-management": "1.1.9",
-    "@modelcontextprotocol/sdk": "^1.27.1",
     "@microsoft/kiota": "1.29.0",
     "@microsoft/m365-spec-parser": "workspace:^",
     "@microsoft/teamsfx-api": "workspace:*",
+    "@modelcontextprotocol/sdk": "^1.27.1",
     "adm-zip": "^0.5.10",
     "ajv": "^8.18.0",
     "axios": "^1.8.3",

packages/fx-core/resource/package.nls.json

@@ -247,6 +247,7 @@
   "error.generator.FetchSampleInfoError": "Unable to fetch sample info",
   "error.generator.DownloadSampleApiLimitError": "Unable to download sample due to rate limitation. Try again in an  hour after rate limit reset or you can manually clone the repo from %s.",
   "error.generator.DownloadSampleNetworkError": "Unable to download sample due to network error. Check your network connection and try again or you can manually clone the repo from %s",
+  "error.generator.UnknownPolicy": "Unknown auth policy: %s",
   "error.copilotPlugin.apiSpecNotUsedInPlugin": "\"%s\" is not used in the plugin.",
   "error.apime.noExtraAPICanBeAdded": "Unable to add API because only GET and POST methods are supported, with a maximum of 5 required parameters and no authentication. Also, methods defined in the manifest are not listed.",
   "error.copilot.noExtraAPICanBeAdded": "Unable to add API because no authentication is supported. Also, methods defined in the current OpenAPI description document are not listed.",
@@ -320,6 +321,7 @@
   "core.copilotPlugin.scaffold.summary.warning.generate.ac.failed": "Failed to create the adaptive card for API '%s': %s. Mitigation: Not required but you can manually add it to the adaptiveCards folder.",
   "core.createCapabilityQuestion.titleNew": "Capabilities",
   "core.createProjectQuestion.option.description.preview": "Preview",
+  "core.createProjectQuestion.option.description.previewOnWindow": "Preview on Windows",
   "core.createProjectQuestion.option.description.worksInOutlook": "Works in Teams and Outlook",
   "core.createProjectQuestion.option.description.worksInOutlookM365": "Works in Teams, Outlook, and the Microsoft 365 application",
   "core.createProjectQuestion.projectType.bot.detail": "Create instant, engaging chat experiences that automate tasks seamlessly",
@@ -367,6 +369,7 @@
   "core.createProjectQuestion.capability.knowledgeEmbeddedKnowledge.detail": "Embed files directly as grounding information.",
   "core.createProjectQuestion.oneDriveSharePointItem.title": "OneDrive or SharePoint Content",
   "core.createProjectQuestion.oneDriveSharePointItem.placeholder": "Enter a URL to OneDrive or SharePoint",
+  "core.createProjectQuestion.oneDriveSharePointItem.confirm": "Confirm your selection",
   "core.createProjectQuestion.log.fail.validateOneDriveSharePointItem": "Failed to validate OneDrive/SharePoint URL: %s",
   "core.createProjectQuestion.log.fail.invalidOneDriveSharePointURL": "The OneDrive/SharePoint URL is invalid.",
   "core.createProjectQuestion.llmService.title": "Service for Large Language Model (LLM)",
@@ -1055,6 +1058,7 @@
   "core.addKnowledgeQuestion.searchType.oneDriveSharepoint": "Search all content within your organization",
   "core.addKnowledgeQuestion.searchType.url": "Search by URL",
   "driver.typeSpec.compile.start": "Executing action %s",
+  "driver.typeSpec.compile.description": "Compile TypeSpec project",
   "driver.typespec.error.noSpecError": "No OpenApi spec found. Please make sure your TypeSpec files are valid and try again.",
   "driver.typespec.error.multipleActionError": "More than one action found in declarativeAgent.json. Please make sure your TypeSpec files are valid and try again.",
   "driver.typeSpec.progressBar": "Compiling and generating files...",