diff --git a/docs/README.skills.md b/docs/README.skills.md
index c2c3090fa..8e7cebfd0 100644
--- a/docs/README.skills.md
+++ b/docs/README.skills.md
@@ -43,7 +43,7 @@ Skills differ from other primitives by supporting bundled assets (scripts, code
| [mcp-cli](../skills/mcp-cli/SKILL.md) | Interface for MCP (Model Context Protocol) servers via CLI. Use when you need to interact with external tools, APIs, or data sources through MCP servers, list available MCP servers/tools, or call MCP tools from command line. | None |
| [meeting-minutes](../skills/meeting-minutes/SKILL.md) | Generate concise, actionable meeting minutes for internal meetings. Includes metadata, attendees, agenda, decisions, action items (owner + due date), and follow-up steps. | None |
| [microsoft-code-reference](../skills/microsoft-code-reference/SKILL.md) | Look up Microsoft API references, find working code samples, and verify SDK code is correct. Use when working with Azure SDKs, .NET libraries, or Microsoft APIs—to find the right method, check parameters, get working examples, or troubleshoot errors. Catches hallucinated methods, wrong signatures, and deprecated patterns by querying official docs. | None |
-| [microsoft-docs](../skills/microsoft-docs/SKILL.md) | Query official Microsoft documentation to understand concepts, find tutorials, and learn how services work. Use for Azure, .NET, Microsoft 365, Windows, Power Platform, and all Microsoft technologies. Get accurate, current information from learn.microsoft.com and other official Microsoft websites—architecture overviews, quickstarts, configuration guides, limits, and best practices. | None |
+| [microsoft-docs](../skills/microsoft-docs/SKILL.md) | Query official Microsoft documentation to find concepts, tutorials, and code examples across Azure, .NET, Agent Framework, Aspire, VS Code, GitHub, and more. Uses Microsoft Learn MCP as the default, with Context7 and Aspire MCP for content that lives outside learn.microsoft.com. | None |
| [nuget-manager](../skills/nuget-manager/SKILL.md) | Manage NuGet packages in .NET projects/solutions. Use this skill when adding, removing, or updating NuGet package versions. It enforces using `dotnet` CLI for package management and provides strict procedures for direct file edits only when updating versions. | None |
| [penpot-uiux-design](../skills/penpot-uiux-design/SKILL.md) | Comprehensive guide for creating professional UI/UX designs in Penpot using MCP tools. Use this skill when: (1) Creating new UI/UX designs for web, mobile, or desktop applications, (2) Building design systems with components and tokens, (3) Designing dashboards, forms, navigation, or landing pages, (4) Applying accessibility standards and best practices, (5) Following platform guidelines (iOS, Android, Material Design), (6) Reviewing or improving existing Penpot designs for usability. Triggers: "design a UI", "create interface", "build layout", "design dashboard", "create form", "design landing page", "make it accessible", "design system", "component library". | `references/accessibility.md`
`references/component-patterns.md`
`references/platform-guidelines.md`
`references/setup-troubleshooting.md` |
| [plantuml-ascii](../skills/plantuml-ascii/SKILL.md) | Generate ASCII art diagrams using PlantUML text mode. Use when user asks to create ASCII diagrams, text-based diagrams, terminal-friendly diagrams, or mentions plantuml ascii, text diagram, ascii art diagram. Supports: Converting PlantUML diagrams to ASCII art, Creating sequence diagrams, class diagrams, flowcharts in ASCII format, Generating Unicode-enhanced ASCII art with -utxt flag | None |
diff --git a/skills/microsoft-docs/SKILL.md b/skills/microsoft-docs/SKILL.md
index 92f523b7d..201b5e008 100644
--- a/skills/microsoft-docs/SKILL.md
+++ b/skills/microsoft-docs/SKILL.md
@@ -1,56 +1,113 @@
---
name: microsoft-docs
-description: Query official Microsoft documentation to understand concepts, find tutorials, and learn how services work. Use for Azure, .NET, Microsoft 365, Windows, Power Platform, and all Microsoft technologies. Get accurate, current information from learn.microsoft.com and other official Microsoft websites—architecture overviews, quickstarts, configuration guides, limits, and best practices.
-compatibility: Requires Microsoft Learn MCP Server (https://learn.microsoft.com/api/mcp)
+description: 'Query official Microsoft documentation to find concepts, tutorials, and code examples across Azure, .NET, Agent Framework, Aspire, VS Code, GitHub, and more. Uses Microsoft Learn MCP as the default, with Context7 and Aspire MCP for content that lives outside learn.microsoft.com.'
---
# Microsoft Docs
-## Tools
+Research skill for the Microsoft technology ecosystem. Covers learn.microsoft.com and documentation that lives outside it (VS Code, GitHub, Aspire, Agent Framework repos).
-| Tool | Use For |
+---
+
+## Default: Microsoft Learn MCP
+
+Use these tools for **everything on learn.microsoft.com** — Azure, .NET, M365, Power Platform, Agent Framework, Semantic Kernel, Windows, and more. This is the primary tool for the vast majority of Microsoft documentation queries.
+
+| Tool | Purpose |
|------|---------|
-| `microsoft_docs_search` | Find documentation—concepts, guides, tutorials, configuration |
-| `microsoft_docs_fetch` | Get full page content (when search excerpts aren't enough) |
+| `microsoft_docs_search` | Search learn.microsoft.com — concepts, guides, tutorials, configuration |
+| `microsoft_code_sample_search` | Find working code snippets from Learn docs. Pass `language` (`python`, `csharp`, etc.) for best results |
+| `microsoft_docs_fetch` | Get full page content from a specific URL (when search excerpts aren't enough) |
+
+Use `microsoft_docs_fetch` after search when you need complete tutorials, all config options, or when search excerpts are truncated.
+
+---
+
+## Exceptions: When to Use Other Tools
+
+The following categories live **outside** learn.microsoft.com. Use the specified tool instead.
+
+### .NET Aspire — Use Aspire MCP Server (preferred) or Context7
+
+Aspire docs live on **aspire.dev**, not Learn. The best tool depends on your Aspire CLI version:
+
+**CLI 13.2+** (recommended) — The Aspire MCP server includes built-in docs search tools:
+
+| MCP Tool | Description |
+|----------|-------------|
+| `list_docs` | Lists all available documentation from aspire.dev |
+| `search_docs` | Weighted lexical search across aspire.dev content |
+| `get_doc` | Retrieves a specific document by slug |
+
+These ship in Aspire CLI 13.2 ([PR #14028](https://github.com/dotnet/aspire/pull/14028)). To update: `aspire update --self --channel daily`. Ref: https://davidpine.dev/posts/aspire-docs-mcp-tools/
+
+**CLI 13.1** — The MCP server provides integration lookup (`list_integrations`, `get_integration_docs`) but **not** docs search. Fall back to Context7:
+
+| Library ID | Use for |
+|---|---|
+| `/microsoft/aspire.dev` | Primary — guides, integrations, CLI reference, deployment |
+| `/dotnet/aspire` | Runtime source — API internals, implementation details |
+| `/communitytoolkit/aspire` | Community integrations — Go, Java, Node.js, Ollama |
+
+### VS Code — Use Context7
+
+VS Code docs live on **code.visualstudio.com**, not Learn.
-## When to Use
+| Library ID | Use for |
+|---|---|
+| `/websites/code_visualstudio` | User docs — settings, features, debugging, remote dev |
+| `/websites/code_visualstudio_api` | Extension API — webviews, TreeViews, commands, contribution points |
-- **Understanding concepts** — "How does Cosmos DB partitioning work?"
-- **Learning a service** — "Azure Functions overview", "Container Apps architecture"
-- **Finding tutorials** — "quickstart", "getting started", "step-by-step"
-- **Configuration options** — "App Service configuration settings"
-- **Limits & quotas** — "Azure OpenAI rate limits", "Service Bus quotas"
-- **Best practices** — "Azure security best practices"
+### GitHub — Use Context7
-## Query Effectiveness
+GitHub docs live on **docs.github.com** and **cli.github.com**.
-Good queries are specific:
+| Library ID | Use for |
+|---|---|
+| `/websites/github_en` | Actions, API, repos, security, admin, Copilot |
+| `/websites/cli_github` | GitHub CLI (`gh`) commands and flags |
+
+### Agent Framework — Use Learn MCP + Context7
+
+Agent Framework tutorials are on learn.microsoft.com (use `microsoft_docs_search`), but the **GitHub repo** has API-level detail that is often ahead of published docs — particularly DevUI REST API reference, CLI options, and .NET integration.
+
+| Library ID | Use for |
+|---|---|
+| `/websites/learn_microsoft_en-us_agent-framework` | Tutorials — DevUI guides, tracing, workflow orchestration |
+| `/microsoft/agent-framework` | API detail — DevUI REST endpoints, CLI flags, auth, .NET `AddDevUI`/`MapDevUI` |
+
+**DevUI tip:** Query the Learn website source for how-to guides, then the repo source for API-level specifics (endpoint schemas, proxy config, auth tokens).
+
+---
+
+## Context7 Setup
+
+For any Context7 query, resolve the library ID first (one-time per session):
+
+1. Call `mcp_context7_resolve-library-id` with the technology name
+2. Call `mcp_context7_query-docs` with the returned library ID and a specific query
+
+---
+
+## Writing Effective Queries
+
+Be specific — include version, intent, and language:
```
# ❌ Too broad
"Azure Functions"
+"agent framework"
# ✅ Specific
"Azure Functions Python v2 programming model"
"Cosmos DB partition key design best practices"
-"Container Apps scaling rules KEDA"
+"GitHub Actions workflow_dispatch inputs matrix strategy"
+"Aspire AddUvicornApp Python FastAPI integration"
+"DevUI serve agents tracing OpenTelemetry directory discovery"
+"Agent Framework workflow conditional edges branching handoff"
```
Include context:
-- **Version** when relevant (`.NET 8`, `EF Core 8`)
-- **Task intent** (`quickstart`, `tutorial`, `overview`, `limits`)
-- **Platform** for multi-platform docs (`Linux`, `Windows`)
-
-## When to Fetch Full Page
-
-Fetch after search when:
-- **Tutorials** — need complete step-by-step instructions
-- **Configuration guides** — need all options listed
-- **Deep dives** — user wants comprehensive coverage
-- **Search excerpt is cut off** — full context needed
-
-## Why Use This
-
-- **Accuracy** — live docs, not training data that may be outdated
-- **Completeness** — tutorials have all steps, not fragments
-- **Authority** — official Microsoft documentation
+- **Version** when relevant (`.NET 8`, `Aspire 13`, `VS Code 1.96`)
+- **Task intent** (`quickstart`, `tutorial`, `overview`, `limits`, `API reference`)
+- **Language** for polyglot docs (`Python`, `TypeScript`, `C#`)