Skip to content

Commit 1638750

Browse files
committed
Merge branch 'main' into adamj/collapsible-toc
Resolved conflicts by: - Keeping collapsible TOC from this branch - Keeping TypeScript/tsx approach from this branch (npx -y tsx) - Adopting main's stdio transport instead of HTTP for quickstart - Adopting main's content organization and improvements - Accepting all example server changes from main
2 parents f566bdb + 29b65b0 commit 1638750

File tree

103 files changed

+38996
-40652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+38996
-40652
lines changed

.github/workflows/main.yml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
on:
2-
push:
3-
branches:
4-
- main
5-
pull_request:
6-
release:
7-
types: [published]
2+
push:
3+
branches:
4+
- main
5+
pull_request:
6+
release:
7+
types: [published]
88

99
concurrency:
10-
group: ${{ github.workflow }}-${{ github.ref }}
11-
cancel-in-progress: true
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
1212

1313
jobs:
14-
build:
15-
runs-on: ubuntu-latest
16-
17-
steps:
18-
- uses: actions/checkout@v4
19-
- uses: actions/setup-node@v4
20-
with:
21-
node-version: 18
22-
cache: npm
23-
24-
- run: npm ci
25-
- run: npm run build
26-
- run: npm test
27-
- run: npm run lint
28-
29-
publish:
30-
runs-on: ubuntu-latest
31-
if: github.event_name == 'release'
32-
environment: release
33-
needs: build
34-
35-
permissions:
36-
contents: read
37-
id-token: write
38-
39-
steps:
40-
- uses: actions/checkout@v4
41-
- uses: actions/setup-node@v4
42-
with:
43-
node-version: 18
44-
cache: npm
45-
registry-url: 'https://registry.npmjs.org'
46-
47-
- run: npm ci
48-
49-
- run: npm publish --provenance --access public
50-
env:
51-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-node@v4
20+
with:
21+
node-version: 18
22+
cache: npm
23+
24+
- run: npm ci
25+
- run: npm run build
26+
- run: npm test
27+
- run: npm run lint
28+
29+
publish:
30+
runs-on: ubuntu-latest
31+
if: github.event_name == 'release'
32+
environment: release
33+
needs: build
34+
35+
permissions:
36+
contents: read
37+
id-token: write
38+
39+
steps:
40+
- uses: actions/checkout@v4
41+
- uses: actions/setup-node@v4
42+
with:
43+
node-version: 18
44+
cache: npm
45+
registry-url: 'https://registry.npmjs.org'
46+
47+
- run: npm ci
48+
49+
- run: npm publish --provenance --access public
50+
env:
51+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.prettierignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Ignore artifacts:
2+
build
3+
dist
4+
coverage
5+
*-lock.*
6+
node_modules
7+
**/build
8+
**/dist
9+
.github/CODEOWNERS
10+
pnpm-lock.yaml

.prettierrc.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"printWidth": 140,
3+
"tabWidth": 4,
4+
"useTabs": false,
5+
"semi": true,
6+
"singleQuote": true,
7+
"trailingComma": "none",
8+
"bracketSpacing": true,
9+
"bracketSameLine": false,
10+
"proseWrap": "always",
11+
"arrowParens": "avoid",
12+
"overrides": [
13+
{
14+
"files": "**/*.md",
15+
"options": {
16+
"printWidth": 280
17+
}
18+
}
19+
]
20+
}

CODE_OF_CONDUCT.md

Lines changed: 34 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -2,127 +2,82 @@
22

33
## Our Pledge
44

5-
We as members, contributors, and leaders pledge to make participation in our
6-
community a harassment-free experience for everyone, regardless of age, body
7-
size, visible or invisible disability, ethnicity, sex characteristics, gender
8-
identity and expression, level of experience, education, socio-economic status,
9-
nationality, personal appearance, race, religion, or sexual identity
10-
and orientation.
5+
We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience,
6+
education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
117

12-
We pledge to act and interact in ways that contribute to an open, welcoming,
13-
diverse, inclusive, and healthy community.
8+
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
149

1510
## Our Standards
1611

17-
Examples of behavior that contributes to a positive environment for our
18-
community include:
12+
Examples of behavior that contributes to a positive environment for our community include:
1913

20-
* Demonstrating empathy and kindness toward other people
21-
* Being respectful of differing opinions, viewpoints, and experiences
22-
* Giving and gracefully accepting constructive feedback
23-
* Accepting responsibility and apologizing to those affected by our mistakes,
24-
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
26-
overall community
14+
- Demonstrating empathy and kindness toward other people
15+
- Being respectful of differing opinions, viewpoints, and experiences
16+
- Giving and gracefully accepting constructive feedback
17+
- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
18+
- Focusing on what is best not just for us as individuals, but for the overall community
2719

2820
Examples of unacceptable behavior include:
2921

30-
* The use of sexualized language or imagery, and sexual attention or
31-
advances of any kind
32-
* Trolling, insulting or derogatory comments, and personal or political attacks
33-
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
35-
address, without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
37-
professional setting
22+
- The use of sexualized language or imagery, and sexual attention or advances of any kind
23+
- Trolling, insulting or derogatory comments, and personal or political attacks
24+
- Public or private harassment
25+
- Publishing others' private information, such as a physical or email address, without their explicit permission
26+
- Other conduct which could reasonably be considered inappropriate in a professional setting
3827

3928
## Enforcement Responsibilities
4029

41-
Community leaders are responsible for clarifying and enforcing our standards of
42-
acceptable behavior and will take appropriate and fair corrective action in
43-
response to any behavior that they deem inappropriate, threatening, offensive,
44-
or harmful.
30+
Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
4531

46-
Community leaders have the right and responsibility to remove, edit, or reject
47-
comments, commits, code, wiki edits, issues, and other contributions that are
48-
not aligned to this Code of Conduct, and will communicate reasons for moderation
49-
decisions when appropriate.
32+
Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
5033

5134
## Scope
5235

53-
This Code of Conduct applies within all community spaces, and also applies when
54-
an individual is officially representing the community in public spaces.
55-
Examples of representing our community include using an official e-mail address,
56-
posting via an official social media account, or acting as an appointed
57-
representative at an online or offline event.
36+
This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account,
37+
or acting as an appointed representative at an online or offline event.
5838

5939
## Enforcement
6040

61-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62-
reported to the community leaders responsible for enforcement at
63-
<mcp-coc@anthropic.com>.
64-
All complaints will be reviewed and investigated promptly and fairly.
41+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at <mcp-coc@anthropic.com>. All complaints will be reviewed and investigated promptly and fairly.
6542

66-
All community leaders are obligated to respect the privacy and security of the
67-
reporter of any incident.
43+
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
6844

6945
## Enforcement Guidelines
7046

71-
Community leaders will follow these Community Impact Guidelines in determining
72-
the consequences for any action they deem in violation of this Code of Conduct:
47+
Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
7348

7449
### 1. Correction
7550

76-
**Community Impact**: Use of inappropriate language or other behavior deemed
77-
unprofessional or unwelcome in the community.
51+
**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
7852

79-
**Consequence**: A private, written warning from community leaders, providing
80-
clarity around the nature of the violation and an explanation of why the
81-
behavior was inappropriate. A public apology may be requested.
53+
**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
8254

8355
### 2. Warning
8456

85-
**Community Impact**: A violation through a single incident or series
86-
of actions.
57+
**Community Impact**: A violation through a single incident or series of actions.
8758

88-
**Consequence**: A warning with consequences for continued behavior. No
89-
interaction with the people involved, including unsolicited interaction with
90-
those enforcing the Code of Conduct, for a specified period of time. This
91-
includes avoiding interactions in community spaces as well as external channels
92-
like social media. Violating these terms may lead to a temporary or
93-
permanent ban.
59+
**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as
60+
well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
9461

9562
### 3. Temporary Ban
9663

97-
**Community Impact**: A serious violation of community standards, including
98-
sustained inappropriate behavior.
64+
**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
9965

100-
**Consequence**: A temporary ban from any sort of interaction or public
101-
communication with the community for a specified period of time. No public or
102-
private interaction with the people involved, including unsolicited interaction
103-
with those enforcing the Code of Conduct, is allowed during this period.
104-
Violating these terms may lead to a permanent ban.
66+
**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is
67+
allowed during this period. Violating these terms may lead to a permanent ban.
10568

10669
### 4. Permanent Ban
10770

108-
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
110-
individual, or aggression toward or disparagement of classes of individuals.
71+
**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
11172

112-
**Consequence**: A permanent ban from any sort of public interaction within
113-
the community.
73+
**Consequence**: A permanent ban from any sort of public interaction within the community.
11474

11575
## Attribution
11676

117-
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118-
version 2.0, available at
119-
<https://www.contributor-covenant.org/version/2/0/code_of_conduct.html>.
77+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0, available at <https://www.contributor-covenant.org/version/2/0/code_of_conduct.html>.
12078

121-
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122-
enforcement ladder](https://github.com/mozilla/diversity).
79+
Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
12380

12481
[homepage]: https://www.contributor-covenant.org
12582

126-
For answers to common questions about this code of conduct, see the FAQ at
127-
<https://www.contributor-covenant.org/faq>. Translations are available at
128-
<https://www.contributor-covenant.org/translations>.
83+
For answers to common questions about this code of conduct, see the FAQ at <https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.

0 commit comments

Comments
 (0)