Fix get_app_info returning null fields, tighten test assertions

- Remove enabled/type from _format_app (getAppInfo endpoint doesn't
  return active/type fields, so they were always null)
- Use ADDITIVE_IDEMPOTENT annotation for enable_app (idempotent op)
- Fix test_disable_returns_confirmation to actually assert the message
- Tighten user-permission tests: ToolError instead of bare Exception,
  regex matches actual Nextcloud error messages
- Update PROGRESS.md with app management and collectives entries

Author: bigcat88

PROGRESS.md

@@ -30,6 +30,9 @@
 - [x] Files Trashbin tools: list_trash, restore_trash_item, empty_trash (2026-03-27)
 - [x] Files Versions tools: list_versions, restore_version (2026-03-27)
 - [x] Mail tools: list_mail_accounts, list_mailboxes, list_mail_messages, get_mail_message, send_mail (2026-03-28)
+- [x] Collectives tools: list_collectives, get_collective_pages, get_collective_page (2026-03-29)
+- [x] App Management tools: list_apps, get_app_info, enable_app, disable_app (2026-03-30)
+- [x] User-permission integration tests: non-admin error handling validation (2026-03-30)
 
 ### In Progress
 
@@ -66,10 +69,13 @@
 | Shares | 5 | 40 |
 | System Tags | 6 | 22 |
 | Mail | 5 | 29 |
+| Collectives | 3 | 22 |
+| App Management | 4 | 14 |
+| User Permissions | — | 15 |
 | Server | — | 7 |
 | Permissions | — | 34 |
 | Errors | — | 16 |
 | Client | — | 29 |
 | Config | — | 17 |
 | State | — | 2 |
-| **Total** | **60** | **491** |
+| **Total** | **67** | **542** |

src/nc_mcp_server/tools/app_management.py

@@ -5,7 +5,7 @@
 
 from mcp.server.fastmcp import FastMCP
 
-from ..annotations import ADDITIVE, DESTRUCTIVE, READONLY
+from ..annotations import ADDITIVE_IDEMPOTENT, DESTRUCTIVE, READONLY
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client
 
@@ -18,8 +18,6 @@ def _format_app(a: dict[str, Any]) -> dict[str, Any]:
         "name": a.get("name"),
         "summary": a.get("summary"),
         "version": a.get("version"),
-        "enabled": a.get("active"),
-        "type": a.get("type"),
         "author": a.get("author"),
     }
 
@@ -54,22 +52,22 @@ async def list_apps(app_filter: str = "enabled") -> str:
     async def get_app_info(app_id: str) -> str:
         """Get detailed information about an installed Nextcloud app. Requires admin privileges.
 
-        Returns app metadata including name, version, description, author, and status.
+        Returns app metadata including name, version, description, and author.
 
         Args:
             app_id: The app identifier (e.g. "spreed", "mail", "collectives").
                     Use list_apps to find available app IDs.
 
         Returns:
-            JSON object with app details: id, name, summary, version, enabled, type, author.
+            JSON object with app details: id, name, summary, version, author.
         """
         client = get_client()
         data = await client.ocs_get(f"{APPS_API}/{app_id}")
         return json.dumps(_format_app(data), indent=2, default=str)
 
 
 def _register_write_tools(mcp: FastMCP) -> None:
-    @mcp.tool(annotations=ADDITIVE)
+    @mcp.tool(annotations=ADDITIVE_IDEMPOTENT)
     @require_permission(PermissionLevel.WRITE)
     async def enable_app(app_id: str) -> str:
         """Enable a Nextcloud app. Requires admin privileges.

tests/integration/test_app_management.py

@@ -58,8 +58,9 @@ async def test_get_known_app(self, nc_mcp: McpTestHelper) -> None:
     async def test_get_app_has_fields(self, nc_mcp: McpTestHelper) -> None:
         result = await nc_mcp.call("get_app_info", app_id="dav")
         app = json.loads(result)
-        for field in ["id", "name", "version", "enabled"]:
+        for field in ["id", "name", "version", "author"]:
             assert field in app, f"Missing field: {field}"
+            assert app[field] is not None, f"Field '{field}' should not be None"
 
     @pytest.mark.asyncio
     async def test_get_nonexistent_app_raises(self, nc_mcp: McpTestHelper) -> None:
@@ -87,9 +88,9 @@ async def test_enable_already_enabled(self, nc_mcp: McpTestHelper) -> None:
 
     @pytest.mark.asyncio
     async def test_disable_returns_confirmation(self, nc_mcp: McpTestHelper) -> None:
-        await nc_mcp.call("disable_app", app_id=SAFE_APP)
         try:
-            pass
+            result = await nc_mcp.call("disable_app", app_id=SAFE_APP)
+            assert "disabled" in result.lower()
         finally:
             await nc_mcp.call("enable_app", app_id=SAFE_APP)
 

tests/integration/test_user_permissions.py

@@ -11,6 +11,8 @@
 
 import pytest
 
+from mcp.server.fastmcp.exceptions import ToolError
+
 from nc_mcp_server.client import NextcloudClient, NextcloudError
 from nc_mcp_server.config import Config
 from nc_mcp_server.permissions import PermissionLevel
@@ -112,35 +114,35 @@ async def test_list_notifications(self, user_mcp: McpTestHelper) -> None:
 class TestAdminOnlyToolsReturnErrors:
     @pytest.mark.asyncio
     async def test_list_users_forbidden(self, user_mcp: McpTestHelper) -> None:
-        with pytest.raises(Exception, match=r"403|Forbidden|admin"):
+        with pytest.raises(ToolError, match=r"must be.*admin|403|[Ff]orbidden"):
             await user_mcp.call("list_users")
 
     @pytest.mark.asyncio
     async def test_create_user_forbidden(self, user_mcp: McpTestHelper) -> None:
-        with pytest.raises(Exception, match=r"403|Forbidden|admin|sub admin"):
+        with pytest.raises(ToolError, match=r"must be.*admin|403|[Ff]orbidden"):
             await user_mcp.call("create_user", user_id="hacker", password=TEST_PASS)
 
     @pytest.mark.asyncio
     async def test_delete_user_forbidden(self, user_mcp: McpTestHelper) -> None:
-        with pytest.raises(Exception, match=r"403|Forbidden|admin"):
+        with pytest.raises(ToolError, match=r"must be.*admin|403|[Ff]orbidden"):
             await user_mcp.call("delete_user", user_id="admin")
 
     @pytest.mark.asyncio
     async def test_list_apps_forbidden(self, user_mcp: McpTestHelper) -> None:
-        with pytest.raises(Exception, match=r"403|Forbidden|admin"):
+        with pytest.raises(ToolError, match=r"must be.*admin|403|[Ff]orbidden"):
             await user_mcp.call("list_apps")
 
     @pytest.mark.asyncio
     async def test_enable_app_forbidden(self, user_mcp: McpTestHelper) -> None:
-        with pytest.raises(Exception, match=r"403|Forbidden|admin"):
+        with pytest.raises(ToolError, match=r"must be.*admin|403|[Ff]orbidden"):
             await user_mcp.call("enable_app", app_id="weather_status")
 
     @pytest.mark.asyncio
     async def test_disable_app_forbidden(self, user_mcp: McpTestHelper) -> None:
-        with pytest.raises(Exception, match=r"403|Forbidden|admin"):
+        with pytest.raises(ToolError, match=r"must be.*admin|403|[Ff]orbidden"):
             await user_mcp.call("disable_app", app_id="weather_status")
 
     @pytest.mark.asyncio
     async def test_get_app_info_forbidden(self, user_mcp: McpTestHelper) -> None:
-        with pytest.raises(Exception, match=r"403|Forbidden|admin"):
+        with pytest.raises(ToolError, match=r"must be.*admin|403|[Ff]orbidden"):
             await user_mcp.call("get_app_info", app_id="files")