@microsoft/teamsfx-core 3.1.3-alpha.d1d0529262.0 → 3.1.3-alpha.e1ff7867cc.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/common/mcpToolFetcher.d.ts.map +1 -1
- package/build/common/mcpToolFetcher.js +6 -2
- package/build/common/mcpToolFetcher.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/generator/openPlugin/authResolver.d.ts +10 -0
- package/build/component/generator/openPlugin/authResolver.d.ts.map +1 -0
- package/build/component/generator/openPlugin/authResolver.js +97 -0
- package/build/component/generator/openPlugin/authResolver.js.map +1 -0
- package/build/component/generator/openPlugin/importer.d.ts.map +1 -1
- package/build/component/generator/openPlugin/importer.js +8 -1
- package/build/component/generator/openPlugin/importer.js.map +1 -1
- package/build/component/generator/openPlugin/mapper.d.ts +3 -2
- package/build/component/generator/openPlugin/mapper.d.ts.map +1 -1
- package/build/component/generator/openPlugin/mapper.js +17 -13
- package/build/component/generator/openPlugin/mapper.js.map +1 -1
- package/build/core/FxCore.declarativeAgent.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.js +16 -6
- package/build/core/FxCore.declarativeAgent.js.map +1 -1
- package/build/core/FxCore.js +1 -1
- package/build/core/FxCore.js.map +1 -1
- package/build/question/options/ImportOpenPluginOptions.js +1 -1
- package/build/question/options/ImportOpenPluginOptions.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.json +4 -0
- 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
- package/templates/v4/templates-metadata.zip +0 -0
- package/templates/v4/templates.zip +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpToolFetcher.d.ts","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,GAAG,CAAC;IACjB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,2DAA2D;AAC3D,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,CAAC,CAiFzB;AAED,kEAAkE;AAClE,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CA8B/E;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,aAAa,GAAG,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"mcpToolFetcher.d.ts","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,GAAG,CAAC;IACjB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,2DAA2D;AAC3D,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,CAAC,CAiFzB;AAED,kEAAkE;AAClE,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CA8B/E;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,aAAa,GAAG,cAAc,CAAC;AAsC7E,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;OAKG;IACH,cAAc,EAAE,iBAAiB,CAAC;IAClC,uFAAuF;IACvF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAqED,+FAA+F;AAC/F,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,kBAAkB,CAAC,CAgD7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAajE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iCAAiC,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAUhF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gCAAgC,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAU/E;AA4CD,kFAAkF;AAClF,wBAAsB,uBAAuB,CAC3C,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAkD3B"}
|
|
@@ -135,6 +135,8 @@ const NOT_AN_ENDPOINT_STATUSES = [403, 404, 405];
|
|
|
135
135
|
const LEGACY_SSE_TIMEOUT_MS = 5000;
|
|
136
136
|
/** Stop buffering an event stream that is not going to name an endpoint. */
|
|
137
137
|
const LEGACY_SSE_MAX_BYTES = 8192;
|
|
138
|
+
/** Bound each OAuth metadata discovery hop so an unreachable issuer cannot stall scaffolding. */
|
|
139
|
+
const MCP_AUTH_METADATA_TIMEOUT_MS = 10000;
|
|
138
140
|
/**
|
|
139
141
|
* A 2xx alone proves nothing: a truncated URL on a host that serves a landing page answers 200
|
|
140
142
|
* with HTML. The JSON-RPC envelope in the payload is the actual proof. The body text is searched
|
|
@@ -349,7 +351,7 @@ function buildProtectedResourceCandidates(mcpServerUrl) {
|
|
|
349
351
|
async function candidatesFromProtectedResourceMetadata(authMetadataUrl, canFallBack) {
|
|
350
352
|
let response;
|
|
351
353
|
try {
|
|
352
|
-
response = await axios_1.default.get(authMetadataUrl);
|
|
354
|
+
response = await axios_1.default.get(authMetadataUrl, { timeout: MCP_AUTH_METADATA_TIMEOUT_MS });
|
|
353
355
|
}
|
|
354
356
|
catch (error) {
|
|
355
357
|
// A server advertising a document it cannot serve is broken, but the MCP server URL may
|
|
@@ -406,7 +408,9 @@ async function resolveMCPOAuthMetadata(authMetadataUrl, wellKnownUrl, mcpServerU
|
|
|
406
408
|
}
|
|
407
409
|
for (const candidate of candidates) {
|
|
408
410
|
try {
|
|
409
|
-
const metadataResponse = await axios_1.default.get(candidate
|
|
411
|
+
const metadataResponse = await axios_1.default.get(candidate, {
|
|
412
|
+
timeout: MCP_AUTH_METADATA_TIMEOUT_MS,
|
|
413
|
+
});
|
|
410
414
|
const authorizationUrl = metadataResponse.data?.authorization_endpoint;
|
|
411
415
|
const tokenUrl = metadataResponse.data?.token_endpoint;
|
|
412
416
|
const refreshUrl = metadataResponse.data?.refresh_endpoint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpToolFetcher.js","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcpToolFetcher.js","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { FxError } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { Result } from "neverthrow";
|
|
3
|
+
import { AuthorizationType, DefaultAuthOption, ParsedOpenPlugin } from "./types";
|
|
4
|
+
export interface OpenPluginMcpAuthResolution {
|
|
5
|
+
authTypes: Readonly<Record<string, AuthorizationType>>;
|
|
6
|
+
warnings: string[];
|
|
7
|
+
}
|
|
8
|
+
/** Resolve every connector auth type before the pure manifest mapper runs. */
|
|
9
|
+
export declare function resolveOpenPluginMcpAuth(parsed: ParsedOpenPlugin, defaultAuth: DefaultAuthOption): Promise<Result<OpenPluginMcpAuthResolution, FxError>>;
|
|
10
|
+
//# sourceMappingURL=authResolver.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authResolver.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/authResolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAa,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAW,MAAM,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAIjF,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACvD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAuCD,8EAA8E;AAC9E,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,MAAM,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC,CAwDvD"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.resolveOpenPluginMcpAuth = resolveOpenPluginMcpAuth;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const neverthrow_1 = require("neverthrow");
|
|
9
|
+
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
10
|
+
const mcpToolFetcher = tslib_1.__importStar(require("../../../common/mcpToolFetcher"));
|
|
11
|
+
const SOURCE = "OpenPluginImport";
|
|
12
|
+
function isLocalHostname(hostname) {
|
|
13
|
+
if (hostname === "localhost" ||
|
|
14
|
+
hostname.endsWith(".localhost") ||
|
|
15
|
+
hostname === "[::1]" ||
|
|
16
|
+
/^127(?:\.\d{1,3}){3}$/.test(hostname)) {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
const mappedIpv4 = /^\[::ffff:([0-9a-f]{1,4}):[0-9a-f]{1,4}\]$/.exec(hostname);
|
|
20
|
+
return mappedIpv4 !== null && Number.parseInt(mappedIpv4[1], 16) >> 8 === 0x7f;
|
|
21
|
+
}
|
|
22
|
+
function classifyAuthProbeTarget(serverUrl) {
|
|
23
|
+
try {
|
|
24
|
+
const parsed = new URL(serverUrl);
|
|
25
|
+
const hostname = parsed.hostname.toLowerCase().replace(/\.$/, "");
|
|
26
|
+
return parsed.protocol === "https:" && !isLocalHostname(hostname) ? "remote" : "noProbe";
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
return "invalid";
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function unresolvedAuth(serverName, error) {
|
|
33
|
+
const message = (0, localizeUtils_1.getLocalizedString)("core.openPluginImport.unresolvedMcpAuth", serverName);
|
|
34
|
+
return new teamsfx_api_1.UserError({
|
|
35
|
+
source: SOURCE,
|
|
36
|
+
name: "UnresolvedMcpAuth",
|
|
37
|
+
message,
|
|
38
|
+
displayMessage: message,
|
|
39
|
+
error: error instanceof Error ? error : undefined,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
/** Resolve every connector auth type before the pure manifest mapper runs. */
|
|
43
|
+
async function resolveOpenPluginMcpAuth(parsed, defaultAuth) {
|
|
44
|
+
const authTypes = {};
|
|
45
|
+
const warnings = [];
|
|
46
|
+
for (const serverName of Object.keys(parsed.mcpServers).sort()) {
|
|
47
|
+
const server = parsed.mcpServers[serverName];
|
|
48
|
+
const serverUrl = typeof server.url === "string" ? server.url.trim() : "";
|
|
49
|
+
if (!serverUrl) {
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
const override = parsed.atkExtension?.agentConnectors?.[serverName]?.authorization?.type;
|
|
53
|
+
if (override) {
|
|
54
|
+
authTypes[serverName] = override;
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
if (defaultAuth !== "Auto") {
|
|
58
|
+
authTypes[serverName] = defaultAuth;
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
const probeTarget = classifyAuthProbeTarget(serverUrl);
|
|
62
|
+
if (probeTarget === "invalid") {
|
|
63
|
+
return (0, neverthrow_1.err)(unresolvedAuth(serverName));
|
|
64
|
+
}
|
|
65
|
+
if (probeTarget === "noProbe") {
|
|
66
|
+
authTypes[serverName] = "None";
|
|
67
|
+
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.autoAuthNone", serverName));
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
let probe;
|
|
71
|
+
try {
|
|
72
|
+
probe = await mcpToolFetcher.probeMCPServerAuth(serverUrl);
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
return (0, neverthrow_1.err)(unresolvedAuth(serverName, error));
|
|
76
|
+
}
|
|
77
|
+
if (probe.endpointStatus !== "confirmed") {
|
|
78
|
+
return (0, neverthrow_1.err)(unresolvedAuth(serverName));
|
|
79
|
+
}
|
|
80
|
+
try {
|
|
81
|
+
await mcpToolFetcher.resolveMCPOAuthMetadata(probe.authMetadataUrl, undefined, serverUrl);
|
|
82
|
+
authTypes[serverName] = "OAuthPluginVault";
|
|
83
|
+
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.autoAuthOAuth", serverName));
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
if (probe.requiresAuth) {
|
|
87
|
+
authTypes[serverName] = "OAuthPluginVault";
|
|
88
|
+
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.authFallback", serverName));
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
authTypes[serverName] = "None";
|
|
92
|
+
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.autoAuthNone", serverName));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return (0, neverthrow_1.ok)({ authTypes, warnings });
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=authResolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authResolver.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/authResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/importer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/importer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAW1F,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,eAAO,MAAM,yBAAyB,qBAAqB,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAiFxC;AAqCD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAsBA"}
|
|
@@ -13,6 +13,7 @@ const path = tslib_1.__importStar(require("path"));
|
|
|
13
13
|
const globalVars_1 = require("../../../common/globalVars");
|
|
14
14
|
const generator_1 = require("../generator");
|
|
15
15
|
const templateNames_1 = require("../templates/templateNames");
|
|
16
|
+
const authResolver_1 = require("./authResolver");
|
|
16
17
|
const iconStrategy_1 = require("./iconStrategy");
|
|
17
18
|
const mapper_1 = require("./mapper");
|
|
18
19
|
const parser_1 = require("./parser");
|
|
@@ -35,7 +36,6 @@ async function importOpenPlugin(inputs) {
|
|
|
35
36
|
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(exports.OPEN_PLUGIN_IMPORT_SOURCE, "MissingPluginPath", "--path is required."));
|
|
36
37
|
}
|
|
37
38
|
const parsed = await (0, parser_1.readOpenPluginDir)(inputs.path);
|
|
38
|
-
const { manifest, copyOps, warnings } = (0, mapper_1.mapToTtkProject)(parsed, inputs);
|
|
39
39
|
const defaultOutput = path.join(process.cwd(), parsed.manifest.name);
|
|
40
40
|
const projectPath = path.resolve(inputs.output ?? defaultOutput);
|
|
41
41
|
if (await fs_extra_1.default.pathExists(projectPath)) {
|
|
@@ -44,6 +44,13 @@ async function importOpenPlugin(inputs) {
|
|
|
44
44
|
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError(exports.OPEN_PLUGIN_IMPORT_SOURCE, "OutputDirectoryNotEmpty", `Output directory is not empty: ${projectPath}. Choose a different --output path or empty the directory.`));
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
+
(0, mapper_1.validateMcpServerCount)(parsed.mcpServers);
|
|
48
|
+
const authResolution = await (0, authResolver_1.resolveOpenPluginMcpAuth)(parsed, inputs.defaultAuthType ?? "Auto");
|
|
49
|
+
if (authResolution.isErr()) {
|
|
50
|
+
return (0, teamsfx_api_1.err)(authResolution.error);
|
|
51
|
+
}
|
|
52
|
+
const { manifest, copyOps, warnings } = (0, mapper_1.mapToTtkProject)(parsed, inputs, authResolution.value.authTypes);
|
|
53
|
+
warnings.push(...authResolution.value.warnings);
|
|
47
54
|
// 1. Scaffold the static baseline from the open-plugin-import template.
|
|
48
55
|
const ctx = (0, globalVars_1.createContext)();
|
|
49
56
|
ctx.templateVariables = { appName: parsed.manifest.name };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importer.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/importer.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"importer.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/importer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { ImportInputs, MappedManifest, ParsedOpenPlugin } from "./types";
|
|
1
|
+
import { AuthorizationType, ImportInputs, MappedManifest, OpenPluginMcpServerEntry, ParsedOpenPlugin } from "./types";
|
|
2
2
|
export declare const MANIFEST_SCHEMA_URL = "https://developer.microsoft.com/json-schemas/teams/vDevPreview/MicrosoftTeams.schema.json";
|
|
3
3
|
export declare const MANIFEST_VERSION = "devPreview";
|
|
4
4
|
export declare const ACCENT_COLOR = "#4A90D9";
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function validateMcpServerCount(mcpServers: Record<string, OpenPluginMcpServerEntry>): void;
|
|
6
|
+
export declare function mapToTtkProject(parsed: ParsedOpenPlugin, inputs: ImportInputs, resolvedAuthTypes?: Readonly<Record<string, AuthorizationType>>): MappedManifest;
|
|
6
7
|
//# sourceMappingURL=mapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/mapper.ts"],"names":[],"mappings":"AAOA,OAAO,
|
|
1
|
+
{"version":3,"file":"mapper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/mapper.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,iBAAiB,EAIjB,YAAY,EACZ,cAAc,EACd,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,mBAAmB,8FAC6D,CAAC;AAC9F,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAC7C,eAAO,MAAM,YAAY,YAAY,CAAC;AAQtC,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAAG,IAAI,CASjG;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,YAAY,EACpB,iBAAiB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAM,GAClE,cAAc,CAkGhB"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.ACCENT_COLOR = exports.MANIFEST_VERSION = exports.MANIFEST_SCHEMA_URL = void 0;
|
|
6
|
+
exports.validateMcpServerCount = validateMcpServerCount;
|
|
6
7
|
exports.mapToTtkProject = mapToTtkProject;
|
|
7
8
|
const tslib_1 = require("tslib");
|
|
8
9
|
const path = tslib_1.__importStar(require("path"));
|
|
@@ -17,7 +18,13 @@ const NAME_FULL_MAX = 100;
|
|
|
17
18
|
const DESC_SHORT_MAX = 80;
|
|
18
19
|
const DESC_FULL_MAX = 4000;
|
|
19
20
|
const MAX_AGENT_CONNECTORS = 10;
|
|
20
|
-
function
|
|
21
|
+
function validateMcpServerCount(mcpServers) {
|
|
22
|
+
const connectorCount = Object.values(mcpServers).filter((server) => typeof server.url === "string" && server.url.trim().length > 0).length;
|
|
23
|
+
if (connectorCount > MAX_AGENT_CONNECTORS) {
|
|
24
|
+
throw new Error(`Too many MCP servers: ${connectorCount}. The manifest caps agentConnectors at ${MAX_AGENT_CONNECTORS}.`);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
function mapToTtkProject(parsed, inputs, resolvedAuthTypes = {}) {
|
|
21
28
|
const warnings = [...parsed.warnings];
|
|
22
29
|
const pj = parsed.manifest;
|
|
23
30
|
const pluginName = pj.name;
|
|
@@ -47,10 +54,8 @@ function mapToTtkProject(parsed, inputs) {
|
|
|
47
54
|
const shortDesc = ext.description?.short ?? (0, textUtils_1.truncateAtWordBoundary)(description, DESC_SHORT_MAX);
|
|
48
55
|
const fullDesc = ext.description?.full ?? (0, textUtils_1.truncateAtWordBoundary)(description, DESC_FULL_MAX);
|
|
49
56
|
const agentSkills = parsed.skills.map((folder) => ({ folder: `./skills/${folder}` }));
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
throw new Error(`Too many MCP servers: ${agentConnectors.length}. The manifest caps agentConnectors at ${MAX_AGENT_CONNECTORS}.`);
|
|
53
|
-
}
|
|
57
|
+
validateMcpServerCount(parsed.mcpServers);
|
|
58
|
+
const agentConnectors = buildAgentConnectors(parsed.mcpServers, pluginName, inputs.defaultAuthType ?? "Auto", ext.agentConnectors, warnings, resolvedAuthTypes);
|
|
54
59
|
const developer = {
|
|
55
60
|
name: ext.developer?.name ?? author.name ?? "Unknown",
|
|
56
61
|
websiteUrl,
|
|
@@ -92,7 +97,7 @@ function mapToTtkProject(parsed, inputs) {
|
|
|
92
97
|
}
|
|
93
98
|
return { manifest, copyOps, warnings };
|
|
94
99
|
}
|
|
95
|
-
function buildAgentConnectors(mcpServers, pluginName, defaultAuth, extOverrides, warnings) {
|
|
100
|
+
function buildAgentConnectors(mcpServers, pluginName, defaultAuth, extOverrides, warnings, resolvedAuthTypes) {
|
|
96
101
|
const out = [];
|
|
97
102
|
const serverNames = Object.keys(mcpServers).sort();
|
|
98
103
|
for (const name of serverNames) {
|
|
@@ -103,7 +108,7 @@ function buildAgentConnectors(mcpServers, pluginName, defaultAuth, extOverrides,
|
|
|
103
108
|
continue;
|
|
104
109
|
}
|
|
105
110
|
const override = extOverrides?.[name];
|
|
106
|
-
const authType = override?.authorization?.type ?? resolveAuthType(
|
|
111
|
+
const authType = override?.authorization?.type ?? resolveAuthType(name, defaultAuth, resolvedAuthTypes);
|
|
107
112
|
const authorization = { type: authType };
|
|
108
113
|
if (authType !== "None") {
|
|
109
114
|
authorization.referenceId =
|
|
@@ -127,15 +132,14 @@ function buildAgentConnectors(mcpServers, pluginName, defaultAuth, extOverrides,
|
|
|
127
132
|
}
|
|
128
133
|
return out;
|
|
129
134
|
}
|
|
130
|
-
function resolveAuthType(
|
|
135
|
+
function resolveAuthType(serverName, defaultAuth, resolvedAuthTypes) {
|
|
131
136
|
if (defaultAuth !== "Auto") {
|
|
132
137
|
return defaultAuth;
|
|
133
138
|
}
|
|
134
|
-
const
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
return "OAuthPluginVault";
|
|
139
|
+
const resolved = resolvedAuthTypes[serverName];
|
|
140
|
+
if (!resolved) {
|
|
141
|
+
throw new Error(`Missing resolved auth type for MCP server '${serverName}'.`);
|
|
138
142
|
}
|
|
139
|
-
return
|
|
143
|
+
return resolved;
|
|
140
144
|
}
|
|
141
145
|
//# sourceMappingURL=mapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapper.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/mapper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AA4BlC,0CAsGC;;
|
|
1
|
+
{"version":3,"file":"mapper.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAGL,OAAO,EACP,MAAM,EAEN,QAAQ,EACR,MAAM,EAOP,MAAM,wBAAwB,CAAC;AAiBhC,OAAO,KAAK,4BAA4B,MAAM,gDAAgD,CAAC;AAQ/F,OAAO,KAAK,uBAAuB,MAAM,2CAA2C,CAAC;AAErF,OAAO,EACL,wBAAwB,EAEzB,MAAM,yCAAyC,CAAC;AAiBjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAEzE,MAAM,WAAW,iCAAiC;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,wBAAwB,CAAC;CAC5C;AAOD,iBAAe,0BAA0B,CACvC,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAsCrC;AAMD,eAAO,MAAM,0BAA0B;;;;;;;;;CAStC,CAAC;AACF,qBAAa,0BAA0B;IAO/B,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAgQxE,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;
|
|
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,EAEN,QAAQ,EACR,MAAM,EAOP,MAAM,wBAAwB,CAAC;AAiBhC,OAAO,KAAK,4BAA4B,MAAM,gDAAgD,CAAC;AAQ/F,OAAO,KAAK,uBAAuB,MAAM,2CAA2C,CAAC;AAErF,OAAO,EACL,wBAAwB,EAEzB,MAAM,yCAAyC,CAAC;AAiBjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAEzE,MAAM,WAAW,iCAAiC;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,wBAAwB,CAAC;CAC5C;AAOD,iBAAe,0BAA0B,CACvC,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAsCrC;AAMD,eAAO,MAAM,0BAA0B;;;;;;;;;CAStC,CAAC;AACF,qBAAa,0BAA0B;IAO/B,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAgQxE,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;IAmvB1E;;;;;OAKG;YACW,gBAAgB;CA+D/B"}
|
|
@@ -549,8 +549,7 @@ class FxCoreDeclarativeAgentPart {
|
|
|
549
549
|
try {
|
|
550
550
|
const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath);
|
|
551
551
|
if (ymlPath) {
|
|
552
|
-
const
|
|
553
|
-
ymlPath,
|
|
552
|
+
const injectArgs = {
|
|
554
553
|
authType,
|
|
555
554
|
authName: namespace,
|
|
556
555
|
registrationId,
|
|
@@ -559,7 +558,12 @@ class FxCoreDeclarativeAgentPart {
|
|
|
559
558
|
persistCredentialEnvRefs: true,
|
|
560
559
|
serverName,
|
|
561
560
|
scopes: inputs[constants_2.QuestionNames.MCPForDAScopes],
|
|
562
|
-
}
|
|
561
|
+
};
|
|
562
|
+
const injectResult = await (0, mcpAuthScaffolder_1.injectMCPAuthActionToYml)({ ...injectArgs, ymlPath });
|
|
563
|
+
const localYmlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath, "local", true);
|
|
564
|
+
if (localYmlPath && localYmlPath !== ymlPath && (await fs_extra_1.default.pathExists(localYmlPath))) {
|
|
565
|
+
await (0, mcpAuthScaffolder_1.injectMCPAuthActionToYml)({ ...injectArgs, ymlPath: localYmlPath });
|
|
566
|
+
}
|
|
563
567
|
if (injectResult.wellKnownUrlPlaceholderUsed) {
|
|
564
568
|
mcpWarnings.push({
|
|
565
569
|
type: "mcpAuthDcrWellKnownUrlPlaceholder",
|
|
@@ -747,14 +751,20 @@ class FxCoreDeclarativeAgentPart {
|
|
|
747
751
|
const endpoints = await (0, mcpAuthScaffolder_1.resolveMCPAuthEndpoints)(authType, inputs);
|
|
748
752
|
const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath);
|
|
749
753
|
if (ymlPath) {
|
|
750
|
-
const
|
|
751
|
-
ymlPath,
|
|
754
|
+
const injectArgs = {
|
|
752
755
|
authType,
|
|
753
756
|
authName: actionId,
|
|
754
757
|
registrationId,
|
|
755
758
|
mcpServerUrl,
|
|
756
759
|
endpoints,
|
|
757
|
-
}
|
|
760
|
+
};
|
|
761
|
+
const injectResult = await (0, mcpAuthScaffolder_1.injectMCPAuthActionToYml)({ ...injectArgs, ymlPath });
|
|
762
|
+
const localYmlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath, "local", true);
|
|
763
|
+
if (localYmlPath &&
|
|
764
|
+
localYmlPath !== ymlPath &&
|
|
765
|
+
(await fs_extra_1.default.pathExists(localYmlPath))) {
|
|
766
|
+
await (0, mcpAuthScaffolder_1.injectMCPAuthActionToYml)({ ...injectArgs, ymlPath: localYmlPath });
|
|
767
|
+
}
|
|
758
768
|
if (injectResult.wellKnownUrlPlaceholderUsed) {
|
|
759
769
|
mcpWarnings.push({
|
|
760
770
|
type: "mcpAuthDcrWellKnownUrlPlaceholder",
|