refactor: Remove content field from error responses

Author: Yoshihiro Takahara

src/mcp_text_editor/models.py

@@ -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,
         }
 
 

src/mcp_text_editor/service.py

@@ -65,7 +65,6 @@ def edit_file_contents(
                         result="error",
                         reason="Content hash mismatch",
                         hash=current_hash,
-                        content=None,
                     )
                 }
 
@@ -79,7 +78,6 @@ def edit_file_contents(
                         result="error",
                         reason="Invalid patch ranges",
                         hash=current_hash,
-                        content=None,
                     )
                 }
 
@@ -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,
                 )
             }

tests/test_models.py

@@ -101,19 +101,16 @@ def test_edit_result():
     assert result.result == "ok"
     assert result.hash == "newhash123"
     assert result.reason is None
-    assert result.content is None
 
-    # Test error result with reason and content
+    # Test error result with reason
     result = EditResult(
         result="error",
         reason="hash mismatch",
         hash="currenthash123",
-        content="current content",
     )
     assert result.result == "error"
     assert result.reason == "hash mismatch"
     assert result.hash == "currenthash123"
-    assert result.content == "current content"
 
     # Test validation error - missing required fields
     with pytest.raises(ValidationError):
@@ -171,22 +168,19 @@ def test_edit_result_to_dict():
         "result": "ok",
         "hash": "newhash123",
         "reason": None,
-        "content": None,
     }
 
     # Test error result
     result = EditResult(
         result="error",
         reason="hash mismatch",
         hash="currenthash123",
-        content="current content",
     )
     result_dict = result.to_dict()
     assert result_dict == {
         "result": "error",
         "reason": "hash mismatch",
         "hash": "currenthash123",
-        "content": "current content",
     }
 
 

tests/test_service.py

@@ -119,7 +119,6 @@ def test_edit_file_contents_hash_mismatch(service, tmp_path):
     edit_result = result[file_path]
     assert edit_result.result == "error"
     assert "hash mismatch" in edit_result.reason.lower()
-    assert edit_result.content is None
 
 
 def test_edit_file_contents_invalid_patches(service, tmp_path):
@@ -186,7 +185,6 @@ def test_edit_file_unexpected_error(service, tmp_path):
     assert edit_result.result == "error"
     assert "no such file" in edit_result.reason.lower()
     assert edit_result.hash is None
-    assert edit_result.content is None
 
 
 def test_edit_file_contents_permission_error(service, tmp_path):
@@ -214,7 +212,6 @@ def test_edit_file_contents_permission_error(service, tmp_path):
     assert edit_result.result == "error"
     assert "permission denied" in edit_result.reason.lower()
     assert edit_result.hash is None
-    assert edit_result.content is None
 
     # Clean up
     os.chmod(file_path, 0o644)
@@ -257,4 +254,3 @@ def test_edit_file_contents_general_exception(service, mocker):
         if os.path.exists(test_file):
             os.remove(test_file)
     assert edit_result.hash is None
-    assert edit_result.content is None