Commit 9ff24d0
Merge origin/main into halter73/remove-session-id-draft
Brings in PR #1579 SEP-2663 Tasks (squash dbb7a20), SEP-990 Enterprise
Managed Authorization (8202bcc), SEP-2243 alignment (ed19286), ttlMs
renames in McpSessionHandler (711e5bb), and several quality-of-life
fixes that landed between the previous merge and today.
Conflict resolutions:
- src/ModelContextProtocol.Core/McpJsonUtilities.cs: keep both sides'
JsonSerializable additions. Our draft additions (JsonElement,
Implementation, ClientCapabilities, ServerCapabilities, LoggingLevel)
coexist with origin/main's IDictionary<string,object> addition.
- src/ModelContextProtocol.Core/Protocol/NotificationMethods.cs: take
origin/main's renamed TaskStatusNotification value ('notifications/tasks',
formerly 'notifications/tasks/status') and the updated XML docs from
PR #1579. Keep all our draft additions (RelatedTaskMetaKey,
SubscriptionsAcknowledgedNotification, ProtocolVersionMetaKey,
ClientInfoMetaKey, ClientCapabilitiesMetaKey, LogLevelMetaKey,
SubscriptionIdMetaKey).
- tests/ModelContextProtocol.AspNetCore.Tests/HttpTaskIntegrationTests.cs:
removed. Our pre-rebase tweak to the old SEP-1686 file is moot now
that PR #1579's reimplementation deleted it; the new task tests live
elsewhere.
PR #1579 author addressed the reconciliation items predicted in the
preview-merge analysis: '17f95f79 Fix _meta' nests tasks opt-in inside
the SEP-2575 capabilities envelope (preview commit 89295fb3 no longer
needed); '8b47086d Address PR feedback' fixes Failed task payload shape +
JsonDocument lifetime (preview commit 8817c9fc no longer needed);
'0b8944f9 Address PR feedback: docs' adds the IMcpTaskStore lifetime/
stateless docs (preview commit 072222db no longer needed). The only
preview reconciliation that may still be required is gating per-request
capability merge to stateful sessions only (preview commit 8b95d2ca),
which is evaluated separately after this merge by re-running
StatelessServerTests.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>121 files changed
Lines changed: 8945 additions & 11881 deletions
File tree
- docs
- concepts
- stateless
- tasks
- samples
- LongRunningTasks
- Properties
- Tools
- TasksExtension
- src
- Common
- ModelContextProtocol.Core
- Client
- Protocol
- Server
- ModelContextProtocol
- tests
- Common/Utils
- ModelContextProtocol.AspNetCore.Tests
- ModelContextProtocol.TestServer
- ModelContextProtocol.TestSseServer
- 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.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | 48 | | |
50 | 49 | | |
51 | 50 | | |
52 | 51 | | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| |||
Large diffs are not rendered by default.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
| 29 | + | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
0 commit comments