Resolve merge conflicts and fix critical mcp security vulnerabilities #3223
+51
−54
Conversation
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
Fixes CI failures in PR #3220. PR #3220 updated `mcp` library from 1.0.0 to 1.23.0, which caused test failures due to a breaking change in `McpError` constructor API. The `McpError` constructor now expects an `ErrorData` object instead of a plain string message. This commit fixes the usage in `get_zoneinfo()` function to use `ErrorData(code=INVALID_PARAMS, message=...)`. ```console Error before fix: AttributeError: 'str' object has no attribute 'message' ``` Also updates `mcp` dependency to >=1.23.0 in pyproject.toml to ensure compatibility with the new API.
fix(time): Fix `McpError` constructor usage in time server
Co-authored-by: olaservo <[email protected]>
Co-authored-by: olaservo <[email protected]>
Co-authored-by: olaservo <[email protected]>
Author
|
Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details. Warning Firewall rules blocked me from connecting to one or more addresses (expand for details)I tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
Copilot
AI
changed the title
[WIP] Bump uv group across multiple directories with updates
Resolve merge conflicts and fix critical mcp security vulnerabilities
Jan 17, 2026
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.
Description
Resolves merge conflicts from Dependabot PR and addresses three critical security vulnerabilities in the
mcpdependency by updating all packages tomcp>=1.23.0.Security vulnerabilities fixed:
Changes:
origin/maincontaining PR fix(time): FixMcpErrorconstructor usage in time server #3222'sMcpErrorAPI fixpyproject.tomlfor all packages:src/time,src/git,src/fetchmcp 1.1.0 → 1.25.0(git),mcp 1.2.0 → 1.25.0(fetch)McpError(ErrorData(...))constructor fix insrc/time/src/mcp_server_time/server.pyServer Details
Motivation and Context
Dependabot PR conflicted with main branch after PR #3222 merged. Main branch already contained necessary security updates and API compatibility fixes for mcp 1.23.0's breaking changes. Lock files still referenced vulnerable versions despite
pyproject.tomlupdates.How Has This Been Tested?
Breaking Changes
None. Changes maintain backward compatibility while fixing security issues.
Types of changes
Checklist
Additional context
The
McpErrorconstructor in mcp 1.23.0 requiresErrorDataobjects instead of plain strings. Time server updated via main merge; fetch server already compliant; git server does not useMcpError.✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.