Add MCP Client Plugin #123

heyitsaamir · 2025-09-03T03:58:40Z

Adds support for MCP clients in an MCP plugin. Makes use of the AI plugin system introduced in #121 .

Added new MCP package (packages/mcp/) with AI plugin and transport functionality
Updated chat prompt handling for MCP integration

This is roughly how the system works:

sequenceDiagram
      participant U as User
      participant CP as ChatPrompt
      participant P as MCP Plugin
      participant MCP as MCP Server
      participant M as AI Model

      U->>CP: send(input)

      CP->>P: on_build_functions(functions)
      P->>MCP: get_available_tools()
      MCP-->>P: tool_definitions
      P-->>CP: functions + mcp_tools

      CP->>M: generate_text(input, system, functions)

      alt Model calls MCP tool
          M-->>CP: function_call(mcp_tool, params)
          CP-->>M: function_result
      end

      M-->>CP: response
      CP-->>U: ChatSendResult

PR Dependency Tree

PR Add MCP Client Plugin #123 👈
- PR Create MCP Server #126

This tree was auto-generated by Charcoal

1. Initializes an AI package (should we call it ai-core?) 2. Initializes some protocols for AI Models 3. Created ChatPrompt class 4. Built the models for Openai/AzureOpenai chat-completions 5. Add ai-test to test functionality 6. (Also added an "Agent" class that's basically ChatPrompt, but more "stateful". ChatPrompt is stateless, but "Agent" isn't). Thinking through if I like this approach or not. #### PR Dependency Tree * **PR #119** 👈 * **PR #120** * **PR #121** * **PR #123** This tree was auto-generated by [Charcoal](https://github.com/danerwilliams/charcoal)

Add support for OpenAI Responses API. 1. Adds a new OpenAI Model to itneract with Responses API 2. Move completions to its own file 3. Responses has a stateful and a stateless API. In this PR i have support for both. (not streaming yet tho) 4. Responses stateful, required me to save the last message from the model, so i had to make some minor changes to the ListStorage api. #### PR Dependency Tree * **PR #120** 👈 * **PR #121** * **PR #123** * **PR #126** This tree was auto-generated by [Charcoal](https://github.com/danerwilliams/charcoal)

Adds lifecycle methods for ChatPrompt which add support for AI Plugins. This is needed to add plugins to augment the operation of the chat prompt. #### PR Dependency Tree * **PR #121** 👈 * **PR #123** * **PR #126** This tree was auto-generated by [Charcoal](https://github.com/danerwilliams/charcoal)

lilyydu · 2025-09-04T22:53:41Z

packages/mcp/README.md

should we offer this in external instead of packages?

hmmm, good point. i think that's a good idea

Actually, idk, the external thing seems like overkill to me now. I say let's keep it in packages. Simpler to maintain. Thoughts?

I think @aacebo had it as external cause it's not apart of our 'core' offerings - that makes more sense to me, and easier to deal with if it eventually gets removed/deprecated/revised into a diff concept, etc

packages/mcp/pyproject.toml

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py

packages/openai/src/microsoft/teams/openai/responses_chat_model.py

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py

Copilot

Pull Request Overview

This PR adds MCP (Model Context Protocol) client plugin support to the Teams AI SDK, enabling integration with MCP servers for enhanced AI agent capabilities.

Introduces a new MCP package with client plugin functionality for connecting to MCP servers
Updates function handling system to support both Pydantic models and raw JSON schemas
Refactors chat prompt function building to integrate plugin system architecture

Reviewed Changes

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

Show a summary per file

File	Description
packages/mcp/	Core MCP package with AI plugin and transport layer for MCP server communication
packages/openai/	Updated OpenAI models to handle flexible function schemas and improved function argument parsing
packages/ai/	Enhanced Function type to accept dict schemas and improved plugin integration in ChatPrompt
tests/mcp/	Test application demonstrating MCP client integration with Azure OpenAI
Configuration files	Updated project configuration to include new MCP package

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

packages/openai/src/microsoft/teams/openai/function_utils.py

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py

lilyydu · 2025-09-05T16:34:04Z

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py

+from microsoft.teams.common.logging import ConsoleLogger
+from pydantic import BaseModel
+
+from mcp import ClientSession


nit: move external imports to top (mb we can add this into ruff?)

Let me do this in a separate PR. I'll run import reordering across all files

https://docs.astral.sh/ruff/settings/#lint_isort_sections going to use this (just so i remember)

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py

lilyydu · 2025-09-05T16:40:18Z

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py

+        self.refetch_timeout_ms = refetch_timeout_ms
+
+
+class McpClientPlugin(BaseAIPlugin):


could we add a few tests for these files?

Yeah good idea

This was referenced Sep 3, 2025

Initialize AI package #119

Merged

Add support for OpenAI Responses API #120

Merged

Add AI Plugins #121

Merged

heyitsaamir force-pushed the aamirj/aiplugins branch from a5e63b5 to 8bec039 Compare September 3, 2025 21:17

heyitsaamir force-pushed the aamirj/mcp branch from 6319495 to 8119150 Compare September 3, 2025 21:17

heyitsaamir force-pushed the aamirj/aiplugins branch from 8bec039 to 42fd24c Compare September 3, 2025 21:51

heyitsaamir force-pushed the aamirj/mcp branch from 8119150 to 12fb7c4 Compare September 3, 2025 21:51

heyitsaamir force-pushed the aamirj/aiplugins branch from 42fd24c to 5503bba Compare September 3, 2025 22:34

heyitsaamir force-pushed the aamirj/mcp branch from 12fb7c4 to 7aad6f3 Compare September 3, 2025 22:34

heyitsaamir force-pushed the aamirj/aiplugins branch from 5503bba to 2760793 Compare September 3, 2025 22:53

heyitsaamir force-pushed the aamirj/mcp branch from 7aad6f3 to 28547fa Compare September 3, 2025 22:53

heyitsaamir force-pushed the aamirj/aiplugins branch from 2760793 to 1988f88 Compare September 3, 2025 23:03

heyitsaamir force-pushed the aamirj/mcp branch from 28547fa to 8f9ee4d Compare September 3, 2025 23:03

heyitsaamir force-pushed the aamirj/aiplugins branch from 1988f88 to dc07c98 Compare September 3, 2025 23:06

heyitsaamir force-pushed the aamirj/mcp branch from 8f9ee4d to 53904b3 Compare September 3, 2025 23:06

heyitsaamir force-pushed the aamirj/aiplugins branch from dc07c98 to 9bbccd2 Compare September 3, 2025 23:09

heyitsaamir force-pushed the aamirj/mcp branch from 53904b3 to ce8c753 Compare September 3, 2025 23:09

heyitsaamir force-pushed the aamirj/aiplugins branch from 9bbccd2 to c0b82b4 Compare September 3, 2025 23:20

heyitsaamir force-pushed the aamirj/mcp branch from ce8c753 to 26f7245 Compare September 3, 2025 23:20

heyitsaamir force-pushed the aamirj/aiplugins branch from c0b82b4 to 60ce16a Compare September 3, 2025 23:25

heyitsaamir force-pushed the aamirj/mcp branch from 26f7245 to 6945a2d Compare September 3, 2025 23:25

heyitsaamir force-pushed the aamirj/aiplugins branch from 60ce16a to 2aec517 Compare September 3, 2025 23:37

heyitsaamir force-pushed the aamirj/mcp branch from 6945a2d to b55047d Compare September 3, 2025 23:37

heyitsaamir force-pushed the aamirj/aiplugins branch from 2aec517 to 2f9b8b8 Compare September 3, 2025 23:38

heyitsaamir force-pushed the aamirj/mcp branch from b55047d to d2af4bb Compare September 3, 2025 23:38

heyitsaamir force-pushed the aamirj/aiplugins branch from 2f9b8b8 to 79fcd47 Compare September 4, 2025 00:05

heyitsaamir force-pushed the aamirj/mcp branch from d2af4bb to c665257 Compare September 4, 2025 00:05

heyitsaamir force-pushed the aamirj/aiplugins branch from 79fcd47 to ca9ea18 Compare September 4, 2025 00:11

heyitsaamir force-pushed the aamirj/mcp branch from c665257 to 823205d Compare September 4, 2025 00:11

heyitsaamir force-pushed the aamirj/aiplugins branch from ca9ea18 to fbd74d4 Compare September 4, 2025 01:37

heyitsaamir force-pushed the aamirj/mcp branch from 823205d to e2e5046 Compare September 4, 2025 01:37

heyitsaamir force-pushed the aamirj/aiplugins branch from fbd74d4 to fd5d185 Compare September 4, 2025 04:43

heyitsaamir force-pushed the aamirj/mcp branch from e2e5046 to 1e3fd19 Compare September 4, 2025 04:43

heyitsaamir marked this pull request as ready for review September 4, 2025 04:43

heyitsaamir mentioned this pull request Sep 4, 2025

Create MCP Server #126

Draft

heyitsaamir force-pushed the aamirj/aiplugins branch from fd5d185 to c33a02a Compare September 4, 2025 17:54

heyitsaamir force-pushed the aamirj/mcp branch from d4f3440 to 78b1105 Compare September 4, 2025 17:54

heyitsaamir force-pushed the aamirj/aiplugins branch from c33a02a to d550503 Compare September 4, 2025 17:57

heyitsaamir force-pushed the aamirj/mcp branch from 78b1105 to d806277 Compare September 4, 2025 17:57

Base automatically changed from aamirj/aiplugins to main September 4, 2025 17:59

heyitsaamir force-pushed the aamirj/mcp branch from d806277 to ed39d07 Compare September 4, 2025 18:00

heyitsaamir requested a review from lilyydu September 4, 2025 22:15

lilyydu reviewed Sep 4, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings September 5, 2025 05:49

Copilot AI reviewed Sep 5, 2025

View reviewed changes

packages/openai/src/microsoft/teams/openai/function_utils.py Show resolved Hide resolved

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py Show resolved Hide resolved

packages/mcp/src/microsoft/teams/mcp/ai_plugin.py Outdated Show resolved Hide resolved

lilyydu reviewed Sep 5, 2025

View reviewed changes

heyitsaamir added 6 commits September 5, 2025 17:08

Add MCP Client Plugin

a9ef17d

test

c910720

fix

d9040a7

fix

3deb55b

change

792b49e

update

a4709fd

heyitsaamir force-pushed the aamirj/mcp branch from 01b8ea3 to a4709fd Compare September 6, 2025 00:08

move to models and add tests

ceaf322

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add MCP Client Plugin #123

Add MCP Client Plugin #123

heyitsaamir commented Sep 3, 2025 •

edited

Loading

Uh oh!

lilyydu Sep 4, 2025

Uh oh!

heyitsaamir Sep 5, 2025

Uh oh!

heyitsaamir Sep 5, 2025

Uh oh!

lilyydu Sep 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lilyydu Sep 5, 2025

Uh oh!

heyitsaamir Sep 6, 2025

Uh oh!

heyitsaamir Sep 6, 2025

Uh oh!

Uh oh!

lilyydu Sep 5, 2025

Uh oh!

heyitsaamir Sep 6, 2025

Uh oh!

Uh oh!

		self.refetch_timeout_ms = refetch_timeout_ms


		class McpClientPlugin(BaseAIPlugin):

Add MCP Client Plugin #123

Are you sure you want to change the base?

Add MCP Client Plugin #123

Conversation

heyitsaamir commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Dependency Tree

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

heyitsaamir commented Sep 3, 2025 •

edited

Loading