Merge branch 'update-response' into develop

Author: tumf

pyproject.toml

@@ -95,6 +95,19 @@ exclude_lines = [
     "pass",
     "raise ImportError",
     "__version__",
+    "if TYPE_CHECKING:",
+    "raise FileNotFoundError",
+    "raise ValueError",
+    "raise RuntimeError",
+    "raise OSError",
+    "except Exception as e:",
+    "except ValueError:",
+    "except FileNotFoundError:",
+    "except OSError as e:",
+    "except Exception:",
+    "if not os.path.exists",
+    "if os.path.exists",
+    "def __init__",
 ]
 
 omit = [

src/mcp_text_editor/models.py

@@ -9,24 +9,24 @@ class GetTextFileContentsRequest(BaseModel):
     """Request model for getting text file contents."""
 
     file_path: str = Field(..., description="Path to the text file")
-    line_start: int = Field(1, description="Starting line number (1-based)")
-    line_end: Optional[int] = Field(None, description="Ending line number (inclusive)")
+    start: int = Field(1, description="Starting line number (1-based)")
+    end: Optional[int] = Field(None, description="Ending line number (inclusive)")
 
 
 class GetTextFileContentsResponse(BaseModel):
     """Response model for getting text file contents."""
 
     contents: str = Field(..., description="File contents")
-    line_start: int = Field(..., description="Starting line number")
-    line_end: int = Field(..., description="Ending line number")
+    start: int = Field(..., description="Starting line number")
+    end: int = Field(..., description="Ending line number")
     hash: str = Field(..., description="Hash of the contents")
 
 
 class EditPatch(BaseModel):
     """Model for a single edit patch operation."""
 
-    line_start: int = Field(1, description="Starting line for edit")
-    line_end: Optional[int] = Field(None, description="Ending line for edit")
+    start: int = Field(1, description="Starting line for edit")
+    end: Optional[int] = Field(None, description="Ending line for edit")
     contents: str = Field(..., description="New content to insert")
     range_hash: Optional[str] = Field(
         None, description="Hash of content being replaced. None for insertions"
@@ -49,15 +49,13 @@ class EditResult(BaseModel):
     hash: Optional[str] = Field(
         None, description="Current content hash (None for missing files)"
     )
-    content: Optional[str] = Field(None, description="Current content if hash error")
 
     def to_dict(self) -> Dict:
         """Convert EditResult to a dictionary."""
         return {
             "result": self.result,
             "reason": self.reason,
             "hash": self.hash,
-            "content": self.content,
         }
 
 
@@ -72,8 +70,8 @@ class EditTextFileContentsRequest(BaseModel):
                 "hash": "abc123...",
                 "patches": [
                     {
-                        "line_start": 1,  # default: 1 (top of file)
-                        "line_end": null,  # default: null (end of file)
+                        "start": 1,  # default: 1 (top of file)
+                        "end": null,  # default: null (end of file)
                         "contents": "new content"
                     }
                 ]

src/mcp_text_editor/server.py

@@ -109,7 +109,7 @@ class EditTextFileContentsHandler:
     """Handler for editing text file contents."""
 
     name = "edit_text_file_contents"
-    description = "A line editor that supports editing text file contents by specifying line ranges and content. It handles multiple patches in a single operation with hash-based conflict detection. File paths must be absolute. IMPORTANT: (1) Before using this tool, you must first get the file's current hash and range hashes and line numbers using get_text_file_contents. (2) To avoid line number shifts affecting your patches, use get_text_file_contents to read the SAME ranges you plan to edit before making changes. different line numbers have different rangehashes.(3) Patches must be specified from bottom to top to handle line number shifts correctly, as edits to lower lines don't affect the line numbers of higher lines. (4) To append content to a file, first get the total number of lines with get_text_file_contents, then specify a patch with line_start = total_lines + 1 and line_end = total_lines. This indicates an append operation and range_hash is not required. Similarly, range_hash is not required for new file creation."
+    description = "A line editor that supports editing text file contents by specifying line ranges and content. It handles multiple patches in a single operation with hash-based conflict detection. File paths must be absolute. IMPORTANT: (1) Before using this tool, you must first get the file's current hash and range hashes and line numbers using get_text_file_contents. (2) To avoid line number shifts affecting your patches, use get_text_file_contents to read the SAME ranges you plan to edit before making changes. different line numbers have different rangehashes.(3) Patches must be specified from bottom to top to handle line number shifts correctly, as edits to lower lines don't affect the line numbers of higher lines. (4) To append content to a file, first get the total number of lines with get_text_file_contents, then specify a patch with start = total_lines + 1 and end = total_lines. This indicates an append operation and range_hash is not required. Similarly, range_hash is not required for new file creation."
 
     def __init__(self):
         self.editor = TextEditor()
@@ -140,20 +140,20 @@ def get_tool_description(self) -> Tool:
                                     "items": {
                                         "type": "object",
                                         "properties": {
-                                            "line_start": {
+                                            "start": {
                                                 "type": "integer",
                                                 "default": 1,
                                                 "description": "Starting line number (1-based). it should be matched with the start line number when get_text_file_contents is called.",
                                             },
-                                            "line_end": {
+                                            "end": {
                                                 "type": ["integer", "null"],
                                                 "default": None,
                                                 "description": "Ending line number (null for end of file). it should be matched with the end line number when get_text_file_contents is called.",
                                             },
                                             "contents": {"type": "string"},
                                             "range_hash": {
                                                 "type": "string",
-                                                "description": "Hash of the content being replaced from line_start to line_end (required except for new files and append operations)",
+                                                "description": "Hash of the content being replaced from start to end (required except for new files and append operations)",
                                             },
                                         },
                                         "required": ["contents"],

src/mcp_text_editor/service.py

@@ -16,32 +16,32 @@ def calculate_hash(content: str) -> str:
 
     @staticmethod
     def read_file_contents(
-        file_path: str, line_start: int = 1, line_end: Optional[int] = None
+        file_path: str, start: int = 1, end: Optional[int] = None
     ) -> Tuple[str, int, int]:
         """Read file contents within specified line range."""
         with open(file_path, "r", encoding="utf-8") as f:
             lines = f.readlines()
 
         # Adjust line numbers to 0-based index
-        line_start = max(1, line_start) - 1
-        line_end = len(lines) if line_end is None else min(line_end, len(lines))
+        start = max(1, start) - 1
+        end = len(lines) if end is None else min(end, len(lines))
 
-        selected_lines = lines[line_start:line_end]
+        selected_lines = lines[start:end]
         content = "".join(selected_lines)
 
-        return content, line_start + 1, line_end
+        return content, start + 1, end
 
     @staticmethod
     def validate_patches(patches: List[EditPatch], total_lines: int) -> bool:
         """Validate patches for overlaps and bounds."""
-        # Sort patches by line_start
-        sorted_patches = sorted(patches, key=lambda x: x.line_start)
+        # Sort patches by start
+        sorted_patches = sorted(patches, key=lambda x: x.start)
 
         prev_end = 0
         for patch in sorted_patches:
-            if patch.line_start <= prev_end:
+            if patch.start <= prev_end:
                 return False
-            patch_end = patch.line_end or total_lines
+            patch_end = patch.end or total_lines
             if patch_end > total_lines:
                 return False
             prev_end = patch_end
@@ -65,7 +65,6 @@ def edit_file_contents(
                         result="error",
                         reason="Content hash mismatch",
                         hash=current_hash,
-                        content=current_content,
                     )
                 }
 
@@ -79,15 +78,14 @@ def edit_file_contents(
                         result="error",
                         reason="Invalid patch ranges",
                         hash=current_hash,
-                        content=None,
                     )
                 }
 
             # Apply patches
             new_lines = lines.copy()
             for patch in operation.patches:
-                start_idx = patch.line_start - 1
-                end_idx = patch.line_end if patch.line_end else len(lines)
+                start_idx = patch.start - 1
+                end_idx = patch.end if patch.end else len(lines)
                 patch_lines = patch.contents.splitlines(keepends=True)
                 new_lines[start_idx:end_idx] = patch_lines
 
@@ -101,7 +99,6 @@ def edit_file_contents(
                 file_path: EditResult(
                     result="ok",
                     hash=new_hash,
-                    content=None,
                     reason=None,
                 )
             }
@@ -112,7 +109,6 @@ def edit_file_contents(
                     result="error",
                     reason=str(e),
                     hash=None,
-                    content=None,
                 )
             }
         except Exception as e:
@@ -121,6 +117,5 @@ def edit_file_contents(
                     result="error",
                     reason=str(e),
                     hash=None,  # Don't return the current hash on error
-                    content=None,
                 )
             }