merge conflicts

.changeset/chilled-mails-yawn.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Create formatting function for MCP Servers in system prompt

src/core/prompts/listFormattedMcpServers.ts

@@ -0,0 +1,39 @@
+import { McpHub } from "@/services/mcp/McpHub"
+
+export const listFormattedMcpServers = (mcpHub: McpHub): string => {
+	return mcpHub.getServers().length > 0
+		? `${mcpHub
+				.getServers()
+				.filter((server) => server.status === "connected")
+				.map((server) => {
+					const tools = server.tools
+						?.map((tool) => {
+							const schemaStr = tool.inputSchema
+								? `    Input Schema:
+    ${JSON.stringify(tool.inputSchema, null, 2).split("\n").join("\n    ")}`
+								: ""
+
+							return `- ${tool.name}: ${tool.description}\n${schemaStr}`
+						})
+						.join("\n\n")
+
+					const templates = server.resourceTemplates
+						?.map((template) => `- ${template.uriTemplate} (${template.name}): ${template.description}`)
+						.join("\n")
+
+					const resources = server.resources
+						?.map((resource) => `- ${resource.uri} (${resource.name}): ${resource.description}`)
+						.join("\n")
+
+					const config = JSON.parse(server.config)
+
+					return (
+						`## ${server.name}` +
+						(tools ? `\n\n### Available Tools\n${tools}` : "") +
+						(templates ? `\n\n### Resource Templates\n${templates}` : "") +
+						(resources ? `\n\n### Direct Resources\n${resources}` : "")
+					)
+				})
+				.join("\n\n")}`
+		: "(No MCP servers currently connected)"
+}

src/core/prompts/model_prompts/claude4.ts

@@ -3,6 +3,7 @@ import os from "os"
 import osName from "os-name"
 import { McpHub } from "@services/mcp/McpHub"
 import { BrowserSettings } from "@shared/BrowserSettings"
+import { listFormattedMcpServers } from "../listFormattedMcpServers"
 
 export const SYSTEM_PROMPT_CLAUDE4 = async (
     cwd: string,
@@ -442,43 +443,7 @@ The Model Context Protocol (MCP) enables communication between the system and lo
 
 When a server is connected, you can use the server's tools via the \`use_mcp_tool\` tool, and access the server's resources via the \`access_mcp_resource\` tool.
 
-${
-    mcpHub.getServers().length > 0
-        ? `${mcpHub
-                .getServers()
-                .filter((server) => server.status === "connected")
-                .map((server) => {
-                    const tools = server.tools
-                        ?.map((tool) => {
-                            const schemaStr = tool.inputSchema
-                                ? `    Input Schema:
-    ${JSON.stringify(tool.inputSchema, null, 2).split("\n").join("\n    ")}`
-                                : ""
-
-                            return `- ${tool.name}: ${tool.description}\n${schemaStr}`
-                        })
-                        .join("\n\n")
-
-                    const templates = server.resourceTemplates
-                        ?.map((template) => `- ${template.uriTemplate} (${template.name}): ${template.description}`)
-                        .join("\n")
-
-                    const resources = server.resources
-                        ?.map((resource) => `- ${resource.uri} (${resource.name}): ${resource.description}`)
-                        .join("\n")
-
-                    const config = JSON.parse(server.config)
-
-                    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}` : "")
-                    )
-                })
-                .join("\n\n")}`
-        : "(No MCP servers currently connected)"
-}
+${listFormattedMcpServers(mcpHub)}
 
 ====
 

src/core/prompts/system.ts

@@ -6,6 +6,7 @@ import { BrowserSettings } from "@shared/BrowserSettings"
 import { SYSTEM_PROMPT_CLAUDE4_EXPERIMENTAL } from "@core/prompts/model_prompts/claude4-experimental"
 import { SYSTEM_PROMPT_CLAUDE4 } from "@core/prompts/model_prompts/claude4"
 import { USE_EXPERIMENTAL_CLAUDE4_FEATURES } from "@core/task/index"; 
+import { listFormattedMcpServers } from "./listFormattedMcpServers"
 
 export const SYSTEM_PROMPT = async (
 	cwd: string,
@@ -438,43 +439,7 @@ The Model Context Protocol (MCP) enables communication between the system and lo
 
 When a server is connected, you can use the server's tools via the \`use_mcp_tool\` tool, and access the server's resources via the \`access_mcp_resource\` tool.
 
-${
-	mcpHub.getServers().length > 0
-		? `${mcpHub
-				.getServers()
-				.filter((server) => server.status === "connected")
-				.map((server) => {
-					const tools = server.tools
-						?.map((tool) => {
-							const schemaStr = tool.inputSchema
-								? `    Input Schema:
-    ${JSON.stringify(tool.inputSchema, null, 2).split("\n").join("\n    ")}`
-								: ""
-
-							return `- ${tool.name}: ${tool.description}\n${schemaStr}`
-						})
-						.join("\n\n")
-
-					const templates = server.resourceTemplates
-						?.map((template) => `- ${template.uriTemplate} (${template.name}): ${template.description}`)
-						.join("\n")
-
-					const resources = server.resources
-						?.map((resource) => `- ${resource.uri} (${resource.name}): ${resource.description}`)
-						.join("\n")
-
-					const config = JSON.parse(server.config)
-
-					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}` : "")
-					)
-				})
-				.join("\n\n")}`
-		: "(No MCP servers currently connected)"
-}
+${listFormattedMcpServers(mcpHub)}
 
 ====