@microsoft/teamsfx-core 3.0.12 → 3.0.13-alpha.ae6279f56d.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/client/aadAppClient.d.ts +0 -6
- package/build/client/aadAppClient.d.ts.map +1 -1
- package/build/client/aadAppClient.js +2 -0
- package/build/client/aadAppClient.js.map +1 -1
- package/build/client/graphClient.d.ts +4 -0
- package/build/client/graphClient.d.ts.map +1 -1
- package/build/client/graphClient.js +88 -0
- package/build/client/graphClient.js.map +1 -1
- package/build/common/accountUtils.d.ts +3 -2
- package/build/common/accountUtils.d.ts.map +1 -1
- package/build/common/accountUtils.js +7 -2
- package/build/common/accountUtils.js.map +1 -1
- package/build/common/constants.d.ts +1 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +6 -5
- package/build/common/constants.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/wrappedAxiosClient.d.ts +9 -3
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +47 -22
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +1 -1
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +1 -1
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +7 -0
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +5 -0
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +7 -1
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +7 -0
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +16 -8
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +4 -3
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +7 -0
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/declarativeAgent/generator.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/generator.js +1 -3
- package/build/component/generator/declarativeAgent/generator.js.map +1 -1
- package/build/component/generator/declarativeAgent/helper.d.ts +28 -0
- package/build/component/generator/declarativeAgent/helper.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/helper.js +63 -0
- package/build/component/generator/declarativeAgent/helper.js.map +1 -1
- package/build/component/m365/constants.d.ts +2 -1
- package/build/component/m365/constants.d.ts.map +1 -1
- package/build/component/m365/constants.js +1 -0
- package/build/component/m365/constants.js.map +1 -1
- package/build/component/m365/launchHelper.d.ts.map +1 -1
- package/build/component/m365/launchHelper.js +7 -2
- package/build/component/m365/launchHelper.js.map +1 -1
- package/build/component/m365/packageService.d.ts +1 -0
- package/build/component/m365/packageService.d.ts.map +1 -1
- package/build/component/m365/packageService.js +24 -6
- package/build/component/m365/packageService.js.map +1 -1
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +5 -2
- package/build/component/provisionUtils.js.map +1 -1
- package/build/core/FxCore.declarativeAgent.d.ts +7 -0
- package/build/core/FxCore.declarativeAgent.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.js +95 -10
- package/build/core/FxCore.declarativeAgent.js.map +1 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +3 -0
- package/build/error/common.js.map +1 -1
- package/build/index.d.ts +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -2
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +1 -3
- package/build/question/constants.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +20 -3
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +1 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +1 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +1 -0
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js +85 -4
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +10 -0
- package/build/ui/visitor.js.map +1 -1
- package/package.json +6 -7
- package/resource/package.nls.cs.json +25 -21
- package/resource/package.nls.de.json +25 -21
- package/resource/package.nls.es.json +25 -21
- package/resource/package.nls.fr.json +25 -21
- package/resource/package.nls.it.json +25 -21
- package/resource/package.nls.ja.json +25 -21
- package/resource/package.nls.json +11 -2
- package/resource/package.nls.ko.json +25 -21
- package/resource/package.nls.pl.json +25 -21
- package/resource/package.nls.pt-BR.json +25 -21
- package/resource/package.nls.ru.json +25 -21
- package/resource/package.nls.tr.json +25 -21
- package/resource/package.nls.zh-Hans.json +25 -21
- package/resource/package.nls.zh-Hant.json +25 -21
- package/resource/templates/package.nls.cs.json +56 -56
- package/resource/templates/package.nls.de.json +56 -56
- package/resource/templates/package.nls.es.json +60 -60
- package/resource/templates/package.nls.fr.json +60 -60
- package/resource/templates/package.nls.it.json +56 -56
- package/resource/templates/package.nls.ja.json +56 -56
- package/resource/templates/package.nls.json +2 -2
- package/resource/templates/package.nls.ko.json +56 -56
- package/resource/templates/package.nls.pl.json +56 -56
- package/resource/templates/package.nls.pt-BR.json +57 -57
- package/resource/templates/package.nls.ru.json +56 -56
- package/resource/templates/package.nls.tr.json +56 -56
- package/resource/templates/package.nls.zh-Hans.json +56 -56
- package/resource/templates/package.nls.zh-Hant.json +56 -56
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/metadata.zip +0 -0
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export declare enum Hub {
|
|
2
2
|
teams = "Teams",
|
|
3
3
|
outlook = "Outlook",
|
|
4
|
-
office = "the Microsoft 365 app"
|
|
4
|
+
office = "the Microsoft 365 app",
|
|
5
|
+
copilot = "Copilot"
|
|
5
6
|
}
|
|
6
7
|
export declare const outlookCopilotAppId = "d870f6cd-4aa5-4d42-9626-ab690c041429";
|
|
7
8
|
export declare const outlookBaseUrl = "https://outlook.office.com";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":"AAGA,oBAAY,GAAG;IACb,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,MAAM,0BAA0B;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":"AAGA,oBAAY,GAAG;IACb,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,MAAM,0BAA0B;IAChC,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAC1E,eAAO,MAAM,cAAc,+BAA+B,CAAC;AAC3D,eAAO,MAAM,aAAa,2BAA2B,CAAC;AACtD,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAClE,eAAO,MAAM,YAAY,yDAAyD,CAAC"}
|
|
@@ -8,6 +8,7 @@ var Hub;
|
|
|
8
8
|
Hub["teams"] = "Teams";
|
|
9
9
|
Hub["outlook"] = "Outlook";
|
|
10
10
|
Hub["office"] = "the Microsoft 365 app";
|
|
11
|
+
Hub["copilot"] = "Copilot";
|
|
11
12
|
})(Hub || (exports.Hub = Hub = {}));
|
|
12
13
|
exports.outlookCopilotAppId = "d870f6cd-4aa5-4d42-9626-ab690c041429";
|
|
13
14
|
exports.outlookBaseUrl = "https://outlook.office.com";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,GAKX;AALD,WAAY,GAAG;IACb,sBAAe,CAAA;IACf,0BAAmB,CAAA;IACnB,uCAAgC,CAAA;IAChC,0BAAmB,CAAA;AACrB,CAAC,EALW,GAAG,mBAAH,GAAG,QAKd;AAEY,QAAA,mBAAmB,GAAG,sCAAsC,CAAC;AAC7D,QAAA,cAAc,GAAG,4BAA4B,CAAC;AAC9C,QAAA,aAAa,GAAG,wBAAwB,CAAC;AACzC,QAAA,oBAAoB,GAAG,6BAA6B,CAAC;AACrD,QAAA,YAAY,GAAG,sDAAsD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launchHelper.d.ts","sourceRoot":"","sources":["../../../src/component/m365/launchHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAElB,MAAM,EACP,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"launchHelper.d.ts","sourceRoot":"","sources":["../../../src/component/m365/launchHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAElB,MAAM,EACP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAOpD,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;gBAEnB,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;IAKhE,YAAY,CACvB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,kBAAkB,EAC9B,aAAa,UAAO,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAmEtB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAuBjE,eAAe;YAYf,eAAe;CAW9B"}
|
|
@@ -14,6 +14,7 @@ const constants_2 = require("../../question/constants");
|
|
|
14
14
|
const errors_1 = require("./errors");
|
|
15
15
|
const packageService_1 = require("./packageService");
|
|
16
16
|
const constants_3 = require("./constants");
|
|
17
|
+
const accountUtils_1 = require("../../common/accountUtils");
|
|
17
18
|
class LaunchHelper {
|
|
18
19
|
m365TokenProvider;
|
|
19
20
|
logger;
|
|
@@ -107,7 +108,9 @@ class LaunchHelper {
|
|
|
107
108
|
}
|
|
108
109
|
async getTidFromToken() {
|
|
109
110
|
try {
|
|
110
|
-
const statusRes = await this.m365TokenProvider.getStatus({
|
|
111
|
+
const statusRes = await this.m365TokenProvider.getStatus({
|
|
112
|
+
scopes: (0, accountUtils_1.isSovereignHigh)() ? constants_1.GraphScopes : (0, constants_1.AppStudioScopes)(),
|
|
113
|
+
});
|
|
111
114
|
const tokenObject = statusRes.isOk() ? statusRes.value.accountInfo : undefined;
|
|
112
115
|
return tokenObject?.tid;
|
|
113
116
|
}
|
|
@@ -117,7 +120,9 @@ class LaunchHelper {
|
|
|
117
120
|
}
|
|
118
121
|
async getUpnFromToken() {
|
|
119
122
|
try {
|
|
120
|
-
const statusRes = await this.m365TokenProvider.getStatus({
|
|
123
|
+
const statusRes = await this.m365TokenProvider.getStatus({
|
|
124
|
+
scopes: (0, accountUtils_1.isSovereignHigh)() ? constants_1.GraphScopes : (0, constants_1.AppStudioScopes)(),
|
|
125
|
+
});
|
|
121
126
|
const tokenObject = statusRes.isOk() ? statusRes.value.accountInfo : undefined;
|
|
122
127
|
return tokenObject?.upn;
|
|
123
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launchHelper.js","sourceRoot":"","sources":["../../../src/component/m365/launchHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAQgC;AAEhC,6CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"launchHelper.js","sourceRoot":"","sources":["../../../src/component/m365/launchHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ export declare class PackageService {
|
|
|
18
18
|
private readonly logger;
|
|
19
19
|
static GetSharedInstance(): PackageService;
|
|
20
20
|
constructor(endpoint: string, logger?: LogProvider);
|
|
21
|
+
private withNetworkRetry;
|
|
21
22
|
getTitleServiceUrl(token: string): Promise<string>;
|
|
22
23
|
sideLoadXmlManifest(token: string, manifestPath: string): Promise<[string, string]>;
|
|
23
24
|
sideLoading(token: string, packagePath: string, appScope?: AppScope): Promise<[string, string, string]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAIP,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
9
9
|
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
10
10
|
const form_data_1 = tslib_1.__importDefault(require("form-data"));
|
|
11
11
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
12
|
+
const https_1 = tslib_1.__importDefault(require("https"));
|
|
12
13
|
const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
13
14
|
const globalVars_1 = require("../../common/globalVars");
|
|
14
15
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
@@ -49,10 +50,27 @@ class PackageService {
|
|
|
49
50
|
constructor(endpoint, logger) {
|
|
50
51
|
this.axiosInstance = wrappedAxiosClient_1.WrappedAxiosClient.create({
|
|
51
52
|
timeout: 30000,
|
|
53
|
+
httpsAgent: new https_1.default.Agent({ keepAlive: true }),
|
|
52
54
|
});
|
|
53
55
|
this.initEndpoint = endpoint;
|
|
54
56
|
this.logger = logger;
|
|
55
57
|
}
|
|
58
|
+
async withNetworkRetry(fn, retries = 3) {
|
|
59
|
+
for (let i = 0; i < retries; i++) {
|
|
60
|
+
try {
|
|
61
|
+
return await fn();
|
|
62
|
+
}
|
|
63
|
+
catch (e) {
|
|
64
|
+
// Only retry on network/TLS errors (no HTTP response means transport-level failure)
|
|
65
|
+
if (e.response || i === retries - 1) {
|
|
66
|
+
throw e;
|
|
67
|
+
}
|
|
68
|
+
this.logger?.warning(`Request failed with ${e.code ?? e.message}, retrying (${i + 1}/${retries})...`);
|
|
69
|
+
await (0, utils_1.waitSeconds)(1);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
throw new Error("Unexpected: retry loop exited");
|
|
73
|
+
}
|
|
56
74
|
async getTitleServiceUrl(token) {
|
|
57
75
|
try {
|
|
58
76
|
try {
|
|
@@ -61,12 +79,12 @@ class PackageService {
|
|
|
61
79
|
catch (_) {
|
|
62
80
|
throw new Error("Invalid URL. Mis-configuration SIDELOADING_SERVICE_ENDPOINT.");
|
|
63
81
|
}
|
|
64
|
-
const envInfo = await this.axiosInstance.get("/config/v1/environment", {
|
|
82
|
+
const envInfo = await this.withNetworkRetry(() => this.axiosInstance.get("/config/v1/environment", {
|
|
65
83
|
baseURL: this.initEndpoint,
|
|
66
84
|
headers: {
|
|
67
85
|
Authorization: `Bearer ${token}`,
|
|
68
86
|
},
|
|
69
|
-
});
|
|
87
|
+
}));
|
|
70
88
|
this.logger?.debug(JSON.stringify(envInfo.data));
|
|
71
89
|
new URL(envInfo.data.titlesServiceUrl);
|
|
72
90
|
return envInfo.data.titlesServiceUrl;
|
|
@@ -178,14 +196,14 @@ class PackageService {
|
|
|
178
196
|
this.logger?.debug(`"Uploading package with sideLoading V2 in ${appScope} scope ..."`);
|
|
179
197
|
const uploadHeaders = content.getHeaders();
|
|
180
198
|
uploadHeaders["Authorization"] = `Bearer ${token}`;
|
|
181
|
-
const uploadResponse = await this.axiosInstance.post("/builder/v1/users/packages", content, {
|
|
199
|
+
const uploadResponse = await this.withNetworkRetry(() => this.axiosInstance.post("/builder/v1/users/packages", content, {
|
|
182
200
|
baseURL: serviceUrl,
|
|
183
201
|
headers: uploadHeaders,
|
|
184
202
|
params: {
|
|
185
203
|
scope: appScope,
|
|
186
204
|
shouldBlock: true,
|
|
187
205
|
},
|
|
188
|
-
});
|
|
206
|
+
}));
|
|
189
207
|
if (uploadResponse.status === 200 || uploadResponse.status === 201) {
|
|
190
208
|
const titleId = uploadResponse.data.titlePreview.titleId;
|
|
191
209
|
const appId = uploadResponse.data.titlePreview.appId;
|
|
@@ -237,10 +255,10 @@ class PackageService {
|
|
|
237
255
|
this.logger?.debug("Uploading package with sideLoading V1 ...");
|
|
238
256
|
const uploadHeaders = content.getHeaders();
|
|
239
257
|
uploadHeaders["Authorization"] = `Bearer ${token}`;
|
|
240
|
-
const uploadResponse = await this.axiosInstance.post("/dev/v1/users/packages", content.getBuffer(), {
|
|
258
|
+
const uploadResponse = await this.withNetworkRetry(() => this.axiosInstance.post("/dev/v1/users/packages", content.getBuffer(), {
|
|
241
259
|
baseURL: serviceUrl,
|
|
242
260
|
headers: uploadHeaders,
|
|
243
|
-
});
|
|
261
|
+
}));
|
|
244
262
|
const operationId = uploadResponse.data.operationId;
|
|
245
263
|
this.logger?.debug(`Package uploaded. OperationId: ${operationId}`);
|
|
246
264
|
this.logger?.verbose("Acquiring package ...");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAuB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAuB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErF,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,cAAM,cAAc;IAClB;;;OAGG;IACG,kBAAkB,CACtB,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAkCvC,mBAAmB,CACvB,MAAM,EAAE,qBAAqB,EAC7B,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAoCxC,eAAe,CACnB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IA2BpC,wBAAwB,CAC5B,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,aAAa,GAAG,SAAS,EACrC,YAAY,EAAE,gBAAgB,EAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA8CtC,yBAAyB,CACvB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC;CA0B9B;AASD,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
|
|
@@ -15,6 +15,7 @@ const common_1 = require("../error/common");
|
|
|
15
15
|
const m365_1 = require("../error/m365");
|
|
16
16
|
const constants_2 = require("./constants");
|
|
17
17
|
const ResourceGroupHelper_1 = require("./utils/ResourceGroupHelper");
|
|
18
|
+
const accountUtils_1 = require("../common/accountUtils");
|
|
18
19
|
class ProvisionUtils {
|
|
19
20
|
/**
|
|
20
21
|
* make sure subscription is correct before provision for V3
|
|
@@ -87,12 +88,14 @@ class ProvisionUtils {
|
|
|
87
88
|
// Just to trigger M365 login before the concurrent execution of localDebug.
|
|
88
89
|
// Because concurrent execution of localDebug may getAccessToken() concurrently, which
|
|
89
90
|
// causes 2 M365 logins before the token caching in common lib takes effect.
|
|
90
|
-
const appStudioTokenRes = await m365TokenProvider.getAccessToken({
|
|
91
|
+
const appStudioTokenRes = await m365TokenProvider.getAccessToken({
|
|
92
|
+
scopes: (0, accountUtils_1.isSovereignHigh)() ? constants_1.GraphScopes : (0, constants_1.AppStudioScopes)(),
|
|
93
|
+
});
|
|
91
94
|
if (appStudioTokenRes.isErr()) {
|
|
92
95
|
return (0, teamsfx_api_1.err)(appStudioTokenRes.error);
|
|
93
96
|
}
|
|
94
97
|
const appStudioTokenJsonRes = await m365TokenProvider.getJsonObject({
|
|
95
|
-
scopes: (0, constants_1.AppStudioScopes)(),
|
|
98
|
+
scopes: (0, accountUtils_1.isSovereignHigh)() ? constants_1.GraphScopes : (0, constants_1.AppStudioScopes)(),
|
|
96
99
|
});
|
|
97
100
|
const appStudioTokenJson = appStudioTokenJsonRes.isOk()
|
|
98
101
|
? appStudioTokenJsonRes.value
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAgE;AAChE,wDAUgC;AAChC,
|
|
1
|
+
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,12 @@ export declare class FxCoreDeclarativeAgentPart {
|
|
|
12
12
|
* Add plugin
|
|
13
13
|
*/
|
|
14
14
|
addPlugin(inputs: Inputs): Promise<Result<undefined | any, FxError>>;
|
|
15
|
+
/**
|
|
16
|
+
* Adds an MCP server entry to the project's `.vscode/mcp.json` and returns
|
|
17
|
+
* a marker so the caller (vscode-extension) can open the file and surface
|
|
18
|
+
* the same "start MCP server / Fetch Action" notification used by the
|
|
19
|
+
* "DA with MCP" scaffolding flow.
|
|
20
|
+
*/
|
|
21
|
+
private addPluginFromMCP;
|
|
15
22
|
}
|
|
16
23
|
//# sourceMappingURL=FxCore.declarativeAgent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FxCore.declarativeAgent.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.declarativeAgent.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAA2B,MAAM,6BAA6B,CAAC;AAC/F,OAAO,
|
|
1
|
+
{"version":3,"file":"FxCore.declarativeAgent.d.ts","sourceRoot":"","sources":["../../src/core/FxCore.declarativeAgent.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAA2B,MAAM,6BAA6B,CAAC;AAC/F,OAAO,EAGL,OAAO,EACP,MAAM,EAGN,MAAM,EAOP,MAAM,wBAAwB,CAAC;AAwChC,qBAAa,0BAA0B;IAO/B,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IA2PxE,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAKlE,SAAS,CAAC,sBAAsB,CAC9B,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,MAAM,GACd;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,QAAQ,CAAA;KAAE,EAAE;cAK/B,sBAAsB,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,QAAQ,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,EAC3B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,IAAI,CAAC;IAIhB;;OAEG;IAOG,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,CAAC,CAAC;IAid1E;;;;;OAKG;YACW,gBAAgB;CA+D/B"}
|
|
@@ -30,6 +30,7 @@ const mcpToolFetcher_1 = require("../component/utils/mcpToolFetcher");
|
|
|
30
30
|
const pathUtils_1 = require("../component/utils/pathUtils");
|
|
31
31
|
const common_2 = require("../error/common");
|
|
32
32
|
const constants_2 = require("../question/constants");
|
|
33
|
+
const teamsProjectTypeNode_1 = require("../question/scaffold/vsc/teamsProjectTypeNode");
|
|
33
34
|
const concurrentLocker_1 = require("./middleware/concurrentLocker");
|
|
34
35
|
const errorHandler_1 = require("./middleware/errorHandler");
|
|
35
36
|
// Non-translatable CLI command template used in warning messages
|
|
@@ -41,7 +42,31 @@ class FxCoreDeclarativeAgentPart {
|
|
|
41
42
|
if (!projectPath) {
|
|
42
43
|
throw new Error("projectPath is undefined"); // should never happen
|
|
43
44
|
}
|
|
44
|
-
|
|
45
|
+
let aiPluginFilePath = inputs[constants_2.QuestionNames.PluginManifestFilePath];
|
|
46
|
+
// If the user picked the "Create a new ai-plugin.json" option in the question,
|
|
47
|
+
// the value will be the sentinel. Generate a fresh skeleton manifest under
|
|
48
|
+
// appPackage using the file name from the follow-up text question and
|
|
49
|
+
// register it as a new action of the declarative agent before continuing
|
|
50
|
+
// with the regular update flow.
|
|
51
|
+
if (aiPluginFilePath === teamsProjectTypeNode_1.CreateNewPluginManifestSentinel) {
|
|
52
|
+
const desiredFileName = inputs[constants_2.QuestionNames.NewPluginManifestFileName] || "ai-plugin.json";
|
|
53
|
+
const teamsManifestPath = path.join(projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName);
|
|
54
|
+
const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
|
|
55
|
+
if (manifestRes.isErr()) {
|
|
56
|
+
return (0, teamsfx_api_1.err)(manifestRes.error);
|
|
57
|
+
}
|
|
58
|
+
const declarativeAgentRelativePath = manifestRes.value?.copilotAgents?.declarativeAgents?.[0]?.file;
|
|
59
|
+
if (!declarativeAgentRelativePath) {
|
|
60
|
+
return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("declarativeAgents", teamsManifestPath)));
|
|
61
|
+
}
|
|
62
|
+
const declarativeAgentManifestPath = path.join(projectPath, teamsfx_api_1.AppPackageFolderName, declarativeAgentRelativePath);
|
|
63
|
+
const createRes = await (0, helper_1.createNewActionPluginManifest)(projectPath, desiredFileName, declarativeAgentManifestPath);
|
|
64
|
+
if (createRes.isErr()) {
|
|
65
|
+
return (0, teamsfx_api_1.err)(createRes.error);
|
|
66
|
+
}
|
|
67
|
+
aiPluginFilePath = createRes.value.pluginManifestPath;
|
|
68
|
+
inputs[constants_2.QuestionNames.PluginManifestFilePath] = aiPluginFilePath;
|
|
69
|
+
}
|
|
45
70
|
if (!(await fs_extra_1.default.pathExists(aiPluginFilePath))) {
|
|
46
71
|
const error = new teamsfx_api_1.SystemError("MCPForDAPluginManifestNotFound", "PluginManifestNotFound", (0, localizeUtils_1.getDefaultString)("core.MCPForDA.pluginManifestNotFound", aiPluginFilePath), (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.pluginManifestNotFound", aiPluginFilePath));
|
|
47
72
|
return (0, teamsfx_api_1.err)(error);
|
|
@@ -201,10 +226,23 @@ class FxCoreDeclarativeAgentPart {
|
|
|
201
226
|
throw new Error("projectPath is undefined"); // should never happen
|
|
202
227
|
}
|
|
203
228
|
const context = (0, globalVars_1.createContext)();
|
|
204
|
-
const teamsManifestPath = inputs[constants_2.QuestionNames.ManifestPath];
|
|
205
|
-
const appPackageFolder = path.dirname(teamsManifestPath);
|
|
206
229
|
const isGenerateFromApiSpec = inputs[constants_2.QuestionNames.ActionType] === constants_2.ActionStartOptions.apiSpec().id;
|
|
207
230
|
const isGenerateFromMCP = inputs[constants_2.QuestionNames.ActionType] === constants_2.ActionStartOptions.mcp().id;
|
|
231
|
+
// VS Code MCP "Add Action" flow: aligned with the "DA with MCP" scaffolding
|
|
232
|
+
// behavior. Only the MCP server URL is collected from the user. The toolkit
|
|
233
|
+
// writes the URL into .vscode/mcp.json and signals the caller to open the
|
|
234
|
+
// file and surface the "start MCP server / Fetch Action" notification, which
|
|
235
|
+
// already exists for the scaffolding flow. The actual plugin manifest and DA
|
|
236
|
+
// action are produced later by the "Update Action with MCP" command.
|
|
237
|
+
//
|
|
238
|
+
// The CLI flow (below) keeps the original non-interactive behavior of
|
|
239
|
+
// probing the MCP server, fetching tools and writing ai-plugin.json + yaml
|
|
240
|
+
// OAuth registration, since the CLI has no equivalent notification UX.
|
|
241
|
+
if (isGenerateFromMCP && inputs.platform === teamsfx_api_1.Platform.VSCode) {
|
|
242
|
+
return await this.addPluginFromMCP(inputs, context);
|
|
243
|
+
}
|
|
244
|
+
const teamsManifestPath = inputs[constants_2.QuestionNames.ManifestPath];
|
|
245
|
+
const appPackageFolder = path.dirname(teamsManifestPath);
|
|
208
246
|
// validate the project is valid for adding plugin
|
|
209
247
|
const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
|
|
210
248
|
if (manifestRes.isErr()) {
|
|
@@ -286,7 +324,8 @@ class FxCoreDeclarativeAgentPart {
|
|
|
286
324
|
}
|
|
287
325
|
}
|
|
288
326
|
else if (isGenerateFromMCP) {
|
|
289
|
-
// MCP action: create ai-plugin.json with MCP runtime config
|
|
327
|
+
// CLI MCP action: create ai-plugin.json with MCP runtime config.
|
|
328
|
+
// (VS Code path is handled earlier by addPluginFromMCP.)
|
|
290
329
|
const mcpServerUrl = inputs[constants_2.QuestionNames.MCPForDAServerUrl];
|
|
291
330
|
const toolsFilePath = inputs[constants_2.QuestionNames.MCPToolsFilePath];
|
|
292
331
|
const mcpWarnings = [];
|
|
@@ -327,7 +366,7 @@ class FxCoreDeclarativeAgentPart {
|
|
|
327
366
|
}
|
|
328
367
|
}
|
|
329
368
|
catch {
|
|
330
|
-
// Auth probe failed
|
|
369
|
+
// Auth probe failed - continue without auth
|
|
331
370
|
}
|
|
332
371
|
}
|
|
333
372
|
// Auto-fetch tools if not yet loaded (CLI flow for no-auth servers)
|
|
@@ -367,7 +406,7 @@ class FxCoreDeclarativeAgentPart {
|
|
|
367
406
|
});
|
|
368
407
|
}
|
|
369
408
|
}
|
|
370
|
-
// If no tools available (auth required or fetch failed), skip creating plugin
|
|
409
|
+
// If no tools available (auth required or fetch failed), skip creating plugin - just warn
|
|
371
410
|
const mcpTools = inputs[constants_2.QuestionNames.MCPForDAAvailableTools];
|
|
372
411
|
const mcpToolsSelected = inputs[constants_2.QuestionNames.MCPForDAPreFetchTools] || [];
|
|
373
412
|
if (!mcpTools || mcpTools.length === 0 || mcpToolsSelected.length === 0) {
|
|
@@ -430,16 +469,14 @@ class FxCoreDeclarativeAgentPart {
|
|
|
430
469
|
let tokenUrl;
|
|
431
470
|
let refreshUrl;
|
|
432
471
|
if (authType === "oauth") {
|
|
433
|
-
const
|
|
434
|
-
const metadata = await resolveMCPOAuthMetadata(inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl]);
|
|
472
|
+
const metadata = await (0, mcpToolFetcher_1.resolveMCPOAuthMetadata)(inputs[constants_2.QuestionNames.MCPForDAAuthMetadataUrl]);
|
|
435
473
|
authorizationUrl = metadata.authorizationUrl;
|
|
436
474
|
tokenUrl = metadata.tokenUrl;
|
|
437
475
|
refreshUrl = metadata.refreshUrl;
|
|
438
476
|
}
|
|
439
|
-
const { ActionInjector } = await Promise.resolve().then(() => tslib_1.__importStar(require("../component/configManager/actionInjector")));
|
|
440
477
|
const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath);
|
|
441
478
|
if (ymlPath) {
|
|
442
|
-
await ActionInjector.injectCreateOAuthActionForMCP(ymlPath, authType, actionId, registrationId, mcpServerUrl, authorizationUrl, tokenUrl, refreshUrl);
|
|
479
|
+
await actionInjector_1.ActionInjector.injectCreateOAuthActionForMCP(ymlPath, authType, actionId, registrationId, mcpServerUrl, authorizationUrl, tokenUrl, refreshUrl);
|
|
443
480
|
}
|
|
444
481
|
}
|
|
445
482
|
catch (error) {
|
|
@@ -490,6 +527,54 @@ class FxCoreDeclarativeAgentPart {
|
|
|
490
527
|
}
|
|
491
528
|
return (0, teamsfx_api_1.ok)(undefined);
|
|
492
529
|
}
|
|
530
|
+
/**
|
|
531
|
+
* Adds an MCP server entry to the project's `.vscode/mcp.json` and returns
|
|
532
|
+
* a marker so the caller (vscode-extension) can open the file and surface
|
|
533
|
+
* the same "start MCP server / Fetch Action" notification used by the
|
|
534
|
+
* "DA with MCP" scaffolding flow.
|
|
535
|
+
*/
|
|
536
|
+
async addPluginFromMCP(inputs, context) {
|
|
537
|
+
const projectPath = inputs.projectPath;
|
|
538
|
+
const mcpServerUrl = inputs[constants_2.QuestionNames.MCPForDAServerUrl]?.trim();
|
|
539
|
+
if (!mcpServerUrl) {
|
|
540
|
+
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(teamsfx_api_1.Stage.addPlugin, "MissingMCPServerUrl", (0, localizeUtils_1.getDefaultString)("core.MCPForDA.missingServerUrl"), (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.missingServerUrl")));
|
|
541
|
+
}
|
|
542
|
+
// Derive a server entry name from the URL host using the same logic as the
|
|
543
|
+
// "DA with MCP" scaffolding template variable `ServerName`.
|
|
544
|
+
const serverName = (0, helper_1.deriveMCPServerNameFromUrl)(mcpServerUrl);
|
|
545
|
+
const mcpConfigDir = path.join(projectPath, ".vscode");
|
|
546
|
+
const mcpConfigPath = path.join(mcpConfigDir, "mcp.json");
|
|
547
|
+
let mcpConfig = { servers: {} };
|
|
548
|
+
if (await fs_extra_1.default.pathExists(mcpConfigPath)) {
|
|
549
|
+
try {
|
|
550
|
+
const existing = (await fs_extra_1.default.readJSON(mcpConfigPath));
|
|
551
|
+
if (existing && typeof existing === "object") {
|
|
552
|
+
mcpConfig = {
|
|
553
|
+
...existing,
|
|
554
|
+
servers: existing.servers && typeof existing.servers === "object" ? existing.servers : {},
|
|
555
|
+
};
|
|
556
|
+
}
|
|
557
|
+
}
|
|
558
|
+
catch {
|
|
559
|
+
// Existing file is unreadable/invalid JSON — overwrite with a fresh config.
|
|
560
|
+
mcpConfig = { servers: {} };
|
|
561
|
+
}
|
|
562
|
+
}
|
|
563
|
+
// Ensure unique server entry name to avoid overwriting an existing one.
|
|
564
|
+
let uniqueName = serverName;
|
|
565
|
+
let suffix = 1;
|
|
566
|
+
while (Object.prototype.hasOwnProperty.call(mcpConfig.servers, uniqueName)) {
|
|
567
|
+
uniqueName = `${serverName}${suffix++}`;
|
|
568
|
+
}
|
|
569
|
+
mcpConfig.servers[uniqueName] = {
|
|
570
|
+
type: "http",
|
|
571
|
+
url: mcpServerUrl,
|
|
572
|
+
};
|
|
573
|
+
await fs_extra_1.default.ensureDir(mcpConfigDir);
|
|
574
|
+
await fs_extra_1.default.writeJSON(mcpConfigPath, mcpConfig, { spaces: 2 });
|
|
575
|
+
context.logProvider.info(`MCP server "${uniqueName}" added to ${path.relative(projectPath, mcpConfigPath)}.`);
|
|
576
|
+
return (0, teamsfx_api_1.ok)({ kind: "mcp", mcpConfigPath });
|
|
577
|
+
}
|
|
493
578
|
}
|
|
494
579
|
exports.FxCoreDeclarativeAgentPart = FxCoreDeclarativeAgentPart;
|
|
495
580
|
tslib_1.__decorate([
|