Commit 12c522f
Merge upstream/main; integrate tasks input-requests with MRTR types
Merges upstream/main which includes the MRTR landing (SEP-2322, #1458).
Replaces the tasks PR's ad-hoc IDictionary<string, JsonElement> input-request/response envelopes with MRTR's typed InputRequest/InputResponse DTOs. Wire format is unchanged; this simply reuses the shared MRTR types across the tasks/get, tasks/update, and notifications/tasks paths so the two extensions share a single set of typed types.
Conflict resolutions:
- McpServerImpl.cs: combined task cancellation infrastructure with MRTR continuations; rethrow InputRequiredException from BuildInitialCallToolFilter/BuildInitialTaskToolFilter so the MRTR backcompat resolver (InvokeWithInputRequiredResultHandlingAsync) can catch it.
- McpClientImpl.cs: collapsed the duplicate JsonElement-typed ResolveInputRequestsAsync into MRTR's typed override.
- McpServer.Methods.cs: SendRequestViaTaskAsync now stores an InputRequest and unwraps InputResponse via Deserialize<T>(typeInfo).
- UpdateTaskRequestParams: drops the redeclared InputResponses property and uses the inherited RequestParams.InputResponses from MRTR.
- Result.cs: includes the 'task' resultType value alongside MRTR's 'complete' and 'input_required'.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>93 files changed
Lines changed: 8022 additions & 460 deletions
File tree
- .github
- skills
- bump-version
- references
- prepare-release
- publish-release
- workflows
- docs/concepts
- elicitation
- mrtr
- roots
- sampling
- transports
- src
- Common
- ModelContextProtocol.AspNetCore
- ModelContextProtocol.Core
- Authentication
- Client
- Protocol
- Server
- tests
- Common/Utils
- ModelContextProtocol.AspNetCore.Tests
- OAuth
- ModelContextProtocol.ConformanceServer
- Prompts
- Tools
- ModelContextProtocol.TestOAuthServer
- ModelContextProtocol.Tests
- Client
- Configuration
- Protocol
- Server
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 10 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
23 | 32 | | |
24 | 33 | | |
25 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
| 12 | + | |
11 | 13 | | |
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
17 | | - | |
| 19 | + | |
18 | 20 | | |
| 21 | + | |
19 | 22 | | |
20 | | - | |
| 23 | + | |
21 | 24 | | |
22 | | - | |
| 25 | + | |
23 | 26 | | |
24 | 27 | | |
25 | 28 | | |
| |||
40 | 43 | | |
41 | 44 | | |
42 | 45 | | |
43 | | - | |
| 46 | + | |
44 | 47 | | |
45 | | - | |
46 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
47 | 54 | | |
48 | 55 | | |
49 | 56 | | |
50 | | - | |
| 57 | + | |
51 | 58 | | |
52 | 59 | | |
53 | 60 | | |
54 | | - | |
| 61 | + | |
55 | 62 | | |
56 | | - | |
| 63 | + | |
| 64 | + | |
57 | 65 | | |
58 | 66 | | |
59 | 67 | | |
60 | 68 | | |
61 | 69 | | |
62 | | - | |
| 70 | + | |
63 | 71 | | |
64 | 72 | | |
65 | 73 | | |
| |||
Lines changed: 25 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
66 | 84 | | |
67 | 85 | | |
68 | 86 | | |
| |||
83 | 101 | | |
84 | 102 | | |
85 | 103 | | |
| 104 | + | |
86 | 105 | | |
87 | 106 | | |
88 | 107 | | |
| |||
0 commit comments