fix: address PR review feedback and fix CI test failures

- Revert default transport to streamable-http (not a breaking change)
- Extract AVAILABLE_APPS constant to server/__init__.py (DRY)
- Wrap get_stdio_mcp ValueError in click.ClickException for clean errors
- Fix test_stdio.py: call _reload_config() so dynaconf sees env changes
- Use lazy %-style logging in stdio.py
- Add private API comments in test assertions
- Derive --enable-app CLI choices from AVAILABLE_APPS
- README: show explicit --transport stdio in uvx examples

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

nextcloud_mcp_server/app.py

@@ -119,17 +119,8 @@ from nextcloud_mcp_server.observability.metrics import (
     set_dependency_health,
 )
 from nextcloud_mcp_server.server import (
-    configure_calendar_tools,
-    configure_collectives_tools,
-    configure_contacts_tools,
-    configure_cookbook_tools,
-    configure_deck_tools,
-    configure_news_tools,
-    configure_notes_tools,
+    AVAILABLE_APPS,
     configure_semantic_tools,
-    configure_sharing_tools,
-    configure_tables_tools,
-    configure_webdav_tools,
 )
 from nextcloud_mcp_server.server.auth_tools import register_auth_tools
 from nextcloud_mcp_server.server.oauth_tools import register_oauth_tools
@@ -1232,32 +1223,18 @@ def get_app(transport: str = "streamable-http", enabled_apps: list[str] | None =
         client = await get_nextcloud_client(ctx)
         return await client.capabilities()
 
-    # Define available apps and their configuration functions
-    available_apps = {
-        "notes": configure_notes_tools,
-        "tables": configure_tables_tools,
-        "webdav": configure_webdav_tools,
-        "sharing": configure_sharing_tools,
-        "calendar": configure_calendar_tools,
-        "collectives": configure_collectives_tools,
-        "contacts": configure_contacts_tools,
-        "cookbook": configure_cookbook_tools,
-        "deck": configure_deck_tools,
-        "news": configure_news_tools,
-    }
-
     # If no specific apps are specified, enable all
     if enabled_apps is None:
-        enabled_apps = list(available_apps.keys())
+        enabled_apps = list(AVAILABLE_APPS.keys())
 
     # Configure only the enabled apps
     for app_name in enabled_apps:
-        if app_name in available_apps:
+        if app_name in AVAILABLE_APPS:
             logger.info(f"Configuring {app_name} tools")
-            available_apps[app_name](mcp)
+            AVAILABLE_APPS[app_name](mcp)
         else:
             logger.warning(
-                f"Unknown app: {app_name}. Available apps: {list(available_apps.keys())}"
+                f"Unknown app: {app_name}. Available apps: {list(AVAILABLE_APPS.keys())}"
             )
 
     # Register semantic search tools (cross-app feature)

nextcloud_mcp_server/cli.py

@@ -14,6 +14,7 @@ from nextcloud_mcp_server.migrations import (
     upgrade_database,
 )
 from nextcloud_mcp_server.observability import get_uvicorn_logging_config
+from nextcloud_mcp_server.server import AVAILABLE_APPS
 
 from .app import get_app
 
@@ -36,29 +37,16 @@ from .app import get_app
 @click.option(
     "--transport",
     "-t",
-    default="stdio",
+    default="streamable-http",
     show_default=True,
-    type=click.Choice(["stdio", "streamable-http", "http"]),
+    type=click.Choice(["streamable-http", "http", "stdio"]),
     help="MCP transport protocol",
 )
 @click.option(
     "--enable-app",
     "-e",
     multiple=True,
-    type=click.Choice(
-        [
-            "notes",
-            "tables",
-            "webdav",
-            "calendar",
-            "contacts",
-            "cookbook",
-            "deck",
-            "news",
-            "collectives",
-            "sharing",
-        ]
-    ),
+    type=click.Choice(sorted(AVAILABLE_APPS.keys())),
     help="Enable specific Nextcloud app APIs. Can be specified multiple times. If not specified, all apps are enabled.",
 )
 @click.option(
@@ -264,7 +252,10 @@ def run(
             )
         from .stdio import get_stdio_mcp  # noqa: PLC0415
 
-        mcp = get_stdio_mcp(enabled_apps=enabled_apps)
+        try:
+            mcp = get_stdio_mcp(enabled_apps=enabled_apps)
+        except ValueError as e:
+            raise click.ClickException(str(e)) from e
         mcp.run(transport="stdio")
         return
 

nextcloud_mcp_server/server/__init__.py

@@ -1,3 +1,5 @@
+from typing import Callable
+
 from .calendar import configure_calendar_tools
 from .collectives import configure_collectives_tools
 from .contacts import configure_contacts_tools
@@ -10,7 +12,25 @@ from .sharing import configure_sharing_tools
 from .tables import configure_tables_tools
 from .webdav import configure_webdav_tools
 
+# Canonical mapping of app name → tool registration function.
+# Used by app.py (HTTP), stdio.py (stdio), and cli.py (--enable-app choices).
+# Semantic search is excluded here because it is a cross-app feature gated
+# by VECTOR_SYNC_ENABLED, not an individual Nextcloud app.
+AVAILABLE_APPS: dict[str, Callable] = {
+    "notes": configure_notes_tools,
+    "tables": configure_tables_tools,
+    "webdav": configure_webdav_tools,
+    "sharing": configure_sharing_tools,
+    "calendar": configure_calendar_tools,
+    "collectives": configure_collectives_tools,
+    "contacts": configure_contacts_tools,
+    "cookbook": configure_cookbook_tools,
+    "deck": configure_deck_tools,
+    "news": configure_news_tools,
+}
+
 __all__ = [
+    "AVAILABLE_APPS",
     "configure_calendar_tools",
     "configure_collectives_tools",
     "configure_contacts_tools",

nextcloud_mcp_server/stdio.py

@@ -11,7 +11,6 @@ import logging
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 from dataclasses import dataclass
-from typing import Callable
 
 from mcp.server.fastmcp import Context, FastMCP
 
@@ -19,18 +18,7 @@ from nextcloud_mcp_server.client import NextcloudClient
 from nextcloud_mcp_server.config import get_settings
 from nextcloud_mcp_server.config_validators import AuthMode, validate_configuration
 from nextcloud_mcp_server.context import get_client as get_nextcloud_client
-from nextcloud_mcp_server.server import (
-    configure_calendar_tools,
-    configure_collectives_tools,
-    configure_contacts_tools,
-    configure_cookbook_tools,
-    configure_deck_tools,
-    configure_news_tools,
-    configure_notes_tools,
-    configure_sharing_tools,
-    configure_tables_tools,
-    configure_webdav_tools,
-)
+from nextcloud_mcp_server.server import AVAILABLE_APPS
 
 logger = logging.getLogger(__name__)
 
@@ -99,30 +87,18 @@ def get_stdio_mcp(enabled_apps: list[str] | None = None) -> FastMCP:
         return await client.capabilities()
 
     # --- tool registration ---
-    available_apps: dict[str, Callable] = {
-        "notes": configure_notes_tools,
-        "tables": configure_tables_tools,
-        "webdav": configure_webdav_tools,
-        "sharing": configure_sharing_tools,
-        "calendar": configure_calendar_tools,
-        "collectives": configure_collectives_tools,
-        "contacts": configure_contacts_tools,
-        "cookbook": configure_cookbook_tools,
-        "deck": configure_deck_tools,
-        "news": configure_news_tools,
-    }
-
     if enabled_apps is None:
-        enabled_apps = list(available_apps.keys())
+        enabled_apps = list(AVAILABLE_APPS.keys())
 
     for app_name in enabled_apps:
-        if app_name in available_apps:
-            logger.info(f"Configuring {app_name} tools")
-            available_apps[app_name](mcp)
+        if app_name in AVAILABLE_APPS:
+            logger.info("Configuring %s tools", app_name)
+            AVAILABLE_APPS[app_name](mcp)
         else:
             logger.warning(
-                f"Unknown app: {app_name}. "
-                f"Available apps: {list(available_apps.keys())}"
+                "Unknown app: %s. Available apps: %s",
+                app_name,
+                list(AVAILABLE_APPS.keys()),
             )
 
     return mcp