CodeMergeSAFE

A Model Context Protocol (MCP) server that uses the Osmosis-Apply-1.7B model to merge code edits.

• Code Merging: Uses the Osmosis/Osmosis-Apply-1.7B model to apply edits
• MCP Integration: Works as a Model Context Protocol server to integrate into existing AI IDE solutions
• File Operations: Can directly edit files in place or return edited code

Installation

Prerequisites

• Python 3.10 or higher
• Ollama installed and running
• The Osmosis model pulled: ollama pull Osmosis/Osmosis-Apply-1.7B

Setup

1. Clone the repository:

git clone 
cd codemerge

1. Install dependencies using uv:

uv sync

1. Run:

uv run python codemerge.py

Usage

As an MCP Server

CodeMerge can be used as an MCP server. Configure it in your MCP client:

{
"mcpServers": {
"codemerge": {
"command": "uv",
"args": [
"--directory",
"/path/to/codemerge",
"run",
"codemerge.py"
]
}
}
}

Direct Usage

You can also use CodeMerge directly in Python:

from call_snippet import apply_code_edit

# Original code
original_code = """def hello():
print('Hello, World!')
print('Some code')
print('Some more code')
return 'success'"""

# Edit to apply
edit_snippet = """def hello():
print('Hello, Universe!')
print('Some code')
# ... existing code ...
return 'success'"""

# Apply the edit
result = apply_code_edit(original_code, edit_snippet)
print(result)

MCP Tool Usage

The MCP server provides an edit_snippet tool with the following parameters:

• original_code: The exact original code to be edited
• edit_snippet: The edit to apply, using // ... existing code ... markers
• file_path: Absolute path to a file to update in place

Example tool call:

{
"name": "edit_snippet",
"arguments": {
"original_code": "def hello():\n    print('Hello, World!')",