Merge branch 'main' into fix-puppeteer-async-eval

src/aws-kb-retrieval-server/README.md

@@ -0,0 +1,53 @@
+# AWS Knowledge Base Retrieval MCP Server
+
+An MCP server implementation for retrieving information from the AWS Knowledge Base using the Bedrock Agent Runtime.
+
+## Features
+
+- **RAG (Retrieval-Augmented Generation)**: Retrieve context from the AWS Knowledge Base based on a query and a Knowledge Base ID.
+- **Supports multiple results retrieval**: Option to retrieve a customizable number of results.
+
+## Tools
+
+- **retrieve_from_aws_kb**
+  - Perform retrieval operations using the AWS Knowledge Base.
+  - Inputs:
+    - `query` (string): The search query for retrieval.
+    - `knowledgeBaseId` (string): The ID of the AWS Knowledge Base.
+    - `n` (number, optional): Number of results to retrieve (default: 3).
+
+## Configuration
+
+### Setting up AWS Credentials
+
+1. Obtain AWS access key ID, secret access key, and region from the AWS Management Console.
+2. Ensure these credentials have appropriate permissions for Bedrock Agent Runtime operations.
+
+### Usage with Claude Desktop
+
+Add this to your `claude_desktop_config.json`:
+
+```json
+{
+  "mcpServers": {
+    "aws-kb-retrieval": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@modelcontextprotocol/server-aws-kb-retrieval"
+      ],
+      "env": {
+        "AWS_ACCESS_KEY_ID": "YOUR_ACCESS_KEY_HERE",
+        "AWS_SECRET_ACCESS_KEY": "YOUR_SECRET_ACCESS_KEY_HERE",
+        "AWS_REGION": "YOUR_AWS_REGION_HERE"
+      }
+    }
+  }
+}
+```
+
+## License
+
+This MCP server is licensed under the MIT License. This means you are free to use, modify, and distribute the software, subject to the terms and conditions of the MIT License. For more details, please see the LICENSE file in the project repository.
+
+This README assumes that your server package is named `@modelcontextprotocol/server-aws-kb-retrieval`. Adjust the package name and installation details if they differ in your setup. Also, ensure that your server script is correctly built and that all dependencies are properly managed in your `package.json`.

src/aws-kb-retrieval-server/index.ts

@@ -0,0 +1,166 @@
+#!/usr/bin/env node
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import {
+  CallToolRequestSchema,
+  ListToolsRequestSchema,
+  Tool,
+} from "@modelcontextprotocol/sdk/types.js";
+import {
+  BedrockAgentRuntimeClient,
+  RetrieveCommand,
+  RetrieveCommandInput,
+} from "@aws-sdk/client-bedrock-agent-runtime";
+
+// AWS client initialization
+const bedrockClient = new BedrockAgentRuntimeClient({
+  region: process.env.AWS_REGION,
+  credentials: {
+    accessKeyId: process.env.AWS_ACCESS_KEY_ID!,
+    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY!,
+  },
+});
+
+interface RAGSource {
+  id: string;
+  fileName: string;
+  snippet: string;
+  score: number;
+}
+
+async function retrieveContext(
+  query: string,
+  knowledgeBaseId: string,
+  n: number = 3
+): Promise<{
+  context: string;
+  isRagWorking: boolean;
+  ragSources: RAGSource[];
+}> {
+  try {
+    if (!knowledgeBaseId) {
+      console.error("knowledgeBaseId is not provided");
+      return {
+        context: "",
+        isRagWorking: false,
+        ragSources: [],
+      };
+    }
+
+    const input: RetrieveCommandInput = {
+      knowledgeBaseId: knowledgeBaseId,
+      retrievalQuery: { text: query },
+      retrievalConfiguration: {
+        vectorSearchConfiguration: { numberOfResults: n },
+      },
+    };
+
+    const command = new RetrieveCommand(input);
+    const response = await bedrockClient.send(command);
+    const rawResults = response?.retrievalResults || [];
+    const ragSources: RAGSource[] = rawResults
+      .filter((res) => res?.content?.text)
+      .map((result, index) => {
+        const uri = result?.location?.s3Location?.uri || "";
+        const fileName = uri.split("/").pop() || `Source-${index}.txt`;
+        return {
+          id: (result.metadata?.["x-amz-bedrock-kb-chunk-id"] as string) || `chunk-${index}`,
+          fileName: fileName.replace(/_/g, " ").replace(".txt", ""),
+          snippet: result.content?.text || "",
+          score: (result.score as number) || 0,
+        };
+      })
+      .slice(0, 3);
+
+    const context = rawResults
+      .filter((res): res is { content: { text: string } } => res?.content?.text !== undefined)
+      .map(res => res.content.text)
+      .join("\n\n");
+
+    return {
+      context,
+      isRagWorking: true,
+      ragSources,
+    };
+  } catch (error) {
+    console.error("RAG Error:", error);
+    return { context: "", isRagWorking: false, ragSources: [] };
+  }
+}
+
+// Define the retrieval tool
+const RETRIEVAL_TOOL: Tool = {
+  name: "retrieve_from_aws_kb",
+  description: "Performs retrieval from the AWS Knowledge Base using the provided query and Knowledge Base ID.",
+  inputSchema: {
+    type: "object",
+    properties: {
+      query: { type: "string", description: "The query to perform retrieval on" },
+      knowledgeBaseId: { type: "string", description: "The ID of the AWS Knowledge Base" },
+      n: { type: "number", default: 3, description: "Number of results to retrieve" },
+    },
+    required: ["query", "knowledgeBaseId"],
+  },
+};
+
+// Server setup
+const server = new Server(
+  {
+    name: "aws-kb-retrieval-server",
+    version: "0.2.0",
+  },
+  {
+    capabilities: {
+      tools: {},
+    },
+  },
+);
+
+// Request handlers
+server.setRequestHandler(ListToolsRequestSchema, async () => ({
+  tools: [RETRIEVAL_TOOL],
+}));
+
+server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  const { name, arguments: args } = request.params;
+
+  if (name === "retrieve_from_aws_kb") {
+    const { query, knowledgeBaseId, n = 3 } = args as Record<string, any>;
+    try {
+      const result = await retrieveContext(query, knowledgeBaseId, n);
+      if (result.isRagWorking) {
+        return {
+          content: [
+            { type: "text", text: `Context: ${result.context}` },
+            { type: "text", text: `RAG Sources: ${JSON.stringify(result.ragSources)}` },
+          ],
+        };
+      } else {
+        return {
+          content: [{ type: "text", text: "Retrieval failed or returned no results." }],
+        };
+      }
+    } catch (error) {
+      return {
+        content: [{ type: "text", text: `Error occurred: ${error}` }],
+      };
+    }
+  } else {
+    return {
+      content: [{ type: "text", text: `Unknown tool: ${name}` }],
+      isError: true,
+    };
+  }
+});
+
+// Server startup
+async function runServer() {
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+  console.error("AWS KB Retrieval Server running on stdio");
+}
+
+runServer().catch((error) => {
+  console.error("Fatal error running server:", error);
+  process.exit(1);
+});

src/aws-kb-retrieval-server/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "@modelcontextprotocol/server-aws-kb-retrieval",
+  "version": "0.6.2",
+  "description": "MCP server for AWS Knowledge Base retrieval using Bedrock Agent Runtime",
+  "license": "MIT",
+  "author": "Anthropic, PBC (https://anthropic.com)",
+  "homepage": "https://modelcontextprotocol.io",
+  "bugs": "https://github.com/modelcontextprotocol/servers/issues",
+  "type": "module",
+  "bin": {
+    "mcp-server-aws-kb-retrieval": "dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc && shx chmod +x dist/*.js",
+    "prepare": "npm run build",
+    "watch": "tsc --watch"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "0.5.0",
+    "@aws-sdk/client-bedrock-agent-runtime": "^3.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.10.0",
+    "shx": "^0.3.4",
+    "typescript": "^5.6.2"
+  }
+}

src/aws-kb-retrieval-server/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": ".",
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./dist/.tsbuildinfo"
+  },
+  "include": [
+    "./**/*.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}

src/brave-search/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-brave-search",
-  "version": "0.5.2",
+  "version": "0.6.2",
   "description": "MCP server for Brave Search API integration",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",
@@ -19,11 +19,11 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "0.5.0"
+    "@modelcontextprotocol/sdk": "1.0.1"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
     "shx": "^0.3.4",
     "typescript": "^5.6.2"
   }
-}
+}

src/everart/README.md

@@ -0,0 +1,73 @@
+# EverArt MCP Server
+
+Image generation server for Claude Desktop using EverArt's API.
+
+## Install
+```bash
+npm install
+export EVERART_API_KEY=your_key_here
+```
+
+## Config
+Add to Claude Desktop config:
+```json
+{
+  "mcpServers": {
+    "everart": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-everart"],
+      "env": {
+        "EVERART_API_KEY": "your_key_here"
+      }
+    }
+  }
+}
+```
+
+## Tools
+
+### generate_image
+Generates images with multiple model options. Opens result in browser and returns URL.
+
+Parameters:
+```typescript
+{
+  prompt: string,       // Image description
+  model?: string,       // Model ID (default: "207910310772879360")
+  image_count?: number  // Number of images (default: 1)
+}
+```
+
+Models:
+- 5000: FLUX1.1 (standard)
+- 9000: FLUX1.1-ultra
+- 6000: SD3.5
+- 7000: Recraft-Real
+- 8000: Recraft-Vector
+
+All images generated at 1024x1024.
+
+Sample usage:
+```javascript
+const result = await client.callTool({
+  name: "generate_image",
+  arguments: {
+    prompt: "A cat sitting elegantly",
+    model: "7000",
+    image_count: 1
+  }
+});
+```
+
+Response format:
+```
+Image generated successfully!
+The image has been opened in your default browser.
+
+Generation details:
+- Model: 7000
+- Prompt: "A cat sitting elegantly"
+- Image URL: https://storage.googleapis.com/...
+
+You can also click the URL above to view the image again.
+```

src/everart/index.ts

@@ -0,0 +1,160 @@
+#!/usr/bin/env node
+import EverArt from "everart";
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import {
+  CallToolRequestSchema,
+  ListToolsRequestSchema,
+  ListResourcesRequestSchema,
+  ReadResourceRequestSchema,
+} from "@modelcontextprotocol/sdk/types.js";
+import fetch from "node-fetch";
+import open from "open";
+
+const server = new Server(
+  {
+    name: "example-servers/everart",
+    version: "0.2.0",
+  },
+  {
+    capabilities: {
+      tools: {},
+      resources: {}, // Required for image resources
+    },
+  },
+);
+
+if (!process.env.EVERART_API_KEY) {
+  console.error("EVERART_API_KEY environment variable is not set");
+  process.exit(1);
+}
+
+const client = new EverArt.default(process.env.EVERART_API_KEY);
+
+server.setRequestHandler(ListToolsRequestSchema, async () => ({
+  tools: [
+    {
+      name: "generate_image",
+      description:
+        "Generate images using EverArt Models and returns a clickable link to view the generated image. " +
+        "The tool will return a URL that can be clicked to view the image in a browser. " +
+        "Available models:\n" +
+        "- 5000:FLUX1.1: Standard quality\n" +
+        "- 9000:FLUX1.1-ultra: Ultra high quality\n" +
+        "- 6000:SD3.5: Stable Diffusion 3.5\n" +
+        "- 7000:Recraft-Real: Photorealistic style\n" +
+        "- 8000:Recraft-Vector: Vector art style\n" +
+        "\nThe response will contain a direct link to view the generated image.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          prompt: {
+            type: "string",
+            description: "Text description of desired image",
+          },
+          model: {
+            type: "string",
+            description:
+              "Model ID (5000:FLUX1.1, 9000:FLUX1.1-ultra, 6000:SD3.5, 7000:Recraft-Real, 8000:Recraft-Vector)",
+            default: "5000",
+          },
+          image_count: {
+            type: "number",
+            description: "Number of images to generate",
+            default: 1,
+          },
+        },
+        required: ["prompt"],
+      },
+    },
+  ],
+}));
+
+server.setRequestHandler(ListResourcesRequestSchema, async () => {
+  return {
+    resources: [
+      {
+        uri: "everart://images",
+        mimeType: "image/png",
+        name: "Generated Images",
+      },
+    ],
+  };
+});
+
+server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+  if (request.params.uri === "everart://images") {
+    return {
+      contents: [
+        {
+          uri: "everart://images",
+          mimeType: "image/png",
+          blob: "", // Empty since this is just for listing
+        },
+      ],
+    };
+  }
+  throw new Error("Resource not found");
+});
+
+server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  if (request.params.name === "generate_image") {
+    try {
+      const {
+        prompt,
+        model = "207910310772879360",
+        image_count = 1,
+      } = request.params.arguments as any;
+
+      // Use correct EverArt API method
+      const generation = await client.v1.generations.create(
+        model,
+        prompt,
+        "txt2img",
+        {
+          imageCount: image_count,
+          height: 1024,
+          width: 1024,
+        },
+      );
+
+      // Wait for generation to complete
+      const completedGen = await client.v1.generations.fetchWithPolling(
+        generation[0].id,
+      );
+
+      const imgUrl = completedGen.image_url;
+      if (!imgUrl) throw new Error("No image URL");
+
+      // Automatically open the image URL in the default browser
+      await open(imgUrl);
+
+      // Return a formatted message with the clickable link
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Image generated successfully!\nThe image has been opened in your default browser.\n\nGeneration details:\n- Model: ${model}\n- Prompt: "${prompt}"\n- Image URL: ${imgUrl}\n\nYou can also click the URL above to view the image again.`,
+          },
+        ],
+      };
+    } catch (error: unknown) {
+      console.error("Detailed error:", error);
+      const errorMessage =
+        error instanceof Error ? error.message : "Unknown error";
+      return {
+        content: [{ type: "text", text: `Error: ${errorMessage}` }],
+        isError: true,
+      };
+    }
+  }
+  throw new Error(`Unknown tool: ${request.params.name}`);
+});
+
+async function runServer() {
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+  console.error("EverArt MCP Server running on stdio");
+}
+
+runServer().catch(console.error);

src/everart/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "@modelcontextprotocol/server-everart",
+  "version": "0.6.2",
+  "description": "MCP server for EverArt API integration",
+  "license": "MIT",
+  "author": "Anthropic, PBC (https://anthropic.com)",
+  "homepage": "https://modelcontextprotocol.io",
+  "bugs": "https://github.com/modelcontextprotocol/servers/issues",
+  "type": "module",
+  "bin": {
+    "mcp-server-everart": "dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc && shx chmod +x dist/*.js",
+    "prepare": "npm run build",
+    "watch": "tsc --watch"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "0.5.0",
+    "everart": "^1.0.0",
+    "node-fetch": "^3.3.2",
+    "open": "^9.1.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.11.0",
+    "shx": "^0.3.4",
+    "typescript": "^5.3.3"
+  }
+}

src/everart/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "."
+  },
+  "include": [
+    "./**/*.ts"
+  ]
+}

src/everything/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-everything",
-  "version": "0.5.1",
+  "version": "0.6.2",
   "description": "MCP server that exercises all the features of the MCP protocol",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",
@@ -19,7 +19,7 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "0.5.0",
+    "@modelcontextprotocol/sdk": "1.0.1",
     "express": "^4.21.1",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.5"
@@ -29,4 +29,4 @@
     "shx": "^0.3.4",
     "typescript": "^5.6.2"
   }
-}
+}

src/fetch/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-server-fetch"
-version = "0.6.1"
+version = "0.6.2"
 description = "A Model Context Protocol server providing tools to fetch and convert web content for usage by LLMs"
 readme = "README.md"
 requires-python = ">=3.10"

src/fetch/src/mcp_server_fetch/server.py

@@ -44,7 +44,7 @@ def extract_content_from_html(html: str) -> str:
     return content
 
 
-def get_robots_txt_url(url: AnyUrl | str) -> str:
+def get_robots_txt_url(url: str) -> str:
     """Get the robots.txt URL for a given website URL.
 
     Args:
@@ -54,7 +54,7 @@ def get_robots_txt_url(url: AnyUrl | str) -> str:
         URL of the robots.txt file
     """
     # Parse the URL into components
-    parsed = urlparse(str(url))
+    parsed = urlparse(url)
 
     # Reconstruct the base URL with just scheme, netloc, and /robots.txt path
     robots_url = urlunparse((parsed.scheme, parsed.netloc, "/robots.txt", "", "", ""))
@@ -62,7 +62,7 @@ def get_robots_txt_url(url: AnyUrl | str) -> str:
     return robots_url
 
 
-async def check_may_autonomously_fetch_url(url: AnyUrl | str, user_agent: str) -> None:
+async def check_may_autonomously_fetch_url(url: str, user_agent: str) -> None:
     """
     Check if the URL can be fetched by the user agent according to the robots.txt file.
     Raises a McpError if not.
@@ -74,7 +74,9 @@ async def check_may_autonomously_fetch_url(url: AnyUrl | str, user_agent: str) -
     async with AsyncClient() as client:
         try:
             response = await client.get(
-                robot_txt_url, headers={"User-Agent": user_agent}
+                robot_txt_url,
+                follow_redirects=True,
+                headers={"User-Agent": user_agent},
             )
         except HTTPError:
             raise McpError(
@@ -93,7 +95,7 @@ async def check_may_autonomously_fetch_url(url: AnyUrl | str, user_agent: str) -
         line for line in robot_txt.splitlines() if not line.strip().startswith("#")
     )
     robot_parser = Protego.parse(processed_robot_txt)
-    if not robot_parser.can_fetch(url, user_agent):
+    if not robot_parser.can_fetch(str(url), user_agent):
         raise McpError(
             INTERNAL_ERROR,
             f"The sites robots.txt ({robot_txt_url}), specifies that autonomous fetching of this page is not allowed, "
@@ -106,7 +108,7 @@ async def check_may_autonomously_fetch_url(url: AnyUrl | str, user_agent: str) -
 
 
 async def fetch_url(
-    url: AnyUrl | str, user_agent: str, force_raw: bool = False
+    url: str, user_agent: str, force_raw: bool = False
 ) -> Tuple[str, str]:
     """
     Fetch the URL and return the content in a form ready for the LLM, as well as a prefix string with status information.
@@ -116,7 +118,7 @@ async def fetch_url(
     async with AsyncClient() as client:
         try:
             response = await client.get(
-                str(url),
+                url,
                 follow_redirects=True,
                 headers={"User-Agent": user_agent},
                 timeout=30,
@@ -221,7 +223,7 @@ Although originally you did not have internet access, and were advised to refuse
         except ValueError as e:
             raise McpError(INVALID_PARAMS, str(e))
 
-        url = args.url
+        url = str(args.url)
         if not url:
             raise McpError(INVALID_PARAMS, "URL is required")
 

src/fetch/uv.lock

@@ -327,7 +327,7 @@ wheels = [
 
 [[package]]
 name = "mcp-server-fetch"
-version = "0.1.3"
+version = "0.6.2"
 source = { editable = "." }
 dependencies = [
     { name = "markdownify" },

src/filesystem/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-filesystem",
-  "version": "0.5.1",
+  "version": "0.6.2",
   "description": "MCP server for filesystem access",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",
@@ -19,7 +19,7 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "0.5.0",
+    "@modelcontextprotocol/sdk": "1.0.1",
     "glob": "^10.3.10",
     "zod-to-json-schema": "^3.23.5"
   },
@@ -28,4 +28,4 @@
     "shx": "^0.3.4",
     "typescript": "^5.3.3"
   }
-}
+}

src/gdrive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-gdrive",
-  "version": "0.5.1",
+  "version": "0.6.2",
   "description": "MCP server for interacting with Google Drive",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@google-cloud/local-auth": "^3.0.1",
-    "@modelcontextprotocol/sdk": "0.5.0",
+    "@modelcontextprotocol/sdk": "1.0.1",
     "googleapis": "^144.0.0"
   },
   "devDependencies": {
@@ -28,4 +28,4 @@
     "shx": "^0.3.4",
     "typescript": "^5.6.2"
   }
-}
+}

src/git/README.md

@@ -53,6 +53,13 @@ Please note that mcp-server-git is currently in early development. The functiona
      - `max_count` (number, optional): Maximum number of commits to show (default: 10)
    - Returns: Array of commit entries with hash, author, date, and message
 
+8. `git_create_branch`
+   - Creates a new branch
+   - Inputs:
+     - `repo_path` (string): Path to Git repository
+     - `branch_name` (string): Name of the new branch
+     - `start_point` (string, optional): Starting point for the new branch
+   - Returns: Confirmation of branch creation
 
 ## Installation
 
@@ -156,6 +163,29 @@ cd path/to/servers/src/git
 npx @modelcontextprotocol/inspector uv run mcp-server-git
 ```
 
+Running `tail -n 20 -f ~/Library/Logs/Claude/mcp*.log` will show the logs from the server and may
+help you debug any issues.
+
+## Development
+
+If you are doing local development, there are two ways to test your changes:
+
+1. Run the MCP inspector to test your changes. See [Debugging](#debugging) for run instructions.
+
+2. Test using the Claude desktop app. Add the following to your `claude_desktop_config.json`:
+
+```json
+"git": {
+  "command": "uv",
+  "args": [
+    "--directory",
+    "/<path to mcp-servers>/mcp-servers/src/git",
+    "run",
+    "mcp-server-git"
+  ]
+}
+```
+
 ## License
 
 This MCP server is licensed under the MIT License. This means you are free to use, modify, and distribute the software, subject to the terms and conditions of the MIT License. For more details, please see the LICENSE file in the project repository.

src/git/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-server-git"
-version = "0.6.1"
+version = "0.6.2"
 description = "A Model Context Protocol server providing tools to read, search, and manipulate Git repositories programmatically via LLMs"
 readme = "README.md"
 requires-python = ">=3.10"

src/git/src/mcp_server_git/server.py

@@ -39,6 +39,11 @@ class GitLog(BaseModel):
     repo_path: str
     max_count: int = 10
 
+class GitCreateBranch(BaseModel):
+    repo_path: str
+    branch_name: str
+    base_branch: str | None = None
+
 class GitTools(str, Enum):
     STATUS = "git_status"
     DIFF_UNSTAGED = "git_diff_unstaged"
@@ -47,6 +52,7 @@ class GitTools(str, Enum):
     ADD = "git_add"
     RESET = "git_reset"
     LOG = "git_log"
+    CREATE_BRANCH = "git_create_branch"
 
 def git_status(repo: git.Repo) -> str:
     return repo.git.status()
@@ -81,6 +87,15 @@ def git_log(repo: git.Repo, max_count: int = 10) -> list[str]:
         )
     return log
 
+def git_create_branch(repo: git.Repo, branch_name: str, base_branch: str | None = None) -> str:
+    if base_branch:
+        base = repo.refs[base_branch]
+    else:
+        base = repo.active_branch
+
+    repo.create_head(branch_name, base)
+    return f"Created branch '{branch_name}' from '{base.name}'"
+
 async def serve(repository: Path | None) -> None:
     logger = logging.getLogger(__name__)
 
@@ -132,6 +147,11 @@ async def serve(repository: Path | None) -> None:
                 description="Shows the commit logs",
                 inputSchema=GitLog.schema(),
             ),
+            Tool(
+                name=GitTools.CREATE_BRANCH,
+                description="Creates a new branch from an optional base branch",
+                inputSchema=GitCreateBranch.schema(),
+            ),
         ]
 
     async def list_repos() -> Sequence[str]:
@@ -218,6 +238,17 @@ async def serve(repository: Path | None) -> None:
                     text="Commit history:\n" + "\n".join(log)
                 )]
 
+            case GitTools.CREATE_BRANCH:
+                result = git_create_branch(
+                    repo,
+                    arguments["branch_name"],
+                    arguments.get("base_branch")
+                )
+                return [TextContent(
+                    type="text",
+                    text=result
+                )]
+
             case _:
                 raise ValueError(f"Unknown tool: {name}")
 

src/git/uv.lock

@@ -146,7 +146,7 @@ wheels = [
 
 [[package]]
 name = "mcp"
-version = "0.9.1"
+version = "1.1.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -156,14 +156,14 @@ dependencies = [
     { name = "sse-starlette" },
     { name = "starlette" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e7/1c/932818470ffd49c33509110c835101a8dc4c9cdd06028b9f647fb3dde237/mcp-0.9.1.tar.gz", hash = "sha256:e8509a37c2ab546095788ed170e0fb4d7ce0cf5a3ee56b6449c78af27321a425", size = 78218 }
+sdist = { url = "https://files.pythonhosted.org/packages/77/f2/067b1fc114e8d3ae4af02fc4f4ed8971a2c4900362d976fabe0f4e9a3418/mcp-1.1.0.tar.gz", hash = "sha256:e3c8d6df93a4de90230ea944dd667730744a3cd91a4cc0ee66a5acd53419e100", size = 83802 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b3/a0/2ee813d456b57a726d583868417d1ad900fbe12ee3c8cd866e3e804ca486/mcp-0.9.1-py3-none-any.whl", hash = "sha256:7f640fcfb0be486aa510594df309920ae1d375cdca1f8aff21db3a96d837f303", size = 31562 },
+    { url = "https://files.pythonhosted.org/packages/b9/3e/aef19ac08a6f9a347c086c4e628c2f7329659828cbe92ffd524ec2aac833/mcp-1.1.0-py3-none-any.whl", hash = "sha256:44aa4d2e541f0924d6c344aa7f96b427a6ee1df2fab70b5f9ae2f8777b3f05f2", size = 36576 },
 ]
 
 [[package]]
 name = "mcp-server-git"
-version = "0.4.1"
+version = "0.6.2"
 source = { editable = "." }
 dependencies = [
     { name = "click" },
@@ -182,7 +182,7 @@ dev = [
 requires-dist = [
     { name = "click", specifier = ">=8.1.7" },
     { name = "gitpython", specifier = ">=3.1.43" },
-    { name = "mcp", specifier = ">=0.6.0" },
+    { name = "mcp", specifier = ">=1.0.0" },
     { name = "pydantic", specifier = ">=2.0.0" },
 ]
 

src/github/index.ts

@@ -529,7 +529,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       case "fork_repository": {
         const args = ForkRepositorySchema.parse(request.params.arguments);
         const fork = await forkRepository(args.owner, args.repo, args.organization);
-        return { toolResult: fork };
+        return { content: [{ type: "text", text: JSON.stringify(fork, null, 2) }] };
       }
 
       case "create_branch": {
@@ -562,25 +562,25 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           sha
         });
 
-        return { toolResult: branch };
+        return { content: [{ type: "text", text: JSON.stringify(branch, null, 2) }] };
       }
 
       case "search_repositories": {
         const args = SearchRepositoriesSchema.parse(request.params.arguments);
         const results = await searchRepositories(args.query, args.page, args.perPage);
-        return { toolResult: results };
+        return { content: [{ type: "text", text: JSON.stringify(results, null, 2) }] };
       }
 
       case "create_repository": {
         const args = CreateRepositorySchema.parse(request.params.arguments);
         const repository = await createRepository(args);
-        return { toolResult: repository };
+        return { content: [{ type: "text", text: JSON.stringify(repository, null, 2) }] };
       }
 
       case "get_file_contents": {
         const args = GetFileContentsSchema.parse(request.params.arguments);
         const contents = await getFileContents(args.owner, args.repo, args.path, args.branch);
-        return { toolResult: contents };
+        return { content: [{ type: "text", text: JSON.stringify(contents, null, 2) }] };
       }
 
       case "create_or_update_file": {
@@ -594,7 +594,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           args.branch,
           args.sha
         );
-        return { toolResult: result };
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
 
       case "push_files": {
@@ -606,21 +606,21 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           args.files,
           args.message
         );
-        return { toolResult: result };
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
 
       case "create_issue": {
         const args = CreateIssueSchema.parse(request.params.arguments);
         const { owner, repo, ...options } = args;
         const issue = await createIssue(owner, repo, options);
-        return { toolResult: issue };
+        return { content: [{ type: "text", text: JSON.stringify(issue, null, 2) }] };
       }
 
       case "create_pull_request": {
         const args = CreatePullRequestSchema.parse(request.params.arguments);
         const { owner, repo, ...options } = args;
         const pullRequest = await createPullRequest(owner, repo, options);
-        return { toolResult: pullRequest };
+        return { content: [{ type: "text", text: JSON.stringify(pullRequest, null, 2) }] };
       }
 
       default: