Merge branch 'remove-edit' into develop

Author: tumf

.gitignore

@@ -35,6 +35,8 @@ ENV/
 *.swo
 
 # Testing
+*.cover
+*,cover
 .coverage
 .coverage.*
 .pytest_cache/

src/mcp_text_editor/handlers/__init__.py

@@ -3,7 +3,6 @@
 from .append_text_file_contents import AppendTextFileContentsHandler
 from .create_text_file import CreateTextFileHandler
 from .delete_text_file_contents import DeleteTextFileContentsHandler
-from .edit_text_file_contents import EditTextFileContentsHandler
 from .get_text_file_contents import GetTextFileContentsHandler
 from .insert_text_file_contents import InsertTextFileContentsHandler
 from .patch_text_file_contents import PatchTextFileContentsHandler
@@ -12,7 +11,6 @@
     "AppendTextFileContentsHandler",
     "CreateTextFileHandler",
     "DeleteTextFileContentsHandler",
-    "EditTextFileContentsHandler",
     "GetTextFileContentsHandler",
     "InsertTextFileContentsHandler",
     "PatchTextFileContentsHandler",

src/mcp_text_editor/handlers/base.py

@@ -13,9 +13,9 @@ class BaseHandler:
     name: str = ""
     description: str = ""
 
-    def __init__(self):
+    def __init__(self, editor: TextEditor | None = None):
         """Initialize the handler."""
-        self.editor = TextEditor()
+        self.editor = editor if editor is not None else TextEditor()
 
     def get_tool_description(self) -> Tool:
         """Get the tool description."""

src/mcp_text_editor/handlers/edit_text_file_contents.py

@@ -85,14 +85,17 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
             is_before = "before" in arguments
             encoding = arguments.get("encoding", "utf-8")
 
+            # Get result from editor
             result = await self.editor.insert_text_file_contents(
                 file_path=file_path,
                 file_hash=arguments["file_hash"],
                 contents=arguments["contents"],
-                before=is_before,
-                line_number=line_number,
+                before=line_number if is_before else None,
+                after=None if is_before else line_number,
                 encoding=encoding,
             )
+            # Wrap result with file_path key
+            result = {file_path: result}
             return [TextContent(type="text", text=json.dumps(result, indent=2))]
 
         except Exception as e:

src/mcp_text_editor/handlers/insert_text_file_contents.py

@@ -17,7 +17,7 @@ class PatchTextFileContentsHandler(BaseHandler):
     """Handler for patching a text file."""
 
     name = "patch_text_file_contents"
-    description = "Apply patches to text files with hash-based validation for concurrency control."
+    description = "Apply patches to text files with hash-based validation for concurrency control.you need to use get_text_file_contents tool to get the file hash and range hash every time before using this tool. you can use append_text_file_contents tool to append text contents to the file without range hash, start and end. you can use insert_text_file_contents tool to insert text contents to the file without range hash, start and end."
 
     def get_tool_description(self) -> Tool:
         """Get the tool description."""
@@ -43,19 +43,19 @@ def get_tool_description(self) -> Tool:
                             "properties": {
                                 "start": {
                                     "type": "integer",
-                                    "description": "Starting line number (1-based)",
+                                    "description": "Starting line number (1-based).it should match the range hash.",
                                 },
                                 "end": {
                                     "type": ["integer", "null"],
-                                    "description": "Ending line number (null for end of file)",
+                                    "description": "Ending line number (null for end of file).it should match the range hash.",
                                 },
                                 "contents": {
                                     "type": "string",
                                     "description": "New content to replace the range with",
                                 },
                                 "range_hash": {
                                     "type": "string",
-                                    "description": "Hash of the content being replaced",
+                                    "description": "Hash of the content being replaced. it should get from get_text_file_contents tool with the same start and end.",
                                 },
                             },
                             "required": ["start", "contents", "range_hash"],

src/mcp_text_editor/handlers/patch_text_file_contents.py

@@ -111,6 +111,9 @@ class FileRange(BaseModel):
     end: Optional[int] = Field(
         None, description="Ending line number (null for end of file)"
     )
+    range_hash: Optional[str] = Field(
+        None, description="Hash of the content to be deleted"
+    )
 
 
 class FileRanges(BaseModel):
@@ -149,6 +152,9 @@ class InsertTextFileContentsRequest(BaseModel):
     before: Optional[int] = Field(
         None, description="Line number before which to insert content"
     )
+    encoding: Optional[str] = Field(
+        "utf-8", description="Text encoding (default: 'utf-8')"
+    )
     contents: str = Field(..., description="Content to insert")
 
     @model_validator(mode="after")
@@ -170,10 +176,9 @@ def validate_line_number(cls, v) -> Optional[int]:
 
 class DeleteTextFileContentsRequest(BaseModel):
     """Request model for deleting text from a file.
-
     Example:
     {
-        "path": "/path/to/file",
+        "file_path": "/path/to/file",
         "file_hash": "abc123...",
         "ranges": [
             {
@@ -185,15 +190,34 @@ class DeleteTextFileContentsRequest(BaseModel):
     }
     """
 
-    path: str = Field(..., description="Path to the text file")
+    file_path: str = Field(..., description="Path to the text file")
     file_hash: str = Field(..., description="Hash of original contents")
     ranges: List[FileRange] = Field(..., description="List of ranges to delete")
+    encoding: Optional[str] = Field(
+        "utf-8", description="Text encoding (default: 'utf-8')"
+    )
 
-    @field_validator("range_hash")
-    def validate_range_hash(cls, v: str) -> str:
-        """Validate that range_hash is not empty."""
-        if not v:
-            raise ValueError("range_hash cannot be empty")
-        return v
 
-    range_hash: str = Field(..., description="Hash of the content to be deleted")
+class PatchTextFileContentsRequest(BaseModel):
+    """Request model for patching text in a file.
+    Example:
+    {
+        "file_path": "/path/to/file",
+        "file_hash": "abc123...",
+        "patches": [
+            {
+                "start": 5,
+                "end": 10,
+                "contents": "new content",
+                "range_hash": "def456..."
+            }
+        ]
+    }
+    """
+
+    file_path: str = Field(..., description="Path to the text file")
+    file_hash: str = Field(..., description="Hash of original contents")
+    patches: List[EditPatch] = Field(..., description="List of patches to apply")
+    encoding: Optional[str] = Field(
+        "utf-8", description="Text encoding (default: 'utf-8')"
+    )

src/mcp_text_editor/models.py

@@ -12,7 +12,6 @@
     AppendTextFileContentsHandler,
     CreateTextFileHandler,
     DeleteTextFileContentsHandler,
-    EditTextFileContentsHandler,
     GetTextFileContentsHandler,
     InsertTextFileContentsHandler,
     PatchTextFileContentsHandler,
@@ -27,7 +26,6 @@
 
 # Initialize tool handlers
 get_contents_handler = GetTextFileContentsHandler()
-edit_contents_handler = EditTextFileContentsHandler()
 patch_file_handler = PatchTextFileContentsHandler()
 create_file_handler = CreateTextFileHandler()
 append_file_handler = AppendTextFileContentsHandler()
@@ -40,7 +38,6 @@ async def list_tools() -> List[Tool]:
     """List available tools."""
     return [
         get_contents_handler.get_tool_description(),
-        edit_contents_handler.get_tool_description(),
         create_file_handler.get_tool_description(),
         append_file_handler.get_tool_description(),
         delete_contents_handler.get_tool_description(),
@@ -56,8 +53,6 @@ async def call_tool(name: str, arguments: Any) -> Sequence[TextContent]:
     try:
         if name == get_contents_handler.name:
             return await get_contents_handler.run_tool(arguments)
-        elif name == edit_contents_handler.name:
-            return await edit_contents_handler.run_tool(arguments)
         elif name == create_file_handler.name:
             return await create_file_handler.run_tool(arguments)
         elif name == append_file_handler.name: