Skip to content

Commit e96b66f

Browse files
KKonstantinovKKonstantinov
authored
Merge branch 'main' into chore/task-refactors-1
2 parents 61b07db + cce3ac7 commit e96b66f

23 files changed

Lines changed: 329 additions & 56 deletions

File tree

‎.changeset/abort-handlers-on-close.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@modelcontextprotocol/core': patch
3+
---
4+
5+
Abort in-flight request handlers when the connection closes. Previously, request handlers would continue running after the transport disconnected, wasting resources and preventing proper cleanup. Also fixes `InMemoryTransport.close()` firing `onclose` twice on the initiating side.

‎.changeset/add-resource-size-field.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@modelcontextprotocol/core': patch
3+
---
4+
5+
Add missing `size` field to `ResourceSchema` to match the MCP specification

‎.changeset/finish-sdkerror-capability.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@modelcontextprotocol/core': patch
3+
'@modelcontextprotocol/client': patch
4+
'@modelcontextprotocol/server': patch
5+
---
6+
7+
Convert remaining capability-assertion throws to `SdkError(SdkErrorCode.CapabilityNotSupported, ...)`. Follow-up to #1454 which missed `Client.assertCapability()`, the task capability helpers in `experimental/tasks/helpers.ts`, and the sampling/elicitation capability checks in `experimental/tasks/server.ts`.

‎.changeset/stdio-skip-non-json.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@modelcontextprotocol/core': patch
3+
---
4+
5+
`ReadBuffer.readMessage()` now silently skips non-JSON lines instead of throwing `SyntaxError`. This prevents noisy `onerror` callbacks when hot-reload tools (tsx, nodemon) write debug output like "Gracefully restarting..." to stdout. Lines that parse as JSON but fail JSONRPC schema validation still throw.

‎.github/workflows/conformance.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
runs-on: ubuntu-latest
1919
continue-on-error: true
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
- name: Install pnpm
23-
uses: pnpm/action-setup@v4
23+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
2424
with:
2525
run_install: false
26-
- uses: actions/setup-node@v4
26+
- uses: actions/setup-node@v6
2727
with:
2828
node-version: 24
2929
cache: pnpm
@@ -36,12 +36,12 @@ jobs:
3636
runs-on: ubuntu-latest
3737
continue-on-error: true
3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v6
4040
- name: Install pnpm
41-
uses: pnpm/action-setup@v4
41+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
4242
with:
4343
run_install: false
44-
- uses: actions/setup-node@v4
44+
- uses: actions/setup-node@v6
4545
with:
4646
node-version: 24
4747
cache: pnpm

‎.github/workflows/deploy-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
url: ${{ steps.deployment.outputs.page_url }}
2626

2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v6
2929

3030
- name: Install pnpm
31-
uses: pnpm/action-setup@v4
31+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
3232
with:
3333
run_install: false
34-
- uses: actions/setup-node@v4
34+
- uses: actions/setup-node@v6
3535
with:
3636
node-version: 24
3737
cache: pnpm

‎.github/workflows/main.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v6
2020

2121
- name: Install pnpm
22-
uses: pnpm/action-setup@v4
22+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
2323
id: pnpm-install
2424
with:
2525
run_install: false
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@v6
4545

4646
- name: Install pnpm
47-
uses: pnpm/action-setup@v4
47+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
4848
id: pnpm-install
4949
with:
5050
run_install: false
@@ -71,7 +71,7 @@ jobs:
7171
steps:
7272
- uses: actions/checkout@v6
7373
- name: Install pnpm
74-
uses: pnpm/action-setup@v4
74+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
7575
with:
7676
run_install: false
7777
- uses: actions/setup-node@v6
@@ -81,12 +81,12 @@ jobs:
8181
cache-dependency-path: pnpm-lock.yaml
8282
- name: Set up Bun
8383
if: matrix.runtime == 'bun'
84-
uses: oven-sh/setup-bun@v2
84+
uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
8585
with:
8686
bun-version: ${{ matrix.version }}
8787
- name: Set up Deno
8888
if: matrix.runtime == 'deno'
89-
uses: denoland/setup-deno@v2
89+
uses: denoland/setup-deno@667a34cdef165d8d2b2e98dde39547c9daac7282 # v2
9090
with:
9191
deno-version: ${{ matrix.version }}
9292
- run: pnpm install
@@ -105,14 +105,14 @@ jobs:
105105
id-token: write
106106

107107
steps:
108-
- uses: actions/checkout@v4
108+
- uses: actions/checkout@v6
109109

110110
- name: Install pnpm
111-
uses: pnpm/action-setup@v4
111+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
112112
id: pnpm-install
113113
with:
114114
run_install: false
115-
- uses: actions/setup-node@v4
115+
- uses: actions/setup-node@v6
116116
with:
117117
node-version: 24
118118
cache: pnpm

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v6
2020

2121
- name: Install pnpm
22-
uses: pnpm/action-setup@v4
22+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
2323
with:
2424
run_install: false
2525

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v6
2020

2121
- name: Install pnpm
22-
uses: pnpm/action-setup@v4
22+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
2323
with:
2424
run_install: false
2525

@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Create Release Pull Request or Publish to npm
3838
id: changesets
39-
uses: changesets/action@v1
39+
uses: changesets/action@6a0a831ff30acef54f2c6aa1cbbc1096b066edaf # v1
4040
with:
4141
publish: pnpm run build:all && pnpm changeset publish
4242
env:

‎.github/workflows/update-spec-types.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v6
1919

2020
- name: Install pnpm
21-
uses: pnpm/action-setup@v4
21+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
2222
id: pnpm-install
2323
with:
2424
run_install: false

0 commit comments

Comments
 (0)