fix(server.py): remove unused content field from error response in EditTextFileContentsHandler to clean up the response structure

test(server.py): add unit test for EditTextFileContentsHandler to verify handling of multiple patches in a single file to ensure correct functionality and prevent regressions

Author: tumfwkm

src/mcp_text_editor/server.py

@@ -192,7 +192,6 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
                             "result": "error",
                             "reason": "Empty patches list",
                             "file_hash": file_hash,
-                            "content": None,
                         }
                         continue
 
@@ -206,7 +205,7 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
                     if "path" in file_operation:
                         file_path = file_operation["path"]
                         try:
-                            current_content, _, _, current_hash, _, _ = (
+                            _, _, _, current_hash, _, _ = (
                                 await self.editor.read_file_contents(file_path)
                             )
                         except Exception:
@@ -216,7 +215,6 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
                         "result": "error",
                         "reason": str(e),
                         "file_hash": current_hash,
-                        "content": None,
                     }
 
             return [TextContent(type="text", text=json.dumps(results, indent=2))]

tests/test_server.py

@@ -404,3 +404,61 @@ async def test_edit_contents_handler_missing_patches():
     with pytest.raises(RuntimeError) as exc_info:
         await edit_contents_handler.run_tool(edit_args)
     assert "Missing required field: patches" in str(exc_info.value)
+
+
+@pytest.mark.asyncio
+async def test_edit_contents_handler_multiple_patches(tmp_path):
+    """Test EditTextFileContents handler with multiple patches in a single file."""
+    test_file = tmp_path / "test.txt"
+    test_file.write_text("line1\nline2\nline3\nline4\nline5\n")
+    file_path = str(test_file)
+
+    get_args = {"files": [{"file_path": file_path, "ranges": [{"start": 1}]}]}
+    get_result = await get_contents_handler.run_tool(get_args)
+    content_info = json.loads(get_result[0].text)
+    file_hash = content_info[file_path]["file_hash"]
+
+    ranges = [{"start": 2, "end": 2}, {"start": 4, "end": 4}]
+    get_range_args = {"files": [{"file_path": file_path, "ranges": ranges}]}
+    range_result = json.loads(
+        (await get_contents_handler.run_tool(get_range_args))[0].text
+    )
+    range_hashes = [r["range_hash"] for r in range_result[file_path]["ranges"]]
+
+    edit_args = {
+        "files": [
+            {
+                "path": file_path,
+                "file_hash": file_hash,
+                "patches": [
+                    {
+                        "line_start": 2,
+                        "line_end": 2,
+                        "contents": "Modified Line 2\n",
+                        "range_hash": range_hashes[0],
+                    },
+                    {
+                        "line_start": 4,
+                        "line_end": 4,
+                        "contents": "Modified Line 4\n",
+                        "range_hash": range_hashes[1],
+                    },
+                ],
+            }
+        ]
+    }
+
+    # 編集を適用
+    result = await edit_contents_handler.run_tool(edit_args)
+
+    # 結果の検証
+    assert len(result) == 1
+    edit_results = json.loads(result[0].text)
+    assert file_path in edit_results
+    assert edit_results[file_path]["result"] == "ok"
+
+    # ファイルの内容を確認
+    with open(file_path) as f:
+        content = f.read()
+    assert "Modified Line 2" in content
+    assert "Modified Line 4" in content