resolved conflicts

Author: Agasthya Kasturi

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Applied 120 line-length rule to all files: https://github.com/modelcontextprotocol/python-sdk/pull/856
+543961968c0634e93d919d509cce23a1d6a56c21

.github/ISSUE_TEMPLATE/bug.yaml

@@ -0,0 +1,55 @@
+name: 🐛 MCP Python SDK Bug
+description: Report a bug or unexpected behavior in the MCP Python SDK
+labels: ["need confirmation"]
+
+body:
+  - type: markdown
+    attributes:
+      value: Thank you for contributing to the MCP Python SDK! ✊
+
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Initial Checks
+      description: Just making sure you're using the latest version of MCP Python SDK.
+      options:
+        - label: I confirm that I'm using the latest version of MCP Python SDK
+          required: true
+        - label: I confirm that I searched for my issue in https://github.com/modelcontextprotocol/python-sdk/issues before opening this issue
+          required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Please explain what you're seeing and what you would expect to see.
+
+        Please provide as much detail as possible to make understanding and solving your problem as quick as possible. 🙏
+    validations:
+      required: true
+
+  - type: textarea
+    id: example
+    attributes:
+      label: Example Code
+      description: >
+        If applicable, please add a self-contained,
+        [minimal, reproducible, example](https://stackoverflow.com/help/minimal-reproducible-example)
+        demonstrating the bug.
+
+      placeholder: |
+        from mcp.server.fastmcp import FastMCP
+
+        ...
+      render: Python
+
+  - type: textarea
+    id: version
+    attributes:
+      label: Python & MCP Python SDK
+      description: |
+        Which version of Python and MCP Python SDK are you using?
+      render: Text
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1 @@
+blank_issues_enabled: true

.github/ISSUE_TEMPLATE/config.yaml

@@ -0,0 +1,29 @@
+name: 🚀 MCP Python SDK Feature Request
+description: "Suggest a new feature for the MCP Python SDK"
+labels: ["feature request"]
+
+body:
+  - type: markdown
+    attributes:
+      value: Thank you for contributing to the MCP Python SDK! ✊
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Please give as much detail as possible about the feature you would like to suggest. 🙏
+
+        You might like to add:
+        * A demo of how code might look when using the feature
+        * Your use case(s) for the feature
+        * Reference to other projects that have a similar feature
+    validations:
+      required: true
+
+  - type: textarea
+    id: references
+    attributes:
+      label: References
+      description: |
+        Please add any links or references that might help us understand your feature request better. 📚

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -0,0 +1,33 @@
+name: ❓ MCP Python SDK Question
+description: "Ask a question about the MCP Python SDK"
+labels: ["question"]
+
+body:
+  - type: markdown
+    attributes:
+      value: Thank you for reaching out to the MCP Python SDK community! We're here to help! 🤝
+
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+      description: |
+        Please provide as much detail as possible about your question. 🙏
+
+        You might like to include:
+        * Code snippets showing what you've tried
+        * Error messages you're encountering (if any)
+        * Expected vs actual behavior
+        * Your use case and what you're trying to achieve
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: |
+        Please provide any additional context that might help us better understand your question, such as:
+        * Your MCP Python SDK version
+        * Your Python version
+        * Relevant configuration or environment details 📝

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,42 +4,28 @@ on:
   workflow_call:
 
 jobs:
-  format:
+  pre-commit:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
           version: 0.7.2
 
-      - name: Install the project
-        run: uv sync --frozen --all-extras --dev --python 3.12
-
-      - name: Run ruff format check
-        run: uv run --no-sync ruff check .
-
-  typecheck:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: uv sync --frozen --all-extras --python 3.10
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v3
+      - uses: pre-commit/[email protected]
         with:
-          enable-cache: true
-          version: 0.7.2
-
-      - name: Install the project
-        run: uv sync --frozen --all-extras --dev --python 3.12
-
-      - name: Run pyright
-        run: uv run --no-sync pyright
+          extra_args: --all-files --verbose
+        env:
+          SKIP: no-commit-to-branch
 
   test:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
@@ -55,7 +41,7 @@ jobs:
           version: 0.7.2
 
       - name: Install the project
-        run: uv sync --frozen --all-extras --dev --python ${{ matrix.python-version }}
+        run: uv sync --frozen --all-extras --python ${{ matrix.python-version }}
 
       - name: Run pytest
         run: uv run --no-sync pytest