Added MCP Logs to AI Context

Author: robertheadley

src/core/prompts/__tests__/mcp-servers.test.ts

@@ -0,0 +1,38 @@
+import { getMcpServersSection } from "../sections/mcp-servers"
+import { McpHub } from "../../../services/mcp/McpHub"
+import { ClineProvider } from "../../../core/webview/ClineProvider"
+
+// Mock the ClineProvider and McpHub
+jest.mock("../../../core/webview/ClineProvider")
+jest.mock("../../../services/mcp/McpHub", () => {
+	return {
+		McpHub: jest.fn().mockImplementation(() => {
+			return {
+				getServers: jest.fn().mockReturnValue([]),
+			}
+		}),
+	}
+})
+
+describe("getMcpServersSection", () => {
+	// Create a mock provider for McpHub constructor
+	const mockProvider = {} as ClineProvider
+
+	it("should return an empty string when McpHub is not provided", async () => {
+		const result = await getMcpServersSection(undefined, undefined, true)
+		expect(result).toBe("")
+	})
+
+	it("should return an empty string when enableMcpServerCreation is false", async () => {
+		const mockMcpHub = new McpHub(mockProvider) as any
+		const result = await getMcpServersSection(mockMcpHub, undefined, false)
+		expect(result).toBe("")
+	})
+
+	it("should return a non-empty string when McpHub is provided and enableMcpServerCreation is true", async () => {
+		const mockMcpHub = new McpHub(mockProvider) as any
+		const result = await getMcpServersSection(mockMcpHub, undefined, true)
+		expect(result).not.toBe("")
+		expect(result.includes("MCP SERVERS")).toBe(true)
+	})
+})

src/core/prompts/sections/mcp-servers.ts

@@ -6,7 +6,9 @@ export async function getMcpServersSection(
 	diffStrategy?: DiffStrategy,
 	enableMcpServerCreation?: boolean,
 ): Promise<string> {
-	if (!mcpHub) {
+	// Return empty string if no McpHub is provided or MCP server creation is disabled
+	// This ensures that MCP server logs won't be included in the context when disabled
+	if (!mcpHub || enableMcpServerCreation === false) {
 		return ""
 	}
 
@@ -37,11 +39,23 @@ export async function getMcpServersSection(
 
 						const config = JSON.parse(server.config)
 
+						// Include recent console logs (stdout/stderr) if available
+						const recentLogs = server.errorHistory?.length
+							? `\n\n### Recent Console Logs\n${server.errorHistory
+									.slice(-5) // Last 5 logs
+									.map(
+										(log) =>
+											`- [${log.level.toUpperCase()}] ${log.message.split("\n")[0]}${log.message.includes("\n") ? "..." : ""}`,
+									)
+									.join("\n")}`
+							: ""
+
 						return (
 							`## ${server.name} (\`${config.command}${config.args && Array.isArray(config.args) ? ` ${config.args.join(" ")}` : ""}\`)` +
 							(tools ? `\n\n### Available Tools\n${tools}` : "") +
 							(templates ? `\n\n### Resource Templates\n${templates}` : "") +
-							(resources ? `\n\n### Direct Resources\n${resources}` : "")
+							(resources ? `\n\n### Direct Resources\n${resources}` : "") +
+							recentLogs
 						)
 					})
 					.join("\n\n")}`

src/services/mcp/McpHub.ts

@@ -936,10 +936,24 @@ export class McpHub {
 		})
 
 		// Send sorted servers to webview
-		await this.providerRef.deref()?.postMessageToWebview({
-			type: "mcpServers",
-			mcpServers: sortedConnections.map((connection) => connection.server),
-		})
+		const provider = this.providerRef.deref()
+		if (provider) {
+			await provider.postMessageToWebview({
+				type: "mcpServers",
+				mcpServers: sortedConnections.map((connection) => connection.server),
+			})
+
+			// When MCP logs are updated, trigger a system prompt refresh
+			// by calling postStateToWebview which will re-generate the prompt
+			console.log("MCP logs updated, triggering context refresh")
+
+			// Get the current Cline instance (Task)
+			if (provider && typeof provider.postStateToWebview === "function") {
+				// Force the system prompt to be regenerated on the next API request
+				// by triggering a new state update
+				await provider.postStateToWebview()
+			}
+		}
 	}
 
 	public async toggleServerDisabled(