@microsoft/teamsfx-core 3.0.14 → 3.0.15-alpha.006f520fff.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.map +1 -1
- package/build/client/aadAppClient.js +6 -6
- package/build/client/aadAppClient.js.map +1 -1
- package/build/common/featureFlags.d.ts +0 -5
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +0 -5
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/httpProxy.d.ts +21 -0
- package/build/common/httpProxy.d.ts.map +1 -0
- package/build/common/httpProxy.js +117 -0
- package/build/common/httpProxy.js.map +1 -0
- package/build/common/mcpToolFetcher.d.ts +31 -0
- package/build/common/mcpToolFetcher.d.ts.map +1 -0
- package/build/common/mcpToolFetcher.js +182 -0
- package/build/common/mcpToolFetcher.js.map +1 -0
- package/build/common/odrProvider.d.ts +43 -0
- package/build/common/odrProvider.d.ts.map +1 -0
- package/build/common/odrProvider.js +154 -0
- package/build/common/odrProvider.js.map +1 -0
- package/build/common/openApiParserOptions.d.ts +3 -0
- package/build/common/openApiParserOptions.d.ts.map +1 -0
- package/build/common/openApiParserOptions.js +61 -0
- package/build/common/openApiParserOptions.js.map +1 -0
- package/build/common/secretmasker/dict.d.ts.map +1 -1
- package/build/common/secretmasker/dict.js +5 -2
- package/build/common/secretmasker/dict.js.map +1 -1
- package/build/common/secretmasker/feature.js.map +1 -1
- package/build/common/templates-config.json +4 -4
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +3 -0
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +38 -3
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/script/scriptDriver.js +1 -1
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +3 -3
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +23 -0
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/generator/declarativeAgent/helper.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +1 -0
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +109 -2
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/openApiSpec/helper.d.ts +2 -3
- package/build/component/generator/openApiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/helper.js +6 -56
- package/build/component/generator/openApiSpec/helper.js.map +1 -1
- package/build/component/generator/templateHelper.d.ts +10 -2
- package/build/component/generator/templateHelper.d.ts.map +1 -1
- package/build/component/generator/templateHelper.js +16 -3
- package/build/component/generator/templateHelper.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +2 -0
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +2 -0
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +6 -0
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/generator/v4TemplateBridge.d.ts +4 -1
- package/build/component/generator/v4TemplateBridge.d.ts.map +1 -1
- package/build/component/generator/v4TemplateBridge.js +11 -3
- package/build/component/generator/v4TemplateBridge.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +2 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.d.ts.map +1 -1
- package/build/component/utils/fileOperation.js +4 -1
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.d.ts.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.js.map +1 -1
- package/build/component/utils/mcpToolFetcher.d.ts +1 -72
- package/build/component/utils/mcpToolFetcher.d.ts.map +1 -1
- package/build/component/utils/mcpToolFetcher.js +1 -227
- package/build/component/utils/mcpToolFetcher.js.map +1 -1
- package/build/component/utils/odrProvider.d.ts +1 -55
- package/build/component/utils/odrProvider.d.ts.map +1 -1
- package/build/component/utils/odrProvider.js +1 -101
- package/build/component/utils/odrProvider.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.js +41 -0
- package/build/core/FxCore.declarativeAgent.js.map +1 -1
- package/build/core/FxCore.js +3 -5
- package/build/core/FxCore.js.map +1 -1
- package/build/core/createFrontDoorAdapters.d.ts +1 -25
- package/build/core/createFrontDoorAdapters.d.ts.map +1 -1
- package/build/core/createFrontDoorAdapters.js +4 -155
- package/build/core/createFrontDoorAdapters.js.map +1 -1
- package/build/core/createProjectFrontDoor.d.ts +10 -12
- package/build/core/createProjectFrontDoor.d.ts.map +1 -1
- package/build/core/createProjectFrontDoor.js +143 -106
- package/build/core/createProjectFrontDoor.js.map +1 -1
- package/build/core/modifyProjectFrontDoor.d.ts +0 -1
- package/build/core/modifyProjectFrontDoor.d.ts.map +1 -1
- package/build/core/modifyProjectFrontDoor.js +0 -2
- package/build/core/modifyProjectFrontDoor.js.map +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +2 -0
- package/build/index.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +2 -1
- package/build/question/create.js.map +1 -1
- package/build/question/inputs/AddKnowledgeInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +4 -0
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +14 -0
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +2 -1
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +2 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +2 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/question/scaffold/constructNode.d.ts +3 -1
- package/build/question/scaffold/constructNode.d.ts.map +1 -1
- package/build/question/scaffold/constructNode.js +50 -0
- package/build/question/scaffold/constructNode.js.map +1 -1
- package/build/question/scaffold/vsc/CapabilityOptions.d.ts +2 -0
- package/build/question/scaffold/vsc/CapabilityOptions.d.ts.map +1 -1
- package/build/question/scaffold/vsc/CapabilityOptions.js +16 -0
- package/build/question/scaffold/vsc/CapabilityOptions.js.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js +0 -7
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
- package/build/v4/buildTarget/parseSelector.d.ts +6 -2
- package/build/v4/buildTarget/parseSelector.d.ts.map +1 -1
- package/build/v4/buildTarget/parseSelector.js +58 -45
- package/build/v4/buildTarget/parseSelector.js.map +1 -1
- package/build/v4/buildTarget/resolveBuildTarget.d.ts +21 -7
- package/build/v4/buildTarget/resolveBuildTarget.d.ts.map +1 -1
- package/build/v4/buildTarget/resolveBuildTarget.js +97 -52
- package/build/v4/buildTarget/resolveBuildTarget.js.map +1 -1
- package/build/v4/collectInputs/collectInputs.d.ts +51 -10
- package/build/v4/collectInputs/collectInputs.d.ts.map +1 -1
- package/build/v4/collectInputs/collectInputs.js +287 -91
- package/build/v4/collectInputs/collectInputs.js.map +1 -1
- package/build/v4/distribution/createQuestions.d.ts.map +1 -1
- package/build/v4/distribution/createQuestions.js +2 -29
- package/build/v4/distribution/createQuestions.js.map +1 -1
- package/build/v4/distribution/declarativePackage.d.ts.map +1 -1
- package/build/v4/distribution/declarativePackage.js +2 -30
- package/build/v4/distribution/declarativePackage.js.map +1 -1
- package/build/v4/distribution/questionFragments.d.ts +11 -0
- package/build/v4/distribution/questionFragments.d.ts.map +1 -0
- package/build/v4/distribution/questionFragments.js +130 -0
- package/build/v4/distribution/questionFragments.js.map +1 -0
- package/build/v4/engineVersion.d.ts +7 -0
- package/build/v4/engineVersion.d.ts.map +1 -0
- package/build/v4/engineVersion.js +12 -0
- package/build/v4/engineVersion.js.map +1 -0
- package/build/v4/expression/evaluateExpression.d.ts +13 -0
- package/build/v4/expression/evaluateExpression.d.ts.map +1 -1
- package/build/v4/expression/evaluateExpression.js +57 -0
- package/build/v4/expression/evaluateExpression.js.map +1 -1
- package/build/v4/index.d.ts +7 -0
- package/build/v4/index.d.ts.map +1 -1
- package/build/v4/index.js +7 -0
- package/build/v4/index.js.map +1 -1
- package/build/v4/inspection/scaffoldCatalog.d.ts +28 -0
- package/build/v4/inspection/scaffoldCatalog.d.ts.map +1 -0
- package/build/v4/inspection/scaffoldCatalog.js +66 -0
- package/build/v4/inspection/scaffoldCatalog.js.map +1 -0
- package/build/v4/inspection/scaffoldMetadataSource.d.ts +6 -0
- package/build/v4/inspection/scaffoldMetadataSource.d.ts.map +1 -0
- package/build/v4/inspection/scaffoldMetadataSource.js +78 -0
- package/build/v4/inspection/scaffoldMetadataSource.js.map +1 -0
- package/build/v4/mcp/mcpAuthAction.d.ts +28 -0
- package/build/v4/mcp/mcpAuthAction.d.ts.map +1 -0
- package/build/v4/mcp/mcpAuthAction.js +162 -0
- package/build/v4/mcp/mcpAuthAction.js.map +1 -0
- package/build/v4/mcp/mcpAuthScaffold.d.ts +37 -0
- package/build/v4/mcp/mcpAuthScaffold.d.ts.map +1 -0
- package/build/v4/mcp/mcpAuthScaffold.js +140 -0
- package/build/v4/mcp/mcpAuthScaffold.js.map +1 -0
- package/build/v4/model/dataModel.d.ts +1 -1
- package/build/v4/model/dataModel.d.ts.map +1 -1
- package/build/v4/pipeline/runScaffoldPipeline.d.ts +20 -4
- package/build/v4/pipeline/runScaffoldPipeline.d.ts.map +1 -1
- package/build/v4/pipeline/runScaffoldPipeline.js +61 -9
- package/build/v4/pipeline/runScaffoldPipeline.js.map +1 -1
- package/build/v4/providers/createOptionsProviders.d.ts +11 -0
- package/build/v4/providers/createOptionsProviders.d.ts.map +1 -0
- package/build/v4/providers/createOptionsProviders.js +268 -0
- package/build/v4/providers/createOptionsProviders.js.map +1 -0
- package/build/v4/renderContext/buildRenderContext.d.ts.map +1 -1
- package/build/v4/renderContext/buildRenderContext.js +4 -6
- package/build/v4/renderContext/buildRenderContext.js.map +1 -1
- package/build/v4/runtime/generalSensitivityLabel.d.ts +5 -0
- package/build/v4/runtime/generalSensitivityLabel.d.ts.map +1 -0
- package/build/v4/runtime/generalSensitivityLabel.js +36 -0
- package/build/v4/runtime/generalSensitivityLabel.js.map +1 -0
- package/build/v4/runtime/inMemoryRuntime.d.ts +4 -1
- package/build/v4/runtime/inMemoryRuntime.d.ts.map +1 -1
- package/build/v4/runtime/inMemoryRuntime.js +22 -3
- package/build/v4/runtime/inMemoryRuntime.js.map +1 -1
- package/build/v4/runtime/packageParse.d.ts.map +1 -1
- package/build/v4/runtime/packageParse.js +64 -8
- package/build/v4/runtime/packageParse.js.map +1 -1
- package/build/v4/runtime/realRuntime.d.ts +2 -1
- package/build/v4/runtime/realRuntime.d.ts.map +1 -1
- package/build/v4/runtime/realRuntime.js +3 -2
- package/build/v4/runtime/realRuntime.js.map +1 -1
- package/build/v4/runtime/renderMustache.d.ts.map +1 -1
- package/build/v4/runtime/renderMustache.js +13 -4
- package/build/v4/runtime/renderMustache.js.map +1 -1
- package/build/v4/runtime/runtimeRegistry.d.ts +12 -3
- package/build/v4/runtime/runtimeRegistry.d.ts.map +1 -1
- package/build/v4/runtime/runtimeRegistry.js +123 -17
- package/build/v4/runtime/runtimeRegistry.js.map +1 -1
- package/build/v4/runtime/scaffold.d.ts +1 -0
- package/build/v4/runtime/scaffold.d.ts.map +1 -1
- package/build/v4/runtime/scaffold.js +1 -20
- package/build/v4/runtime/scaffold.js.map +1 -1
- package/build/v4/runtime/steps/daAction.d.ts.map +1 -1
- package/build/v4/runtime/steps/daAction.js +3 -111
- package/build/v4/runtime/steps/daAction.js.map +1 -1
- package/build/v4/runtime/steps/daSensitivity.d.ts +14 -0
- package/build/v4/runtime/steps/daSensitivity.d.ts.map +1 -0
- package/build/v4/runtime/steps/daSensitivity.js +50 -0
- package/build/v4/runtime/steps/daSensitivity.js.map +1 -0
- package/build/v4/runtime/steps/mcpAuth.d.ts +5 -2
- package/build/v4/runtime/steps/mcpAuth.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpAuth.js +37 -66
- package/build/v4/runtime/steps/mcpAuth.js.map +1 -1
- package/build/v4/runtime/steps/mcpLocal.d.ts +0 -4
- package/build/v4/runtime/steps/mcpLocal.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpLocal.js +11 -31
- package/build/v4/runtime/steps/mcpLocal.js.map +1 -1
- package/build/v4/runtime/steps/mcpStatic.d.ts +1 -1
- package/build/v4/runtime/steps/mcpStatic.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpStatic.js +14 -32
- package/build/v4/runtime/steps/mcpStatic.js.map +1 -1
- package/build/v4/runtime/steps/metaOs.d.ts.map +1 -1
- package/build/v4/runtime/steps/metaOs.js +39 -51
- package/build/v4/runtime/steps/metaOs.js.map +1 -1
- package/build/v4/runtime/steps/officeAddin.d.ts.map +1 -1
- package/build/v4/runtime/steps/officeAddin.js +7 -12
- package/build/v4/runtime/steps/officeAddin.js.map +1 -1
- package/build/v4/runtime/steps/openApi.d.ts.map +1 -1
- package/build/v4/runtime/steps/openApi.js +47 -555
- package/build/v4/runtime/steps/openApi.js.map +1 -1
- package/build/v4/runtime/steps/openApiCustomApi.d.ts +5 -0
- package/build/v4/runtime/steps/openApiCustomApi.d.ts.map +1 -0
- package/build/v4/runtime/steps/openApiCustomApi.js +385 -0
- package/build/v4/runtime/steps/openApiCustomApi.js.map +1 -0
- package/build/v4/runtime/whitelist.d.ts +27 -0
- package/build/v4/runtime/whitelist.d.ts.map +1 -1
- package/build/v4/runtime/whitelist.js +156 -1
- package/build/v4/runtime/whitelist.js.map +1 -1
- package/build/v4/runtime/withTempDirectory.d.ts +10 -0
- package/build/v4/runtime/withTempDirectory.d.ts.map +1 -0
- package/build/v4/runtime/withTempDirectory.js +41 -0
- package/build/v4/runtime/withTempDirectory.js.map +1 -0
- package/build/v4/surface/createFloorTail.d.ts +12 -0
- package/build/v4/surface/createFloorTail.d.ts.map +1 -0
- package/build/v4/surface/createFloorTail.js +138 -0
- package/build/v4/surface/createFloorTail.js.map +1 -0
- package/build/v4/surface/createInputs.d.ts +25 -3
- package/build/v4/surface/createInputs.d.ts.map +1 -1
- package/build/v4/surface/createInputs.js +54 -431
- package/build/v4/surface/createInputs.js.map +1 -1
- package/build/v4/surface/createSelectorWalk.d.ts +8 -3
- package/build/v4/surface/createSelectorWalk.d.ts.map +1 -1
- package/build/v4/surface/createSelectorWalk.js +21 -11
- package/build/v4/surface/createSelectorWalk.js.map +1 -1
- package/build/v4/surface/deriveCreateOptions.d.ts.map +1 -1
- package/build/v4/surface/deriveCreateOptions.js +5 -2
- package/build/v4/surface/deriveCreateOptions.js.map +1 -1
- package/build/v4/surface/localizePrompt.d.ts +11 -0
- package/build/v4/surface/localizePrompt.d.ts.map +1 -0
- package/build/v4/surface/localizePrompt.js +32 -0
- package/build/v4/surface/localizePrompt.js.map +1 -0
- package/build/v4/surface/modifySelectorWalk.d.ts.map +1 -1
- package/build/v4/surface/modifySelectorWalk.js +0 -3
- package/build/v4/surface/modifySelectorWalk.js.map +1 -1
- package/build/v4/surface/uiPromptUI.d.ts.map +1 -1
- package/build/v4/surface/uiPromptUI.js +45 -45
- package/build/v4/surface/uiPromptUI.js.map +1 -1
- package/build/v4/validation/capabilityCatalog.d.ts +8 -0
- package/build/v4/validation/capabilityCatalog.d.ts.map +1 -0
- package/build/v4/validation/capabilityCatalog.js +61 -0
- package/build/v4/validation/capabilityCatalog.js.map +1 -0
- package/build/v4/validation/templateArchiveValidation.d.ts +15 -0
- package/build/v4/validation/templateArchiveValidation.d.ts.map +1 -0
- package/build/v4/validation/templateArchiveValidation.js +297 -0
- package/build/v4/validation/templateArchiveValidation.js.map +1 -0
- package/build/v4/validation/validateTemplatePackage.d.ts +21 -2
- package/build/v4/validation/validateTemplatePackage.d.ts.map +1 -1
- package/build/v4/validation/validateTemplatePackage.js +155 -31
- package/build/v4/validation/validateTemplatePackage.js.map +1 -1
- package/build/v4/validators/createInputValidators.d.ts +7 -0
- package/build/v4/validators/createInputValidators.d.ts.map +1 -0
- package/build/v4/validators/createInputValidators.js +75 -0
- package/build/v4/validators/createInputValidators.js.map +1 -0
- package/build/v4/validators/mcpCredentialValidators.d.ts +5 -0
- package/build/v4/validators/mcpCredentialValidators.d.ts.map +1 -0
- package/build/v4/validators/mcpCredentialValidators.js +13 -0
- package/build/v4/validators/mcpCredentialValidators.js.map +1 -0
- package/package.json +28 -22
- package/resource/package.nls.cs.json +56 -54
- package/resource/package.nls.de.json +56 -54
- package/resource/package.nls.es.json +55 -53
- package/resource/package.nls.fr.json +56 -54
- package/resource/package.nls.it.json +55 -53
- package/resource/package.nls.ja.json +56 -54
- package/resource/package.nls.json +2 -0
- package/resource/package.nls.ko.json +56 -54
- package/resource/package.nls.pl.json +56 -54
- package/resource/package.nls.pt-BR.json +56 -54
- package/resource/package.nls.ru.json +56 -54
- package/resource/package.nls.tr.json +56 -54
- package/resource/package.nls.zh-Hans.json +56 -54
- package/resource/package.nls.zh-Hant.json +56 -54
- package/resource/templates/package.nls.cs.json +22 -9
- package/resource/templates/package.nls.de.json +22 -9
- package/resource/templates/package.nls.es.json +22 -9
- package/resource/templates/package.nls.fr.json +22 -9
- package/resource/templates/package.nls.it.json +22 -9
- package/resource/templates/package.nls.ja.json +22 -9
- package/resource/templates/package.nls.json +16 -3
- package/resource/templates/package.nls.ko.json +22 -9
- package/resource/templates/package.nls.pl.json +22 -9
- package/resource/templates/package.nls.pt-BR.json +22 -9
- package/resource/templates/package.nls.ru.json +22 -9
- package/resource/templates/package.nls.tr.json +22 -9
- package/resource/templates/package.nls.zh-Hans.json +22 -9
- package/resource/templates/package.nls.zh-Hant.json +22 -9
- package/resource/templates/package.nls.zh-cn.json +7 -1
- package/resource/templates/package.nls.zh-tw.json +7 -1
- 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/allTemplates.json +16 -2
- package/templates/metadata.zip +0 -0
- package/templates/ui/wizardNode.json +24 -0
- package/templates/v4/create-selector.json +30 -5
- package/templates/v4/floor.json +1 -1
- package/templates/v4/modify-selector.json +1 -6
- package/templates/v4/templates-metadata.zip +0 -0
- package/templates/v4/templates.zip +0 -0
- package/templates/configs/local/typescript/.gitignore +0 -1
- package/templates/configs/playground/typescript/.gitignore +0 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../src/client/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../src/client/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAMxE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAQzD,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAOlF,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAEf;gBAEG,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAwC9D,YAAY,CACvB,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,cAA4C,EAC5D,0BAA0B,CAAC,EAAE,MAAM,EACnC,eAAe,UAAQ,GACtB,OAAO,CAAC,cAAc,CAAC;IA2Bb,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,oBAAoB,CAC/B,QAAQ,EAAE,MAAM,EAChB,sBAAsB,SAAM,EAAE,yCAAyC;IACvE,uBAAuB,SAAY,EACnC,eAAe,UAAQ,GACtB,OAAO,CAAC,MAAM,CAAC;IA2CL,YAAY,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BnE,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;IA0B5D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;CAGnB"}
|
|
@@ -8,8 +8,8 @@ const lib_1 = require("@feathersjs/hooks/lib");
|
|
|
8
8
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
9
9
|
const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
|
|
10
10
|
const constants_1 = require("../common/constants");
|
|
11
|
-
const localizeUtils_1 = require("../common/localizeUtils");
|
|
12
11
|
const globalVars_1 = require("../common/globalVars");
|
|
12
|
+
const localizeUtils_1 = require("../common/localizeUtils");
|
|
13
13
|
const aadManifestError_1 = require("../component/driver/aad/error/aadManifestError");
|
|
14
14
|
const clientSecretNotAllowedError_1 = require("../component/driver/aad/error/clientSecretNotAllowedError");
|
|
15
15
|
const credentialInvalidLifetimeError_1 = require("../component/driver/aad/error/credentialInvalidLifetimeError");
|
|
@@ -69,7 +69,7 @@ class AadAppClient {
|
|
|
69
69
|
catch (err) {
|
|
70
70
|
if (axios_1.default.isAxiosError(err) && err.response) {
|
|
71
71
|
if (err.response.data?.error?.code === constants_2.aadErrorCode.signInAudienceNotAllowedAsPerAppPolicy) {
|
|
72
|
-
throw new signInAudienceNotAllowedError_1.SignInAudienceNotAllowedError(AadAppClient
|
|
72
|
+
throw new signInAudienceNotAllowedError_1.SignInAudienceNotAllowedError("AadAppClient", err.response.data.error?.message, isMicrosoftUser);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
throw err;
|
|
@@ -105,10 +105,10 @@ class AadAppClient {
|
|
|
105
105
|
catch (err) {
|
|
106
106
|
if (axios_1.default.isAxiosError(err) && err.response) {
|
|
107
107
|
if (err.response.data?.error?.code === constants_2.aadErrorCode.credentialInvalidLifetimeAsPerAppPolicy) {
|
|
108
|
-
throw new credentialInvalidLifetimeError_1.CredentialInvalidLifetimeError(AadAppClient
|
|
108
|
+
throw new credentialInvalidLifetimeError_1.CredentialInvalidLifetimeError("AadAppClient");
|
|
109
109
|
}
|
|
110
110
|
if (err.response.data?.error?.code === constants_2.aadErrorCode.credentialTypeNotAllowedAsPerAppPolicy) {
|
|
111
|
-
throw new clientSecretNotAllowedError_1.ClientSecretNotAllowedError(AadAppClient
|
|
111
|
+
throw new clientSecretNotAllowedError_1.ClientSecretNotAllowedError("AadAppClient", isMicrosoftUser);
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
throw err;
|
|
@@ -132,10 +132,10 @@ class AadAppClient {
|
|
|
132
132
|
catch (err) {
|
|
133
133
|
if (axios_1.default.isAxiosError(err) && err.response && err.response.status === 400) {
|
|
134
134
|
if (err.response.data.error?.code === constants_2.aadErrorCode.permissionErrorCode) {
|
|
135
|
-
throw new aadManifestError_1.DeleteOrUpdatePermissionFailedError(AadAppClient
|
|
135
|
+
throw new aadManifestError_1.DeleteOrUpdatePermissionFailedError("AadAppClient");
|
|
136
136
|
}
|
|
137
137
|
if (err.response.data.error?.code === constants_2.aadErrorCode.hostNameNotOnVerifiedDomain) {
|
|
138
|
-
throw new aadManifestError_1.HostNameNotOnVerifiedDomainError(AadAppClient
|
|
138
|
+
throw new aadManifestError_1.HostNameNotOnVerifiedDomainError("AadAppClient", err.response.data.error.message);
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
throw err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../src/client/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAE9C,0DAA8E;AAC9E,sEAAqC;AACrC,mDAAmG;AACnG,2DAA6D;AAE7D,
|
|
1
|
+
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../src/client/aadAppClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ export declare class FeatureFlagName {
|
|
|
13
13
|
static readonly CEAEnabled = "TEAMSFX_CEA_ENABLED";
|
|
14
14
|
static readonly SandBoxedTeam = "TEAMSFX_SANDBOXED_TEAM";
|
|
15
15
|
static readonly SensitivityLabelEnabled = "TEAMSFX_SENSITIVITY_LABEL";
|
|
16
|
-
static readonly DAMetaOS = "TEAMSFX_DA_METAOS";
|
|
17
16
|
static readonly CFShortcutMetaOS = "TEAMSFX_CF_SHORTCUT_METAOS";
|
|
18
17
|
static readonly OpenPluginImportExport = "TEAMSFX_OPENPLUGIN_IMPORT_EXPORT";
|
|
19
18
|
static readonly AgentSkillsManifest = "TEAMSFX_AGENT_SKILLS";
|
|
@@ -78,10 +77,6 @@ export declare class FeatureFlags {
|
|
|
78
77
|
name: string;
|
|
79
78
|
defaultValue: string;
|
|
80
79
|
};
|
|
81
|
-
static readonly DAMetaOS: {
|
|
82
|
-
name: string;
|
|
83
|
-
defaultValue: string;
|
|
84
|
-
};
|
|
85
80
|
static readonly CFShortcutMetaOS: {
|
|
86
81
|
name: string;
|
|
87
82
|
defaultValue: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AACD,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,SAAS,wBAAwB;IACjD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,wBAAwB,sCAAsC;IAC9E,MAAM,CAAC,QAAQ,CAAC,2BAA2B,6CAA6C;IACxF,MAAM,CAAC,QAAQ,CAAC,QAAQ,eAAe;IACvC,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,aAAa,6BAA6B;IAC1D,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;IACvD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,mCAAmC;IACtE,MAAM,CAAC,QAAQ,CAAC,UAAU,yBAAyB;IACnD,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,uBAAuB,+BAA+B;IACtE,MAAM,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,6 @@ class FeatureFlagName {
|
|
|
29
29
|
static CEAEnabled = "TEAMSFX_CEA_ENABLED";
|
|
30
30
|
static SandBoxedTeam = "TEAMSFX_SANDBOXED_TEAM";
|
|
31
31
|
static SensitivityLabelEnabled = "TEAMSFX_SENSITIVITY_LABEL";
|
|
32
|
-
static DAMetaOS = "TEAMSFX_DA_METAOS";
|
|
33
32
|
static CFShortcutMetaOS = "TEAMSFX_CF_SHORTCUT_METAOS";
|
|
34
33
|
static OpenPluginImportExport = "TEAMSFX_OPENPLUGIN_IMPORT_EXPORT";
|
|
35
34
|
static AgentSkillsManifest = "TEAMSFX_AGENT_SKILLS";
|
|
@@ -95,10 +94,6 @@ class FeatureFlags {
|
|
|
95
94
|
name: FeatureFlagName.SensitivityLabelEnabled,
|
|
96
95
|
defaultValue: "false",
|
|
97
96
|
};
|
|
98
|
-
static DAMetaOS = {
|
|
99
|
-
name: FeatureFlagName.DAMetaOS,
|
|
100
|
-
defaultValue: "false",
|
|
101
|
-
};
|
|
102
97
|
static CFShortcutMetaOS = {
|
|
103
98
|
name: FeatureFlagName.CFShortcutMetaOS,
|
|
104
99
|
defaultValue: "false",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,oDAOC;
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { AxiosInstance, InternalAxiosRequestConfig } from "axios";
|
|
2
|
+
/**
|
|
3
|
+
* Attaches an HttpsProxyAgent (built from HTTPS_PROXY/HTTP_PROXY/NO_PROXY) to a
|
|
4
|
+
* single axios request when a proxy applies, and turns off axios's own proxy
|
|
5
|
+
* handling so the agent is used instead.
|
|
6
|
+
*/
|
|
7
|
+
export declare function applyProxyToRequest(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig;
|
|
8
|
+
/**
|
|
9
|
+
* Installs the proxy interceptor on an axios instance (or the global default
|
|
10
|
+
* instance) so every request it sends honors the system proxy env vars.
|
|
11
|
+
*/
|
|
12
|
+
export declare function installProxyInterceptor(instance: AxiosInstance): void;
|
|
13
|
+
/**
|
|
14
|
+
* Installs the proxy interceptor on axios's global default instance, and wraps
|
|
15
|
+
* `axios.create` so every instance created afterwards also honors the system
|
|
16
|
+
* proxy env vars. Instances created via `axios.create()` do not inherit the
|
|
17
|
+
* default instance's interceptors, so wrapping `create` is how we cover the
|
|
18
|
+
* many clients in this package that spin up their own instance. Idempotent.
|
|
19
|
+
*/
|
|
20
|
+
export declare function installGlobalProxyInterceptor(): void;
|
|
21
|
+
//# sourceMappingURL=httpProxy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"httpProxy.d.ts","sourceRoot":"","sources":["../../src/common/httpProxy.ts"],"names":[],"mappings":"AAGA,OAAc,EAAE,aAAa,EAAuB,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAsE9F;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,0BAA0B,GACjC,0BAA0B,CAU5B;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAErE;AAID;;;;;;GAMG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAcpD"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.applyProxyToRequest = applyProxyToRequest;
|
|
6
|
+
exports.installProxyInterceptor = installProxyInterceptor;
|
|
7
|
+
exports.installGlobalProxyInterceptor = installGlobalProxyInterceptor;
|
|
8
|
+
const tslib_1 = require("tslib");
|
|
9
|
+
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
10
|
+
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
11
|
+
// Node's global fetch and axios both fail to honor system proxy settings for
|
|
12
|
+
// HTTPS out of the box: axios's built-in `proxy` option mishandles HTTPS
|
|
13
|
+
// tunneling (it can send the request as a plain HTTP GET, leaking the URL and
|
|
14
|
+
// failing the handshake). We route HTTPS through an explicit HttpsProxyAgent
|
|
15
|
+
// instead and disable axios's own proxy logic. See GitHub issue #15644.
|
|
16
|
+
function getProxyForUrl(targetUrl) {
|
|
17
|
+
const httpsProxy = process.env.HTTPS_PROXY ?? process.env.https_proxy;
|
|
18
|
+
const httpProxy = process.env.HTTP_PROXY ?? process.env.http_proxy;
|
|
19
|
+
let isHttps;
|
|
20
|
+
try {
|
|
21
|
+
isHttps = new URL(targetUrl).protocol === "https:";
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
isHttps = targetUrl.startsWith("https:");
|
|
25
|
+
}
|
|
26
|
+
const proxy = isHttps ? (httpsProxy ?? httpProxy) : httpProxy;
|
|
27
|
+
if (!proxy) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
if (isNoProxy(targetUrl)) {
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
return proxy;
|
|
34
|
+
}
|
|
35
|
+
// Matches the standard NO_PROXY convention: comma/space-separated host list,
|
|
36
|
+
// optional leading "." or "*." wildcard, optional ":port". "*" bypasses all.
|
|
37
|
+
function isNoProxy(targetUrl) {
|
|
38
|
+
const noProxy = process.env.NO_PROXY ?? process.env.no_proxy;
|
|
39
|
+
if (!noProxy) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
if (noProxy.trim() === "*") {
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
45
|
+
let host;
|
|
46
|
+
let port;
|
|
47
|
+
try {
|
|
48
|
+
const parsed = new URL(targetUrl);
|
|
49
|
+
host = parsed.hostname;
|
|
50
|
+
port = parsed.port;
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
return noProxy
|
|
56
|
+
.split(/[\s,]+/)
|
|
57
|
+
.filter((entry) => entry.length > 0)
|
|
58
|
+
.some((entry) => {
|
|
59
|
+
let pattern = entry;
|
|
60
|
+
const colonIndex = pattern.lastIndexOf(":");
|
|
61
|
+
if (colonIndex > -1) {
|
|
62
|
+
const patternPort = pattern.slice(colonIndex + 1);
|
|
63
|
+
if (port && patternPort && port !== patternPort) {
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
pattern = pattern.slice(0, colonIndex);
|
|
67
|
+
}
|
|
68
|
+
pattern = pattern.replace(/^\*?\./, "").toLowerCase();
|
|
69
|
+
const lowerHost = host.toLowerCase();
|
|
70
|
+
return lowerHost === pattern || lowerHost.endsWith(`.${pattern}`);
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Attaches an HttpsProxyAgent (built from HTTPS_PROXY/HTTP_PROXY/NO_PROXY) to a
|
|
75
|
+
* single axios request when a proxy applies, and turns off axios's own proxy
|
|
76
|
+
* handling so the agent is used instead.
|
|
77
|
+
*/
|
|
78
|
+
function applyProxyToRequest(config) {
|
|
79
|
+
const targetUrl = `${config.baseURL ?? ""}${config.url ?? ""}`;
|
|
80
|
+
const proxy = getProxyForUrl(targetUrl);
|
|
81
|
+
if (proxy && !config.httpsAgent && !config.httpAgent) {
|
|
82
|
+
const agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
|
|
83
|
+
config.httpsAgent = agent;
|
|
84
|
+
config.httpAgent = agent;
|
|
85
|
+
config.proxy = false;
|
|
86
|
+
}
|
|
87
|
+
return config;
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Installs the proxy interceptor on an axios instance (or the global default
|
|
91
|
+
* instance) so every request it sends honors the system proxy env vars.
|
|
92
|
+
*/
|
|
93
|
+
function installProxyInterceptor(instance) {
|
|
94
|
+
instance.interceptors.request.use((config) => applyProxyToRequest(config));
|
|
95
|
+
}
|
|
96
|
+
let globalInterceptorInstalled = false;
|
|
97
|
+
/**
|
|
98
|
+
* Installs the proxy interceptor on axios's global default instance, and wraps
|
|
99
|
+
* `axios.create` so every instance created afterwards also honors the system
|
|
100
|
+
* proxy env vars. Instances created via `axios.create()` do not inherit the
|
|
101
|
+
* default instance's interceptors, so wrapping `create` is how we cover the
|
|
102
|
+
* many clients in this package that spin up their own instance. Idempotent.
|
|
103
|
+
*/
|
|
104
|
+
function installGlobalProxyInterceptor() {
|
|
105
|
+
if (globalInterceptorInstalled) {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
installProxyInterceptor(axios_1.default);
|
|
109
|
+
const originalCreate = axios_1.default.create.bind(axios_1.default);
|
|
110
|
+
axios_1.default.create = (config) => {
|
|
111
|
+
const instance = originalCreate(config);
|
|
112
|
+
installProxyInterceptor(instance);
|
|
113
|
+
return instance;
|
|
114
|
+
};
|
|
115
|
+
globalInterceptorInstalled = true;
|
|
116
|
+
}
|
|
117
|
+
//# sourceMappingURL=httpProxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"httpProxy.js","sourceRoot":"","sources":["../../src/common/httpProxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export interface MCPTool {
|
|
2
|
+
name: string;
|
|
3
|
+
description: string;
|
|
4
|
+
inputSchema: any;
|
|
5
|
+
outputSchema?: any;
|
|
6
|
+
tags?: string[];
|
|
7
|
+
}
|
|
8
|
+
export interface MCPFetchResult {
|
|
9
|
+
requiresAuth: boolean;
|
|
10
|
+
tools: MCPTool[];
|
|
11
|
+
authMetadataUrl?: string;
|
|
12
|
+
}
|
|
13
|
+
/** Fetch MCP tool definitions from a remote MCP server. */
|
|
14
|
+
export declare function fetchMCPTools(serverUrl: string): Promise<MCPFetchResult>;
|
|
15
|
+
/** Read MCP tool definitions from a wrapped or raw JSON array. */
|
|
16
|
+
export declare function readMCPToolsFromFile(filePath: string): Promise<MCPTool[]>;
|
|
17
|
+
export interface MCPAuthProbeResult {
|
|
18
|
+
requiresAuth: boolean;
|
|
19
|
+
authMetadataUrl?: string;
|
|
20
|
+
}
|
|
21
|
+
/** Probe an MCP streamable-HTTP endpoint for an OAuth challenge. */
|
|
22
|
+
export declare function probeMCPServerAuth(serverUrl: string): Promise<MCPAuthProbeResult>;
|
|
23
|
+
export interface MCPOAuthMetadata {
|
|
24
|
+
authorizationUrl: string;
|
|
25
|
+
tokenUrl: string;
|
|
26
|
+
refreshUrl?: string;
|
|
27
|
+
wellKnownUrl: string;
|
|
28
|
+
}
|
|
29
|
+
/** Resolve OAuth endpoints from MCP resource or authorization-server metadata. */
|
|
30
|
+
export declare function resolveMCPOAuthMetadata(authMetadataUrl?: string, wellKnownUrl?: string): Promise<MCPOAuthMetadata>;
|
|
31
|
+
//# sourceMappingURL=mcpToolFetcher.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcpToolFetcher.d.ts","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"AAOA,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,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA0E9E;AAED,kEAAkE;AAClE,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CA8B/E;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,oEAAoE;AACpE,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCvF;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,kFAAkF;AAClF,wBAAsB,uBAAuB,CAC3C,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAkC3B"}
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.fetchMCPTools = fetchMCPTools;
|
|
6
|
+
exports.readMCPToolsFromFile = readMCPToolsFromFile;
|
|
7
|
+
exports.probeMCPServerAuth = probeMCPServerAuth;
|
|
8
|
+
exports.resolveMCPOAuthMetadata = resolveMCPOAuthMetadata;
|
|
9
|
+
const tslib_1 = require("tslib");
|
|
10
|
+
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
11
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
12
|
+
const localizeUtils_1 = require("./localizeUtils");
|
|
13
|
+
/** Fetch MCP tool definitions from a remote MCP server. */
|
|
14
|
+
async function fetchMCPTools(serverUrl) {
|
|
15
|
+
let authMetadataUrl;
|
|
16
|
+
try {
|
|
17
|
+
await axios_1.default.get(serverUrl, { timeout: 10000 });
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
if (error?.response?.status === 401 || error?.status === 401) {
|
|
21
|
+
const wwwAuth = error?.response?.headers?.["www-authenticate"];
|
|
22
|
+
if (wwwAuth) {
|
|
23
|
+
const match = wwwAuth.match(/resource_metadata=\s*"([^"]+)"/);
|
|
24
|
+
if (match) {
|
|
25
|
+
authMetadataUrl = match[1];
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return { requiresAuth: true, tools: [], authMetadataUrl };
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
try {
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
33
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
34
|
+
const { Client } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/index.js")));
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
36
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
37
|
+
const { StreamableHTTPClientTransport } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/streamableHttp.js")));
|
|
38
|
+
const transport = new StreamableHTTPClientTransport(new URL(serverUrl));
|
|
39
|
+
const client = new Client({ name: "atk-cli", version: "1.0.0" });
|
|
40
|
+
try {
|
|
41
|
+
await client.connect(transport);
|
|
42
|
+
const result = await client.listTools();
|
|
43
|
+
const tools = result.tools.map((tool) => ({
|
|
44
|
+
...tool,
|
|
45
|
+
description: tool.description ?? "",
|
|
46
|
+
}));
|
|
47
|
+
return { requiresAuth: false, tools };
|
|
48
|
+
}
|
|
49
|
+
finally {
|
|
50
|
+
await client.close();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
try {
|
|
55
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
56
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
57
|
+
const { Client } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/index.js")));
|
|
58
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
59
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
60
|
+
const { SSEClientTransport } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/sse.js")));
|
|
61
|
+
const transport = new SSEClientTransport(new URL(serverUrl));
|
|
62
|
+
const client = new Client({ name: "atk-cli", version: "1.0.0" });
|
|
63
|
+
try {
|
|
64
|
+
await client.connect(transport);
|
|
65
|
+
const result = await client.listTools();
|
|
66
|
+
const tools = result.tools.map((tool) => ({
|
|
67
|
+
...tool,
|
|
68
|
+
description: tool.description ?? "",
|
|
69
|
+
}));
|
|
70
|
+
return { requiresAuth: false, tools };
|
|
71
|
+
}
|
|
72
|
+
finally {
|
|
73
|
+
await client.close();
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
if (error?.message?.includes("401") ||
|
|
78
|
+
error?.message?.includes("Unauthorized") ||
|
|
79
|
+
error?.message?.includes("auth")) {
|
|
80
|
+
return { requiresAuth: true, tools: [] };
|
|
81
|
+
}
|
|
82
|
+
return { requiresAuth: false, tools: [] };
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
/** Read MCP tool definitions from a wrapped or raw JSON array. */
|
|
87
|
+
async function readMCPToolsFromFile(filePath) {
|
|
88
|
+
if (!(await fs_extra_1.default.pathExists(filePath))) {
|
|
89
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileNotFound", filePath));
|
|
90
|
+
}
|
|
91
|
+
const content = await fs_extra_1.default.readJSON(filePath);
|
|
92
|
+
let rawTools;
|
|
93
|
+
if (Array.isArray(content)) {
|
|
94
|
+
rawTools = content;
|
|
95
|
+
}
|
|
96
|
+
else if (content && Array.isArray(content.tools)) {
|
|
97
|
+
rawTools = content.tools;
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileInvalidFormat", '{ "tools": [...] }', filePath));
|
|
101
|
+
}
|
|
102
|
+
return rawTools.map((tool) => {
|
|
103
|
+
if (!tool.name) {
|
|
104
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileMissingName", '"name"', filePath));
|
|
105
|
+
}
|
|
106
|
+
return {
|
|
107
|
+
name: tool.name,
|
|
108
|
+
description: tool.description ?? "",
|
|
109
|
+
inputSchema: tool.inputSchema ?? tool.input_schema ?? { type: "object", properties: {} },
|
|
110
|
+
outputSchema: tool.outputSchema ?? tool.output_schema,
|
|
111
|
+
tags: tool.tags,
|
|
112
|
+
};
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
/** Probe an MCP streamable-HTTP endpoint for an OAuth challenge. */
|
|
116
|
+
async function probeMCPServerAuth(serverUrl) {
|
|
117
|
+
const initializeBody = {
|
|
118
|
+
jsonrpc: "2.0",
|
|
119
|
+
id: 1,
|
|
120
|
+
method: "initialize",
|
|
121
|
+
params: {
|
|
122
|
+
protocolVersion: "2025-03-26",
|
|
123
|
+
capabilities: {},
|
|
124
|
+
clientInfo: { name: "atk-probe", version: "1.0.0" },
|
|
125
|
+
},
|
|
126
|
+
};
|
|
127
|
+
try {
|
|
128
|
+
await axios_1.default.post(serverUrl, initializeBody, {
|
|
129
|
+
timeout: 10000,
|
|
130
|
+
headers: {
|
|
131
|
+
"Content-Type": "application/json",
|
|
132
|
+
Accept: "application/json, text/event-stream",
|
|
133
|
+
},
|
|
134
|
+
});
|
|
135
|
+
return { requiresAuth: false };
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
if (error?.response?.status === 401 || error?.status === 401) {
|
|
139
|
+
const wwwAuth = error?.response?.headers?.["www-authenticate"];
|
|
140
|
+
let authMetadataUrl;
|
|
141
|
+
if (wwwAuth) {
|
|
142
|
+
const match = wwwAuth.match(/resource_metadata=\s*"([^"]+)"/);
|
|
143
|
+
if (match) {
|
|
144
|
+
authMetadataUrl = match[1];
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return { requiresAuth: true, authMetadataUrl };
|
|
148
|
+
}
|
|
149
|
+
return { requiresAuth: false };
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
/** Resolve OAuth endpoints from MCP resource or authorization-server metadata. */
|
|
153
|
+
async function resolveMCPOAuthMetadata(authMetadataUrl, wellKnownUrl) {
|
|
154
|
+
let resolvedWellKnownUrl = wellKnownUrl;
|
|
155
|
+
if (!resolvedWellKnownUrl) {
|
|
156
|
+
if (!authMetadataUrl) {
|
|
157
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthMetadataUrlNotFound"));
|
|
158
|
+
}
|
|
159
|
+
const response = await axios_1.default.get(authMetadataUrl);
|
|
160
|
+
if (response.status === 200 &&
|
|
161
|
+
response.data &&
|
|
162
|
+
response.data.authorization_servers &&
|
|
163
|
+
response.data.authorization_servers.length > 0) {
|
|
164
|
+
const mcpServerMetadataUrl = response.data.authorization_servers[0];
|
|
165
|
+
const serverUrl = new URL(mcpServerMetadataUrl);
|
|
166
|
+
const serverPath = serverUrl.pathname === "/" ? "" : serverUrl.pathname;
|
|
167
|
+
resolvedWellKnownUrl = `${serverUrl.protocol}//${serverUrl.host}/.well-known/oauth-authorization-server${serverPath}`;
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpServerMetadataUrlNotFound"));
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
const metadataResponse = await axios_1.default.get(resolvedWellKnownUrl);
|
|
174
|
+
const authorizationUrl = metadataResponse.data?.authorization_endpoint;
|
|
175
|
+
const tokenUrl = metadataResponse.data?.token_endpoint;
|
|
176
|
+
const refreshUrl = metadataResponse.data?.refresh_endpoint;
|
|
177
|
+
if (!authorizationUrl || !tokenUrl) {
|
|
178
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.authUrlNotFound"));
|
|
179
|
+
}
|
|
180
|
+
return { authorizationUrl, tokenUrl, refreshUrl, wellKnownUrl: resolvedWellKnownUrl };
|
|
181
|
+
}
|
|
182
|
+
//# sourceMappingURL=mcpToolFetcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcpToolFetcher.js","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import * as childProcess from "child_process";
|
|
2
|
+
export declare const odrProviderDeps: {
|
|
3
|
+
getPlatform: () => string;
|
|
4
|
+
exec: typeof childProcess.exec;
|
|
5
|
+
logError: (...args: unknown[]) => void;
|
|
6
|
+
};
|
|
7
|
+
export declare const logError: (...args: unknown[]) => void;
|
|
8
|
+
export interface ODRServer {
|
|
9
|
+
name: string;
|
|
10
|
+
display_name: string;
|
|
11
|
+
description: string;
|
|
12
|
+
version: string;
|
|
13
|
+
identifier: string;
|
|
14
|
+
tools: ODRTool[];
|
|
15
|
+
packageFamily: string;
|
|
16
|
+
command: string;
|
|
17
|
+
args: string[];
|
|
18
|
+
}
|
|
19
|
+
export interface ODRTool {
|
|
20
|
+
name: string;
|
|
21
|
+
description: string;
|
|
22
|
+
inputSchema: ODRToolSchema;
|
|
23
|
+
outputSchema?: ODRToolSchema;
|
|
24
|
+
_meta?: unknown;
|
|
25
|
+
}
|
|
26
|
+
export interface ODRToolSchema {
|
|
27
|
+
type: "object";
|
|
28
|
+
properties?: Record<string, ODRToolParameterSchema>;
|
|
29
|
+
required?: string[];
|
|
30
|
+
[key: string]: unknown;
|
|
31
|
+
}
|
|
32
|
+
export interface ODRToolParameterSchema {
|
|
33
|
+
type?: string;
|
|
34
|
+
enum?: unknown[];
|
|
35
|
+
[key: string]: unknown;
|
|
36
|
+
}
|
|
37
|
+
export declare class ODRProvider {
|
|
38
|
+
static isODRServer(serverConfig: unknown): boolean;
|
|
39
|
+
static parseODRListOutput(jsonOutput: unknown): ODRServer[];
|
|
40
|
+
static listServers(): Promise<ODRServer[]>;
|
|
41
|
+
static getToolsForODRServer(command: string, args?: string[]): Promise<ODRTool[]>;
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=odrProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"odrProvider.d.ts","sourceRoot":"","sources":["../../src/common/odrProvider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAG9C,eAAO,MAAM,eAAe;uBACT,MAAM;;wBAEH,OAAO,EAAE,KAAG,IAAI;CACrC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,OAAO,EAAE,KAAG,IAAyC,CAAC;AAExF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACpD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAkHD,qBAAa,WAAW;IACtB,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO;IAUlD,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE;WAS9C,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;WAkBnC,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAQ5F"}
|