Fix invalid Tavily MCP package name/link in docs and mcp inspect missing servers bug (#24610)

Author: Copilot

docs/src/content/docs/guides/web-search.md

@@ -9,7 +9,7 @@ This guide shows how to add web search to workflows using the Tavily Model Conte
 
 ## Tavily Search
 
-[Tavily](https://tavily.com/) provides AI-optimized search with structured JSON responses, news search capability, and fast response times through the [@tavily/mcp-server](https://github.com/tavily-ai/tavily-mcp-server) MCP server.
+[Tavily](https://tavily.com/) provides AI-optimized search with structured JSON responses, news search capability, and fast response times through the [@tavily/mcp](https://github.com/tavily-ai/tavily-mcp) MCP server.
 
 ```aw wrap
 ---
@@ -18,7 +18,7 @@ engine: copilot
 mcp-servers:
   tavily:
     command: npx
-    args: ["-y", "@tavily/mcp-server"]
+    args: ["-y", "@tavily/mcp"]
     env:
       TAVILY_API_KEY: "${{ secrets.TAVILY_API_KEY }}"
     allowed: ["search", "search_news"]
@@ -69,6 +69,6 @@ network:
 - [AI Engines](/gh-aw/reference/engines/) - Engine capabilities and limitations
 - [CLI Commands](/gh-aw/setup/cli/) - CLI commands including `mcp inspect`
 - [Model Context Protocol Specification](https://github.com/modelcontextprotocol/specification)
-- [Tavily MCP Server](https://github.com/tavily-ai/tavily-mcp-server)
+- [Tavily MCP Server](https://github.com/tavily-ai/tavily-mcp)
 - [Tavily Documentation](https://tavily.com/)
 

pkg/cli/mcp_inspect.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"errors"
 	"fmt"
+	"maps"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -248,22 +249,36 @@ The command will:
 	return cmd
 }
 
-// buildFrontmatterFromWorkflowData reconstructs a frontmatter map from WorkflowData
-// This is used to extract MCP configurations after the compiler has processed imports and merging
+// buildFrontmatterFromWorkflowData constructs a fully resolved frontmatter map from WorkflowData.
+// It uses RawFrontmatter as the base (for safe-outputs, mcp-scripts, on, etc.) and overlays the
+// fully merged tools and mcp-servers so that configurations from imported workflows are included.
+// This is critical for `mcp inspect` to display all MCP servers from the main workflow and imports.
 func buildFrontmatterFromWorkflowData(workflowData *workflow.WorkflowData) map[string]any {
-	// Use the parsed frontmatter's ToMap() method if available
-	// This preserves the original frontmatter structure with imports already merged
-	if workflowData.ParsedFrontmatter != nil {
-		return workflowData.ParsedFrontmatter.ToMap()
-	}
-
-	// Fallback to building manually (shouldn't happen in normal cases)
 	frontmatter := make(map[string]any)
 
-	// Add tools section if present
+	// Start from RawFrontmatter to preserve top-level keys like safe-outputs, mcp-scripts, on, etc.
+	// Guard against nil (maps.Copy is safe with a nil source, but explicit is clearer).
+	if workflowData.RawFrontmatter != nil {
+		maps.Copy(frontmatter, workflowData.RawFrontmatter)
+	}
+
+	// Override tools with the fully merged result (includes built-in tools from imports such as
+	// github, playwright, and serena). ExtractMCPConfigurations only picks up github/playwright/serena
+	// from the tools key, so extra user-defined entries here are harmless.
 	if len(workflowData.Tools) > 0 {
 		frontmatter["tools"] = workflowData.Tools
 	}
 
+	// Override mcp-servers with the fully merged result (includes user-defined servers from all
+	// imports). ResolvedMCPServers is set to allMCPServers in processToolsAndMarkdown, which merges
+	// the main workflow's mcp-servers with every imported workflow's mcp-servers.
+	if len(workflowData.ResolvedMCPServers) > 0 {
+		frontmatter["mcp-servers"] = workflowData.ResolvedMCPServers
+	} else {
+		// No mcp-servers defined in main workflow or any import; remove any stale key so
+		// ExtractMCPConfigurations falls through to check tools for built-in MCP tools.
+		delete(frontmatter, "mcp-servers")
+	}
+
 	return frontmatter
 }

pkg/workflow/agent_job_id_test.go

@@ -96,8 +96,10 @@ Test workflow that creates issues.`,
 
 			// For workflows with safe-outputs, verify they reference the correct job name
 			if strings.Contains(tt.workflowContent, "safe-outputs:") {
-				expectedNeedsLine := "needs: " + tt.expectedJobName
-				if !strings.Contains(lockContentStr, expectedNeedsLine) {
+				// The safe_outputs job depends on multiple jobs (activation, agent, detection),
+				// so the needs value is a YAML list ("- agent") rather than a scalar ("needs: agent").
+				expectedNeedsItem := "- " + tt.expectedJobName
+				if !strings.Contains(lockContentStr, expectedNeedsItem) {
 					t.Errorf("Safe output jobs should depend on '%s' job", tt.expectedJobName)
 					t.Logf("Lock file content:\n%s", lockContentStr)
 				}

pkg/workflow/compiler_orchestrator_tools.go

@@ -16,6 +16,7 @@ var orchestratorToolsLog = logger.New("workflow:compiler_orchestrator_tools")
 // toolsProcessingResult holds the results of tools and markdown processing
 type toolsProcessingResult struct {
 	tools                 map[string]any
+	resolvedMCPServers    map[string]any // fully merged mcp-servers from main workflow and all imports
 	runtimes              map[string]any
 	toolsTimeout          string
 	toolsStartupTimeout   string
@@ -295,6 +296,7 @@ func (c *Compiler) processToolsAndMarkdown(result *parser.FrontmatterResult, cle
 
 	return &toolsProcessingResult{
 		tools:                 tools,
+		resolvedMCPServers:    allMCPServers,
 		runtimes:              runtimes,
 		toolsTimeout:          toolsTimeout,
 		toolsStartupTimeout:   toolsStartupTimeout,

pkg/workflow/compiler_orchestrator_workflow.go

@@ -209,6 +209,7 @@ func (c *Compiler) buildInitialWorkflowData(
 		SecretMasking:         toolsResult.secretMasking,
 		ParsedFrontmatter:     toolsResult.parsedFrontmatter,
 		RawFrontmatter:        result.Frontmatter,
+		ResolvedMCPServers:    toolsResult.resolvedMCPServers,
 		HasExplicitGitHubTool: toolsResult.hasExplicitGitHubTool,
 		ActionMode:            c.actionMode,
 		InlinedImports:        inlinedImports,

pkg/workflow/compiler_types.go

@@ -420,6 +420,7 @@ type WorkflowData struct {
 	SecretMasking               *SecretMaskingConfig      // secret masking configuration
 	ParsedFrontmatter           *FrontmatterConfig        // cached parsed frontmatter configuration (for performance optimization)
 	RawFrontmatter              map[string]any            // raw parsed frontmatter map (for passing to hash functions without re-parsing)
+	ResolvedMCPServers          map[string]any            // fully merged mcp-servers from main workflow and all imports (for mcp inspect)
 	ActionPinWarnings           map[string]bool           // cache of already-warned action pin failures (key: "repo@version")
 	ActionMode                  ActionMode                // action mode for workflow compilation (dev, release, script)
 	HasExplicitGitHubTool       bool                      // true if tools.github was explicitly configured in frontmatter