Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
`v2`: Errors refactor (ProtocolError, SdkError, OAuthError) by KKonstantinov · Pull Request #1454 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' `v2`: Errors refactor (ProtocolError, SdkError, OAuthError) by KKonstantinov · Pull Request #1454 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' `v2`: Errors refactor (ProtocolError, SdkError, OAuthError) by KKonstantinov · Pull Request #1454 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' `v2`: Errors refactor (ProtocolError, SdkError, OAuthError) by KKonstantinov · Pull Request #1454 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' `v2`: Errors refactor (ProtocolError, SdkError, OAuthError) by KKonstantinov · Pull Request #1454 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' `v2`: Errors refactor (ProtocolError, SdkError, OAuthError) by KKonstantinov · Pull Request #1454 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); `v2`: Errors refactor (ProtocolError, SdkError, OAuthError) by KKonstantinov · Pull Request #1454 · modelcontextprotocol/typescript-sdk · GitHub
Skip to content

v2: Errors refactor (ProtocolError, SdkError, OAuthError) - #1454

Merged
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor
Feb 3, 2026
Merged

v2: Errors refactor (ProtocolError, SdkError, OAuthError)#1454
KKonstantinov merged 9 commits into
modelcontextprotocol:mainfrom
KKonstantinov:feature/v2-error-refactor

Conversation

@KKonstantinov

@KKonstantinovKKonstantinov commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

Error Hierarchy Refactoring

This PR refactors the SDK's error system to create a clear distinction between protocol errors that cross the wire, local SDK errors, and OAuth errors.

Motivation and Context

The SDK previously used McpError with numeric codes (ErrorCode.RequestTimeout, ErrorCode.ConnectionClosed) for local timeout/connection errors. However, these errors never cross the wire as JSON-RPC responses - they are rejected locally. Using protocol error codes for local errors was semantically inconsistent.

Additionally, OAuth errors used many individual subclasses (e.g., InvalidClientError, InvalidGrantError, ServerError) that only differed in their error code. This was unnecessarily complex.

This change introduces a structured error hierarchy:

  • ProtocolError (renamed from McpError): For errors that are serialized and sent as JSON-RPC error responses
  • SdkError with SdkErrorCode enum: For local errors that are thrown/rejected locally and never leave the SDK
  • OAuthError with OAuthErrorCode enum: For OAuth-related errors (consolidated from many subclasses)
classDiagram
class Error {
+string message
+string name
}
class ProtocolError {
+number code
+string message
+unknown data
+toResponseObject()
+fromError()
}
class SdkError {
+SdkErrorCode code
+string message
+unknown data
}
class OAuthError {
+OAuthErrorCode code
+string message
+string errorUri
+toResponseObject()
+fromResponse()
}
class ProtocolErrorCode {
<<enumeration>>
ParseError = -32700
InvalidRequest = -32600
MethodNotFound = -32601
InvalidParams = -32602
InternalError = -32603
UrlElicitationRequired = -32042
}
class SdkErrorCode {
<<enumeration>>
NotConnected
AlreadyConnected
NotInitialized
CapabilityNotSupported
RequestTimeout
ConnectionClosed
SendFailed
}
class OAuthErrorCode {
<<enumeration>>
InvalidRequest
InvalidClient
InvalidGrant
UnauthorizedClient
...17 codes total
}
Error <|-- ProtocolError : extends
Error <|-- SdkError : extends
Error <|-- OAuthError : extends
ProtocolError --> ProtocolErrorCode : uses
SdkError --> SdkErrorCode : uses
OAuthError --> OAuthErrorCode : uses
note for ProtocolError "Crosses the wire as JSON-RPC error response"
note for SdkError "Local errors, never serialized"
note for OAuthError "OAuth 2.0 errors per RFC 6749"
Loading

How Has This Been Tested?

  • All existing tests pass (430+ core tests, 700+ integration tests)
  • Updated test assertions to use new error types
  • Verified typecheck passes across all packages

Breaking Changes

Yes, this is a breaking change. Users will need to update:

1. Protocol/SDK Error Changes

Imports: McpErrorProtocolError, ErrorCodeProtocolErrorCode

Error handling for timeouts/connection errors: Use SdkError with SdkErrorCode:

// Before:if(errorinstanceofMcpError&&error.code===ErrorCode.RequestTimeout){ ... }// After:if(errorinstanceofSdkError&&error.code===SdkErrorCode.RequestTimeout){ ... }

New SdkErrorCode enum values:

  • SdkErrorCode.NotConnected
  • SdkErrorCode.AlreadyConnected
  • SdkErrorCode.NotInitialized
  • SdkErrorCode.CapabilityNotSupported
  • SdkErrorCode.RequestTimeout
  • SdkErrorCode.ConnectionClosed
  • SdkErrorCode.SendFailed

2. OAuth Error Changes

Individual OAuth error classes replaced with single OAuthError class:

// Before:import{InvalidClientError,InvalidGrantError}from'@modelcontextprotocol/core';if(errorinstanceofInvalidClientError){ ... }// After:import{OAuthError,OAuthErrorCode}from'@modelcontextprotocol/core';if(errorinstanceofOAuthError&&error.code===OAuthErrorCode.InvalidClient){ ... }

Removed classes: InvalidRequestError, InvalidClientError, InvalidGrantError, UnauthorizedClientError, UnsupportedGrantTypeError, InvalidScopeError, AccessDeniedError, ServerError, TemporarilyUnavailableError, UnsupportedResponseTypeError, UnsupportedTokenTypeError, InvalidTokenError, MethodNotAllowedError, TooManyRequestsError, InvalidClientMetadataError, InsufficientScopeError, InvalidTargetError, CustomOAuthError

Removed constant: OAUTH_ERRORS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Checklist

  • I have read the MCP Documentation
  • My code follows the repository's style guidelines
  • New and existing tests pass locally
  • I have added appropriate error handling
  • I have added or updated documentation as needed

Additional context

Files changed:

  • packages/core/src/errors/sdkErrors.ts (new) - SdkError class and SdkErrorCode enum
  • packages/core/src/auth/errors.ts - Refactored to single OAuthError class with OAuthErrorCode enum
  • packages/core/src/types/types.ts - Renamed McpError → ProtocolError, ErrorCode → ProtocolErrorCode
  • packages/core/src/shared/protocol.ts - Use SdkError for timeouts/connection
  • packages/server/src/server/server.ts - Use SdkError for capability errors
  • packages/client/src/client/client.ts - Use SdkError for capability errors
  • packages/client/src/client/auth.ts - Updated to use OAuthError with OAuthErrorCode
  • Transport files - Use SdkError for "not connected" errors
  • docs/migration.md - Updated with error migration guide
  • docs/migration-SKILL.md - Updated with LLM-optimized migration tables

@KKonstantinov
KKonstantinov requested a review from a team as a code ownerFebruary 3, 2026 01:11
@changeset-bot

changeset-botBot commented Feb 3, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: f6f02e3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new

pkg-pr-newBot commented Feb 3, 2026

Copy link
Copy Markdown

Open in StackBlitz

@modelcontextprotocol/client

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/client@1454

@modelcontextprotocol/server

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/server@1454

@modelcontextprotocol/express

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/express@1454

@modelcontextprotocol/hono

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/hono@1454

@modelcontextprotocol/node

npm i https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/node@1454

commit: f6f02e3

@KKonstantinovKKonstantinov changed the title v2: Errors refactor (ProtocolError, SdkError)v2: Errors refactor (ProtocolError, SdkError, OAuthError)Feb 3, 2026
mattzcarey
mattzcarey previously approved these changes Feb 3, 2026

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mattzcareymattzcarey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@KKonstantinov
KKonstantinov merged commit 0f0a4eb into modelcontextprotocol:mainFeb 3, 2026
15 of 19 checks passed
felixweinberger added a commit that referenced this pull request Mar 25, 2026
Follow-up to #1454. Converts the 6 capability-assertion call sites that
were missed to throw SdkError(SdkErrorCode.CapabilityNotSupported, ...)
instead of plain Error:
- Client.assertCapability() in packages/client/src/client/client.ts
- assertToolsCallTaskCapability() in experimental/tasks/helpers.ts (2 throws)
- assertClientRequestTaskCapability() in experimental/tasks/helpers.ts (3 throws)
Fixes#430Closes#1329
Co-authored-by: Matteo Gobbo <info@matteogobbo.it>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@KKonstantinov@mattzcarey