V0.11.x (#199)
* Support 2025-06-18 Spec (#167) * Support OpenAI _meta for Tool * Update init * Add title and outputSchema * Concurreny issue * General fields * Add Generate Fields to Server elements * 4 tab spacing * Update Version * Elicitation * Format * More tests and inits * Elicitation in README * Fix orphaned test * Add title to more structs * Public init * Fix meta validation and make tests more generic * Format and make Result properties public again * Revert more visibility changes * feat: 2025-11-25 phase 1, includes Version, Icon, Progress (#181) * chore: fixed unit tests * feat: added icon and progess base structs * feat: added progress notification and meta to callTool * feat: added tests * feat: simplified RequestMeta encoding/decoding * tests: added unit test to track progress * chore: rebased v0.11.x * feat: implemented cancellation * feat: added overloaded callTool method * fix: encoding Response _meta fix * chore: added old version to the versions list * feat: 2025-11-25 phase 2; added Logging and Completions (#196) * feat: added Logging and Completions * feat: updated EmbeddedResource for the latest spec * chore: changed encoding of meta in Prompts to encodeIfPresent * feat: compliance tests + http server transport (#197) * feat: http server transport * feat: added http server transport * feat: removed unused files * feat: added conformance tests * feat: improved conformace testing * chore: removed redundant files * feat/2025-11-25: sampling, elicitation, roots (#198) * feat: Roots implementation * feat: added unit testing * feat: improved unit tests and fixed NetworkTransport crash * feat: implemented sampling and elicitation * feat: improved sampling tests * feat: improved elicitation tests * feat: improved confirmance tests * feat: improved Prompts unit tests * feat: removed test code * feat: updated conformance tests * chore: removed redundant commas * chore: removed 6.0.3 swift version from ci * chore: improved unit tests a little bit * chore: update README.md * chore: add server progress tracking example to README.md * chore: updated README.md * chore: updated transports table formatting * chore: updated MockNetworkConnection --------- Co-authored-by: Austin Evans <austinjevans@me.com> Co-authored-by: yehorsobko <yehorsobko@macpaw.com>
This commit is contained in:
parent
6fa1a97b41
commit
6112a3995a
1 changed files with 11854 additions and 828 deletions
|
|
@ -6,6 +6,25 @@ import Foundation
|
|||
@preconcurrency import SystemPackage
|
||||
#endif
|
||||
|
||||
/// Information about a required URL elicitation
|
||||
public struct URLElicitationInfo: Codable, Hashable, Sendable {
|
||||
/// Elicitation mode (must be "url")
|
||||
public var mode: String
|
||||
/// Unique identifier for this elicitation
|
||||
public var elicitationId: String
|
||||
/// URL for the user to visit
|
||||
public var url: String
|
||||
/// Message describing the elicitation
|
||||
public var message: String
|
||||
|
||||
public init(mode: String = "url", elicitationId: String, url: String, message: String) {
|
||||
self.mode = mode
|
||||
self.elicitationId = elicitationId
|
||||
self.url = url
|
||||
self.message = message
|
||||
}
|
||||
}
|
||||
|
||||
/// A model context protocol error.
|
||||
public enum MCPError: Swift.Error, Sendable {
|
||||
// Standard JSON-RPC 2.0 errors (-32700 to -32603)
|
||||
|
|
@ -18,6 +37,9 @@ public enum MCPError: Swift.Error, Sendable {
|
|||
// Server errors (-32000 to -32099)
|
||||
case serverError(code: Int, message: String)
|
||||
|
||||
// MCP specific errors
|
||||
case urlElicitationRequired(message: String, elicitations: [URLElicitationInfo]) // -32042
|
||||
|
||||
// Transport specific errors
|
||||
case connectionClosed
|
||||
case transportError(Swift.Error)
|
||||
|
|
@ -31,6 +53,7 @@ public enum MCPError: Swift.Error, Sendable {
|
|||
case .invalidParams: return -32602
|
||||
case .internalError: return -32603
|
||||
case .serverError(let code, _): return code
|
||||
case .urlElicitationRequired: return -32042
|
||||
case .connectionClosed: return -32000
|
||||
case .transportError: return -32001
|
||||
}
|
||||
|
|
@ -68,6 +91,8 @@ extension MCPError: LocalizedError {
|
|||
return "Internal error" + (detail.map { ": \($0)" } ?? "")
|
||||
case .serverError(_, let message):
|
||||
return "Server error: \(message)"
|
||||
case .urlElicitationRequired(let message, _):
|
||||
return "URL elicitation required: \(message)"
|
||||
case .connectionClosed:
|
||||
return "Connection closed"
|
||||
case .transportError(let error):
|
||||
|
|
@ -89,6 +114,8 @@ extension MCPError: LocalizedError {
|
|||
return "Internal JSON-RPC error"
|
||||
case .serverError:
|
||||
return "Server-defined error occurred"
|
||||
case .urlElicitationRequired:
|
||||
return "The server requires user authentication or input via external URL"
|
||||
case .connectionClosed:
|
||||
return "The connection to the server was closed"
|
||||
case .transportError(let error):
|
||||
|
|
@ -106,6 +133,11 @@ extension MCPError: LocalizedError {
|
|||
return "Check the method name and ensure it is supported by the server"
|
||||
case .invalidParams:
|
||||
return "Verify the parameters match the method's expected parameters"
|
||||
case .urlElicitationRequired(_, let elicitations):
|
||||
if let first = elicitations.first {
|
||||
return "Visit \(first.url) to complete the required authentication or input"
|
||||
}
|
||||
return "Complete the required URL-based elicitation"
|
||||
case .connectionClosed:
|
||||
return "Try reconnecting to the server"
|
||||
default:
|
||||
|
|
@ -154,6 +186,20 @@ extension MCPError: Codable {
|
|||
case .serverError(_, _):
|
||||
// No additional data for server errors
|
||||
break
|
||||
case .urlElicitationRequired(_, let elicitations):
|
||||
// Encode elicitations array as structured data
|
||||
let elicitationsData = elicitations.map { info -> [String: Value] in
|
||||
return [
|
||||
"mode": .string(info.mode),
|
||||
"elicitationId": .string(info.elicitationId),
|
||||
"url": .string(info.url),
|
||||
"message": .string(info.message)
|
||||
]
|
||||
}
|
||||
try container.encode(
|
||||
["elicitations": Value.array(elicitationsData.map { .object($0) })],
|
||||
forKey: .data
|
||||
)
|
||||
case .connectionClosed:
|
||||
break
|
||||
case .transportError(let error):
|
||||
|
|
@ -188,6 +234,25 @@ extension MCPError: Codable {
|
|||
self = .invalidParams(unwrapDetail(message))
|
||||
case -32603:
|
||||
self = .internalError(unwrapDetail(nil))
|
||||
case -32042:
|
||||
// Extract elicitations array from data
|
||||
var elicitations: [URLElicitationInfo] = []
|
||||
if case .array(let items) = data?["elicitations"] {
|
||||
for item in items {
|
||||
if case .object(let dict) = item,
|
||||
case .string(let mode) = dict["mode"],
|
||||
case .string(let elicitationId) = dict["elicitationId"],
|
||||
case .string(let url) = dict["url"],
|
||||
case .string(let msg) = dict["message"] {
|
||||
elicitations.append(URLElicitationInfo(
|
||||
mode: mode,
|
||||
elicitationId: elicitationId,
|
||||
url: url,
|
||||
message: msg))
|
||||
}
|
||||
}
|
||||
}
|
||||
self = .urlElicitationRequired(message: message, elicitations: elicitations)
|
||||
case -32000:
|
||||
self = .connectionClosed
|
||||
case -32001:
|
||||
|
|
@ -236,6 +301,9 @@ extension MCPError: Hashable {
|
|||
hasher.combine(detail)
|
||||
case .serverError(_, let message):
|
||||
hasher.combine(message)
|
||||
case .urlElicitationRequired(let message, let elicitations):
|
||||
hasher.combine(message)
|
||||
hasher.combine(elicitations)
|
||||
case .connectionClosed:
|
||||
break
|
||||
case .transportError(let error):
|
||||
|
|
|
|||
Loading…
Reference in a new issue