Merge branch 'fix/remove-file-hash-from-error' into develop

Author: tumfwkm

src/mcp_text_editor/text_editor.py

@@ -225,7 +225,6 @@ async def edit_file_contents(
                     return {
                         "result": "error",
                         "reason": "File not found and non-empty hash provided",
-                        "file_hash": None,
                         "content": None,
                     }
                 # Create parent directories if they don't exist
@@ -237,7 +236,6 @@ async def edit_file_contents(
                         return {
                             "result": "error",
                             "reason": f"Failed to create directory: {str(e)}",
-                            "file_hash": None,
                             "content": None,
                         }
                 # Initialize empty state for new file
@@ -267,7 +265,6 @@ async def edit_file_contents(
                     return {
                         "result": "error",
                         "reason": "FileHash mismatch - Please use get_text_file_contents tool to get current content and hashes, then retry with the updated hashes.",
-                        "file_hash": None,
                         "content": None,
                     }
                 else:
@@ -377,7 +374,6 @@ async def edit_file_contents(
                             return {
                                 "result": "error",
                                 "reason": "Content range hash mismatch - Please use get_text_file_contents tool to get current content and hashes, then retry with the updated hashes.",
-                                "file_hash": None,
                                 "content": current_content,
                             }
 
@@ -423,7 +419,6 @@ async def edit_file_contents(
             return {
                 "result": "error",
                 "reason": f"Error editing file: {str(e)}",
-                "file_hash": None,
                 "content": None,
             }
         except Exception as e:
@@ -434,6 +429,5 @@ async def edit_file_contents(
             return {
                 "result": "error",
                 "reason": "Unexpected error occurred",
-                "file_hash": None,
                 "content": None,
             }

tests/test_server.py

@@ -314,7 +314,7 @@ async def test_edit_contents_handler_partial_failure(tmp_path):
     nonexistent_path = str(tmp_path / "nonexistent.txt")
     assert edit_results[nonexistent_path]["result"] == "error"
     assert "File not found" in edit_results[nonexistent_path]["reason"]
-    assert edit_results[nonexistent_path]["file_hash"] is None
+    assert "file_hash" not in edit_results[nonexistent_path]
 
 
 @pytest.mark.asyncio

tests/test_text_editor.py

@@ -57,7 +57,7 @@ async def test_directory_creation_error(editor, tmp_path, mocker):
 
     assert result["result"] == "error"
     assert "Failed to create directory" in result["reason"]
-    assert result["file_hash"] is None
+    assert "file_hash" not in result
 
 
 @pytest.mark.asyncio
@@ -376,7 +376,7 @@ async def test_directory_creation_failure(editor, tmp_path):
 
     assert result["result"] == "error"
     assert "Failed to create directory" in result["reason"]
-    assert result["file_hash"] is None
+    assert "file_hash" not in result
 
 
 @pytest.mark.asyncio
@@ -429,7 +429,7 @@ def mock_makedirs(*args, **kwargs):
     assert result["result"] == "error"
     assert "Failed to create directory" in result["reason"]
     assert "Permission denied" in result["reason"]
-    assert result["file_hash"] is None
+    assert "file_hash" not in result
     assert result["content"] is None
 
 
@@ -487,7 +487,7 @@ async def test_file_write_permission_error(editor, tmp_path):
     assert result["result"] == "error"
     assert "Error editing file" in result["reason"]
     assert "Permission" in result["reason"]
-    assert result["file_hash"] is None
+    assert "file_hash" not in result
     assert result["content"] is None
 
 
@@ -565,7 +565,7 @@ async def test_new_file_with_non_empty_hash(editor, tmp_path):
     # Verify proper error handling
     assert result["result"] == "error"
     assert "File not found and non-empty hash provided" in result["reason"]
-    assert result["file_hash"] is None
+    assert "file_hash" not in result
     assert result["content"] is None
 
 
@@ -618,7 +618,7 @@ def mock_makedirs(*args, **kwargs):
     assert result["result"] == "error"
     assert "Failed to create directory" in result["reason"]
     assert "Permission denied" in result["reason"]
-    assert result["file_hash"] is None
+    assert "file_hash" not in result
     assert result["content"] is None