fix(core): resolve MCP union ambiguity with discriminator#35389
Open
Nook127 wants to merge 1 commit into
Open
Conversation
Contributor
|
Thanks for your contribution! This PR doesn't have a linked issue. All PRs must reference an existing issue. Please:
See CONTRIBUTING.md for details. |
Contributor
|
Thanks for updating your PR! It now meets our contributing guidelines. 👍 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue for this PR
Closes #35359
Type of change
What does this PR do?
When MCP config entries include
enabledorenvironmentkeys, all CLI commands exit 1 with zero stdout/stderr. The root cause is a non-discriminatedSchema.Union([ConfigMCPV1.Info, Schema.Struct({ enabled: Schema.Boolean })])in themcpfield ofConfigV1.Info. Witherrors: "all"mode inConfigParse.schema, all union members are evaluated. When an entry hasenabled: true(also an optional field onLocal), both members match the input, creating an ambiguity that Effect Schema 4.0.0-beta.83 reports as a parse error. This throws anInvalidErrorinsideEffect.fnUntraced, becoming an uncaught defect that kills the process.Added
{ discriminator: "type" }to the outerSchema.Union. The discriminator routes entries withtype: "local"/"remote"unambiguously toConfigMCPV1.Info, while entries withouttypefall through to{ enabled: boolean }(used for config-layering disable overrides).How did you verify your code works?
The change is a one-line addition of
{ discriminator: "type" }annotation to an existingSchema.Union, following the exact same pattern already used byConfigMCPV1.Info(line 62 of mcp.ts). The discriminator makes the union unambiguous: entries withtyperoute exclusively toConfigMCPV1.Info, entries withouttypefall through to{ enabled: boolean }. The existingisMcpConfiguredcheck ("type" in entry) in the MCP service remains correct since the decoded output shape is unchanged.Checklist