Skip to content

Python: support MCP skills of mcp-resource-template type#6648

Open
vaibhav-patel wants to merge 1 commit into
microsoft:mainfrom
vaibhav-patel:fix/6118-mcp-resource-template-skills
Open

Python: support MCP skills of mcp-resource-template type#6648
vaibhav-patel wants to merge 1 commit into
microsoft:mainfrom
vaibhav-patel:fix/6118-mcp-resource-template-skills

Conversation

@vaibhav-patel

Copy link
Copy Markdown

Summary

Adds support for the mcp-resource-template skill kind to the MCP skills source,
addressing #6118.

Per the SEP-2640 binding of Agent Skills Discovery v0.2.0, an mcp-resource-template
entry in skill://index.json omits name and carries an RFC 6570 URI template in
url (e.g. skill://docs/{product}/SKILL.md) that resolves to a SKILL.md resource
once its variables are bound. One template represents a family of skills — one per
variable binding. (Mirrors the .NET McpSkillIndexEntry contract in
Microsoft.Agents.AI.Mcp.)

Changes

  • New MCPSkillResourceTemplate (exported, experimental MCP_SKILLS):
    • variables — template variable names (RFC 6570 Level-1).
    • expand(variables) — simple string expansion; values percent-encoded so they can't
      inject path segments/schemes; errors on missing variables.
    • materialize(*, name, variables, description=None) — returns a concrete MCPSkill
      reusing existing fetch machinery.
  • MCPSkillsSource.get_resource_templates() — surfaces template entries separately
    from get_skills(). Concrete skills are not auto-materialized at discovery because the
    variable values aren't in the index; callers bind them explicitly. get_skills()
    behavior is unchanged.
  • Tests: 17 new covering variable extraction, expansion/encoding/error paths,
    materialize, discovery, and end-to-end resolution.

Open design question (for maintainers)

Auto-enumerating concrete skills during discovery requires a source of variable values
(host/user config, or resources/templates/list + completion). That decision is left open
intentionally; this PR provides the parsing, validation, and explicit-materialization
primitives. Happy to extend with an auto-materialization strategy once the sourcing
approach is decided. This also keeps Python aligned with .NET #6117, which currently skips
templates as well.

Verification

  • uv run pytest packages/core/tests/core/test_mcp_skills.py → 68 passed.
  • ruff check / ruff format --check clean on changed files.

Addresses #6118.

Add support for the `mcp-resource-template` skill kind in the MCP skills
source. Per the SEP-2640 binding of the Agent Skills Discovery v0.2.0
schema, an `mcp-resource-template` index entry omits `name` and carries an
RFC 6570 URI template in `url` (e.g. `skill://docs/{product}/SKILL.md`)
that resolves to a `SKILL.md` resource once its variables are bound. One
template stands in for a family of skills, one per variable binding.

Introduce `MCPSkillResourceTemplate`, which parses such an entry, exposes
its template variables, and materializes a concrete `MCPSkill` from an
explicit variable binding (RFC 6570 Level-1 simple string expansion, with
values percent-encoded so they cannot inject extra path segments).

`MCPSkillsSource` gains `get_resource_templates()`, which surfaces template
entries separately from `get_skills()`. Concrete skills are not
auto-materialized during discovery because the template variable values are
not part of the index; callers bind them explicitly via `materialize()`.
This keeps `get_skills()` behavior unchanged (template entries remain
excluded from the concrete skill list).

Addresses microsoft#6118.
Copilot AI review requested due to automatic review settings June 20, 2026 11:30
@moonbox3 moonbox3 added the python Issues related to the Python codebase label Jun 20, 2026
@microsoft-github-policy-service

Copy link
Copy Markdown

@vaibhav-patel please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds Python support for MCP skill index entries of type mcp-resource-template (RFC 6570 URI templates) by introducing a resource-template abstraction and a parallel discovery path that surfaces templates separately from concrete skills.

Changes:

  • Introduces MCPSkillResourceTemplate with variable extraction, safe URI expansion (percent-encoding), and explicit materialize() to produce concrete MCPSkill instances.
  • Extends MCPSkillsSource with get_resource_templates() to discover template entries without auto-materializing skills.
  • Adds unit tests covering template parsing/expansion/materialization and discovery behavior, and exports the new type from agent_framework.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
python/packages/core/agent_framework/_skills.py Adds MCPSkillResourceTemplate and MCPSkillsSource.get_resource_templates() to support discovery/materialization of mcp-resource-template entries.
python/packages/core/agent_framework/init.py Exports MCPSkillResourceTemplate from the package surface (__all__ + imports).
python/packages/core/tests/core/test_mcp_skills.py Adds tests for template behavior and for discovering templates separately from concrete skills.

Comment on lines +3652 to +3657
if not url_template or not url_template.strip():
raise ValueError("url_template cannot be empty.")

self.description = description
self.url_template = url_template
self._client = client
Comment on lines +709 to +713
def test_empty_url_template_raises(self) -> None:
client = AsyncMock()
with pytest.raises(ValueError, match="url_template cannot be empty"):
MCPSkillResourceTemplate(description="docs", url_template=" ", client=client)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

python Issues related to the Python codebase

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants