URL-encode trash_path in DAV URLs and fix restore_trash_item annotation

Author: bigcat88

src/nextcloud_mcp/client.py

@@ -3,6 +3,7 @@
 import contextlib
 import xml.etree.ElementTree as ET
 from typing import Any
+from urllib.parse import quote as url_quote
 
 import niquests
 from urllib3.util import Retry
@@ -275,16 +276,18 @@ async def trashbin_restore(self, trash_path: str) -> None:
         """Restore a trashed item by MOVEing it to the restore folder."""
         session = await self._get_session()
         user = self._config.user
-        src = f"{self._base_url}/remote.php/dav/trashbin/{user}/trash/{trash_path}"
-        dest = f"{self._base_url}/remote.php/dav/trashbin/{user}/restore/{trash_path}"
+        encoded = url_quote(trash_path, safe="/")
+        src = f"{self._base_url}/remote.php/dav/trashbin/{user}/trash/{encoded}"
+        dest = f"{self._base_url}/remote.php/dav/trashbin/{user}/restore/{encoded}"
         response = await session.request("MOVE", src, headers={"Destination": dest})
         _raise_for_status(response, f"Restore '{trash_path}'")
 
     async def trashbin_delete(self, trash_path: str = "") -> None:
         """Delete a single item or empty the entire trash (if path is empty)."""
         session = await self._get_session()
         user = self._config.user
-        url = f"{self._base_url}/remote.php/dav/trashbin/{user}/trash/{trash_path}"
+        encoded = url_quote(trash_path, safe="/") if trash_path else ""
+        url = f"{self._base_url}/remote.php/dav/trashbin/{user}/trash/{encoded}"
         response = await session.delete(url)
         _raise_for_status(response, "Empty trash" if not trash_path else f"Delete '{trash_path}' from trash")
 

src/nextcloud_mcp/tools/trashbin.py

@@ -8,7 +8,7 @@
 
 from mcp.server.fastmcp import FastMCP
 
-from ..annotations import DESTRUCTIVE, READONLY
+from ..annotations import ADDITIVE_IDEMPOTENT, DESTRUCTIVE, READONLY
 from ..client import DAV_NS, NC_NS, OC_NS
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client, get_config
@@ -99,7 +99,7 @@ async def list_trash() -> str:
 
 
 def _register_write_tools(mcp: FastMCP) -> None:
-    @mcp.tool(annotations=READONLY)
+    @mcp.tool(annotations=ADDITIVE_IDEMPOTENT)
     @require_permission(PermissionLevel.WRITE)
     async def restore_trash_item(trash_path: str) -> str:
         """Restore a file or folder from the trash bin to its original location.