feat: bump version

feat: added configuration to run Docker in http mode

Dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.13-alpine
 
+EXPOSE 8000
+
 # Install package manager
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
@@ -18,4 +20,6 @@ COPY src src
 RUN uv sync \
   --locked
 
+ENV CORDRA_RUN_MODE=http
+
 CMD ["uv", "run", "cordra-mcp"]

README.md

@@ -26,21 +26,44 @@ ensuring safe exploration without risk of data modification or corruption.
 
 ### Tools
 
+- `get_object` - Retrieve a digital object by its complete ID/handle.
+  - `object_id` - Complete object ID (e.g., "test/abc123")
 - `search_objects` - Search for digital objects using a query string with pagination support.
   - `query` - Lucene/Solr compatible search query
-  - `type` - Optional filter by object type  
+  - `type` - Optional filter by object type
-  - `limit` - Number of results per page (default: 1)
+  - `limit` - Number of results per page (default: 25)
   - `page_num` - Page number to retrieve, 0-based (default: 0)
+- `count_objects` - Count the total number of objects matching a query.
+  - `query` - Lucene/Solr compatible search query
+  - `type` - Optional filter by object type
+
+#### Query Syntax
+
+**CRITICAL**: JSON properties MUST be prefixed with `/`
+
+✅ **Correct Examples:**
+- `/title:*report*` - Wildcard search in title field
+- `/author/name:Daniel` - Nested property access
+- `/status:active AND /priority:high` - Boolean operators
+- Use `type` parameter instead of including `type:` in query
+
+❌ **Wrong (will fail):**
+- `name:John` - Missing `/` prefix
+- `author/name:Daniel` - Missing leading `/`
+- `type:Person` - Use the `type` parameter instead
+
+**Operators:** `*` (wildcard), `?` (single char), `AND`, `OR`, `NOT`, `"phrases"`  
 
 ## Configuration
 
-The MCP server can be configured using environment variables with the `CORDRA_` prefix:
+The MCP server can be configured using environment variables:
 
 - `CORDRA_BASE_URL` - Cordra server URL (default: `https://localhost:8443`)
 - `CORDRA_USERNAME` - Username for authentication (optional)
 - `CORDRA_PASSWORD` - Password for authentication (optional)
 - `CORDRA_VERIFY_SSL` - SSL certificate verification (default: `true`)
 - `CORDRA_TIMEOUT` - Request timeout in seconds (default: `30`)
+- `LOGLEVEL` - Logging level (default: `INFO`, options: `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`)
 
 ## Usage
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cordra-mcp"
-version = "1.1.1"
+version = "1.3.2"
 description = "MCP server for Cordra digital object repository"
 authors = [
     {name = "Daniel Bauer", email = "github@dbauer.me"},
@@ -61,6 +61,7 @@ ignore = ["E501"]
 python_version = "3.11"
 strict = true
 warn_return_any = true
+files = ["src", "tests"]
 
 [[tool.mypy.overrides]]
 module = ["cordra.*"]

src/cordra_mcp/__init__.py

@@ -1,3 +1,3 @@
 """MCP server for Cordra digital object repository."""
 
-__version__ = "1.1.1"
+__version__ = "1.3.2"

src/cordra_mcp/config.py

@@ -1,6 +1,8 @@
 """Configuration settings for the MCP Cordra server."""
 
-from pydantic import Field
+from typing import Literal
+
+from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
@@ -16,6 +18,10 @@ class CordraConfig(BaseSettings):
         default="https://localhost:8443",
         description="Base URL of the Cordra repository",
     )
+    host: str = Field(
+        default="0.0.0.0",
+        description="The host under which the MCP server runs when deployed as http run_mode",
+    )
     username: str | None = Field(
         default=None, description="Username for Cordra authentication"
     )
@@ -26,3 +32,24 @@ class CordraConfig(BaseSettings):
         default=True, description="Whether to verify SSL certificates"
     )
     timeout: int = Field(default=30, description="Request timeout in seconds")
+    run_mode: Literal["stdio", "http"] | None = Field(
+        default="stdio", description="Run mode for the MCP client"
+    )
+    log_level: str = Field(
+        default="INFO",
+        description="Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)",
+        validation_alias="LOGLEVEL",
+    )
+
+    @field_validator("log_level", mode="before")
+    @classmethod
+    def validate_log_level(cls, v: str) -> str:
+        """Validate that log_level is a standard logging level."""
+        level_str = str(v).upper().strip()
+        valid_levels = {"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}
+
+        if level_str not in valid_levels:
+            raise ValueError(
+                f"Invalid log level '{v}'. Must be one of: {', '.join(valid_levels)}"
+            )
+        return level_str

src/cordra_mcp/server.py

@@ -7,6 +7,7 @@ import logging
 from mcp.server.fastmcp import FastMCP
 from mcp.server.fastmcp.resources import FunctionResource
 
+from . import __version__
 from .client import (
     CordraAuthenticationError,
     CordraClient,
@@ -16,56 +17,69 @@ from .client import (
 from .config import CordraConfig
 
 # Initialize the MCP server
-mcp = FastMCP("cordra-mcp")
+config = CordraConfig()
+mcp = FastMCP("cordra-mcp", host=config.host, port=8000)
 
 # Initialize Cordra client at startup
-config = CordraConfig()
 cordra_client = CordraClient(config)
 
 logger = logging.getLogger(__name__)
+logger.setLevel(config.log_level)
 
 
 @mcp.tool(
     name="search_objects",
     title="Search Cordra Objects",
-    description="""Search for digital objects in the Cordra repository using Lucene/Solr query syntax.
+    description="""Search for digital objects using Lucene/Solr query syntax.
 
-Examples:
+CRITICAL SYNTAX RULES:
-- /title:report - Find objects with 'report' in title
+1. Properties MUST start with '/' - Example: /title:report
-- /author:smith - Find objects by author Smith
+2. Nested properties: /parent/child:value
-- /name:John AND type:Person - Complex queries
+3. Use 'type' parameter - NEVER 'type:' in query
+4. Operators: * ? AND OR NOT "phrases"
 
-Pagination:
+✅ CORRECT:
-- Results are paginated with 0-based page numbering
+- /title:*report* /author/name:Daniel
-- Use 'limit' to control page size (default: 1)
+- /status:active AND /priority:high
-- Use 'page_num' to specify which page to retrieve (default: 0)
+- query="/title:report", type="Document"
 
-Returns a JSON list of matching objects with their full metadata."""
+❌ WRONG:
+- name:John (missing /)
+- author/name:Daniel (missing /)
+- type:Person (use type parameter)
+
+Returns: {results: [ids], total_count, page_num, page_size}
+Pagination: limit (default 25), page_num (0-based)""",
 )
 async def search_objects(
     query: str,
     type: str | None = None,
-    limit: int = 1,
+    limit: int = 25,
     page_num: int = 0,
 ) -> str:
     """Search for digital objects in the Cordra repository with pagination support.
 
     Args:
-        query: The search query string (Lucene/Solr compatible). Examples:
+        query: Search query (Lucene/Solr). Properties MUST start with '/'.
-               - "/title:report" - Find objects with "report" in title
+               ✅ CORRECT: /title:*report*, /author/name:Daniel
-               - "/author:smith" - Find objects by author Smith
+               ❌ WRONG: name:John, author/name:Daniel, type:Person
-               - "/name:John AND type:Person" - Complex queries
         type: Optional filter by object type (e.g., "Person", "Document", "Project")
-        limit: Page size - number of results per page (default: 1)
+        limit: Page size - number of results per page (default: 25)
         page_num: Page number to retrieve, 0-based (default: 0 for first page)
 
     Returns:
-        JSON string containing list of matching objects with their full metadata
+        JSON string containing object IDs and pagination info
     """
     try:
-        search_result = await cordra_client.find(query, object_type=type, page_size=limit, page_num=page_num)
+        search_result = await cordra_client.find(
-        results = search_result["results"]
+            query, object_type=type, page_size=limit, page_num=page_num
-        return json.dumps(results, indent=2)
+        )
+
+        # Extract only the IDs from the results
+        search_result["results"] = [obj["id"] for obj in search_result["results"]]
+        # Rename for consistency with documentation
+        search_result["total_count"] = search_result.pop("total_size")
+        return json.dumps(search_result, indent=2)
 
     except ValueError as e:
         raise RuntimeError(f"Invalid search parameters: {e}") from e
@@ -75,6 +89,86 @@ async def search_objects(
         raise RuntimeError(f"Search failed: {e}") from e
 
 
+@mcp.tool(
+    name="count_objects",
+    title="Count Cordra Objects matching a query",
+    description="""Count the total number of digital objects matching a search query.
+
+Examples:
+- /title:report - Count objects with 'report' in title
+- type:Person - Find all Persons. Note that "type" is special and uses no slash "/"
+- /author/name:Daniel - Find objects with author Daniel as nested property.
+- /name:John AND type:Person - Complex queries
+
+Returns the count of objects as integer.
+""",
+)
+async def count_objects(
+    query: str,
+    type: str | None = None,
+) -> str:
+    """Count digital objects in the Cordra repository matching a search query.
+
+    Args:
+        query: Search query (Lucene/Solr). Properties MUST start with '/'.
+               ✅ CORRECT: /title:*report*, /author/name:Daniel
+               ❌ WRONG: name:John, author/name:Daniel, type:Person
+        type: Optional filter by object type (e.g., "Person", "Document", "Project")
+
+    Returns:
+        integer with the number of objects matching the criteria.
+    """
+    try:
+        # Use page_size=1 to get minimal data, we only need the total count
+        search_result = await cordra_client.find(
+            query, object_type=type, page_size=1, page_num=0
+        )
+
+        total_size: int = search_result["total_size"]
+        return str(total_size)
+    except ValueError as e:
+        raise RuntimeError(f"Invalid search parameters: {e}") from e
+    except CordraAuthenticationError as e:
+        raise RuntimeError(f"Authentication failed: {e}") from e
+    except CordraClientError as e:
+        raise RuntimeError(f"Count failed: {e}") from e
+
+
+@mcp.tool(
+    name="get_object",
+    title="Get Cordra Object by ID",
+    description="""Retrieve a digital object by its complete ID/handle.
+
+Returns: Full object with metadata as JSON
+Example: get_object("test/abc123")""",
+)
+async def get_object(object_id: str) -> str:
+    """Retrieve a Cordra digital object by its complete ID.
+
+    Args:
+        object_id: The complete object ID/handle (e.g., "test/abc123" or "wildlive/7a4b7b65f8bb155ad36d")
+
+    Returns:
+        JSON string containing the complete digital object with all metadata
+
+    Raises:
+        RuntimeError: If the object is not found or there's an API error
+    """
+    try:
+        digital_object = await cordra_client.get_object(object_id)
+        object_dict = digital_object.model_dump()
+        return json.dumps(object_dict, indent=2)
+
+    except ValueError as e:
+        raise RuntimeError(f"Invalid object ID: {e}") from e
+    except CordraNotFoundError as e:
+        raise RuntimeError(f"Object not found: {object_id}") from e
+    except CordraAuthenticationError as e:
+        raise RuntimeError(f"Authentication failed: {e}") from e
+    except CordraClientError as e:
+        raise RuntimeError(f"Failed to retrieve object {object_id}: {e}") from e
+
+
 @mcp.resource(
     "cordra://objects/{prefix}/{suffix}",
     name="cordra-object",
@@ -168,7 +262,9 @@ async def register_schema_resources() -> None:
         page_size = 20
 
         while True:
-            search_result = await cordra_client.find("type:Schema", page_size=page_size, page_num=page_num)
+            search_result = await cordra_client.find(
+                "type:Schema", page_size=page_size, page_num=page_num
+            )
             schemas = search_result["results"]
             all_schemas.extend(schemas)
 
@@ -206,18 +302,20 @@ async def register_schema_resources() -> None:
         logger.warning(f"Failed to register schema resources: {e}")
 
 
-
 async def initialize_server() -> None:
     """Initialize server resources before starting."""
-    logger.info("Initializing Cordra MCP server...")
+    logger.info(f"Initializing Cordra MCP server v{__version__}...")
     await register_schema_resources()
     logger.info("Server initialization complete")
 
 
 def main() -> None:
     """Main entry point for the MCP server."""
-    asyncio.run(initialize_server())
+    if config.run_mode == "stdio":
-    mcp.run()
+        asyncio.run(initialize_server())
+        mcp.run()
+    else:
+        mcp.run(transport="streamable-http")
 
 
 if __name__ == "__main__":

tests/test_client.py

@@ -1,5 +1,6 @@
 """Unit tests for the Cordra client."""
 
+from typing import Any
 from unittest.mock import patch
 
 import pytest
@@ -15,7 +16,7 @@ from cordra_mcp.config import CordraConfig
 
 
 @pytest.fixture
-def config():
+def config() -> CordraConfig:
     """Create a test configuration."""
     return CordraConfig(
         base_url="https://test.example.com",
@@ -26,13 +27,13 @@ def config():
 
 
 @pytest.fixture
-def client(config):
+def client(config: CordraConfig) -> CordraClient:
     """Create a test client."""
     return CordraClient(config)
 
 
 @pytest.fixture
-def mock_cordra_object():
+def mock_cordra_object() -> dict[str, Any]:
     """Create a mock CordraObject response (dictionary)."""
     return {
         "type": "TestType",
@@ -59,7 +60,7 @@ def mock_cordra_object():
 class TestDigitalObject:
     """Test the DigitalObject model."""
 
-    def test_digital_object_creation(self):
+    def test_digital_object_creation(self) -> None:
         """Test creating a DigitalObject."""
         obj = DigitalObject(
             id="test/123",
@@ -89,7 +90,7 @@ class TestDigitalObject:
         assert payload["size"] == 1024
         assert payload["filename"] == "file1.txt"
 
-    def test_digital_object_optional_fields(self):
+    def test_digital_object_optional_fields(self) -> None:
         """Test DigitalObject with only required fields."""
         obj = DigitalObject(id="test/123", type="TestType", content={"title": "Test"})
 
@@ -104,13 +105,13 @@ class TestDigitalObject:
 class TestCordraClient:
     """Test the CordraClient class."""
 
-    def test_client_initialization(self, config):
+    def test_client_initialization(self, config: CordraConfig) -> None:
         """Test client initialization."""
         client = CordraClient(config)
         assert client.config == config
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_get_object_success(self, mock_get, client, mock_cordra_object):
+    async def test_get_object_success(self, mock_get: Any, client: CordraClient, mock_cordra_object: dict[str, Any]) -> None:
         """Test successful object retrieval."""
         mock_response = mock_get.return_value
         mock_response.status_code = 200
@@ -137,7 +138,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_get_object_not_found(self, mock_get, client):
+    async def test_get_object_not_found(self, mock_get: Any, client: CordraClient) -> None:
         """Test object not found exception."""
         mock_response = mock_get.return_value
         mock_response.status_code = 404
@@ -149,7 +150,7 @@ class TestCordraClient:
         assert "Resource not found" in str(exc_info.value)
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_get_object_general_error(self, mock_get, client):
+    async def test_get_object_general_error(self, mock_get: Any, client: CordraClient) -> None:
         """Test general error handling."""
         from requests import RequestException
 
@@ -161,7 +162,7 @@ class TestCordraClient:
         assert "Failed to retrieve object test/123" in str(exc_info.value)
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_success(self, mock_get, client):
+    async def test_find_success(self, mock_get: Any, client: CordraClient) -> None:
         """Test successful find operation."""
         mock_response_data = {
             "results": [
@@ -196,7 +197,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_empty_results(self, mock_get, client):
+    async def test_find_empty_results(self, mock_get: Any, client: CordraClient) -> None:
         """Test find with empty results."""
         mock_response_data = {"results": [], "size": 0, "pageNum": 0, "pageSize": 20}
         mock_response = mock_get.return_value
@@ -218,7 +219,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_error(self, mock_get, client):
+    async def test_find_error(self, mock_get: Any, client: CordraClient) -> None:
         """Test find error handling."""
         from requests import RequestException
 
@@ -231,7 +232,7 @@ class TestCordraClient:
         assert "Search failed" in str(exc_info.value)
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_with_type_filter(self, mock_get, client):
+    async def test_find_with_type_filter(self, mock_get: Any, client: CordraClient) -> None:
         """Test find operation with type filter constructs correct query."""
         mock_response_data = {"results": [], "size": 0, "pageNum": 0, "pageSize": 20}
         mock_response = mock_get.return_value
@@ -248,7 +249,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_with_page_size(self, mock_get, client):
+    async def test_find_with_page_size(self, mock_get: Any, client: CordraClient) -> None:
         """Test find operation with custom page size."""
         mock_response_data = {"results": [], "size": 0, "pageNum": 0, "pageSize": 50}
         mock_response = mock_get.return_value
@@ -265,7 +266,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_with_type_and_page_size(self, mock_get, client):
+    async def test_find_with_type_and_page_size(self, mock_get: Any, client: CordraClient) -> None:
         """Test find operation with both type filter and page size."""
         mock_response_data = {"results": [], "size": 0, "pageNum": 0, "pageSize": 25}
         mock_response = mock_get.return_value
@@ -282,7 +283,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_default_params(self, mock_get, client):
+    async def test_find_default_params(self, mock_get: Any, client: CordraClient) -> None:
         """Test find operation with default parameters."""
         mock_response_data = {"results": [], "size": 0, "pageNum": 0, "pageSize": 20}
         mock_response = mock_get.return_value
@@ -299,7 +300,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_with_page_num(self, mock_get, client):
+    async def test_find_with_page_num(self, mock_get: Any, client: CordraClient) -> None:
         """Test find operation with specific page number."""
         mock_response_data = {"results": [], "size": 100, "pageNum": 2, "pageSize": 20}
         mock_response = mock_get.return_value
@@ -319,7 +320,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_find_with_custom_page_size_and_num(self, mock_get, client):
+    async def test_find_with_custom_page_size_and_num(self, mock_get: Any, client: CordraClient) -> None:
         """Test find operation with custom page size and page number."""
         mock_response_data = {"results": [], "size": 500, "pageNum": 5, "pageSize": 10}
         mock_response = mock_get.return_value
@@ -339,7 +340,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_get_design_success(self, mock_get, client):
+    async def test_get_design_success(self, mock_get: Any, client: CordraClient) -> None:
         """Test successful design object retrieval."""
         mock_design_data = {
             "type": "CordraDesign",
@@ -368,7 +369,7 @@ class TestCordraClient:
         )
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_get_design_authentication_error(self, mock_get, client):
+    async def test_get_design_authentication_error(self, mock_get: Any, client: CordraClient) -> None:
         """Test design object retrieval with authentication error."""
         mock_response = mock_get.return_value
         mock_response.status_code = 403
@@ -380,7 +381,7 @@ class TestCordraClient:
         assert "Authentication failed" in str(exc_info.value)
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_get_design_not_found(self, mock_get, client):
+    async def test_get_design_not_found(self, mock_get: Any, client: CordraClient) -> None:
         """Test design object retrieval with not found error."""
         mock_response = mock_get.return_value
         mock_response.status_code = 404
@@ -392,7 +393,7 @@ class TestCordraClient:
         assert "Resource not found" in str(exc_info.value)
 
     @patch("cordra_mcp.client.requests.Session.get")
-    async def test_get_design_request_error(self, mock_get, client):
+    async def test_get_design_request_error(self, mock_get: Any, client: CordraClient) -> None:
         """Test design object retrieval with request error."""
         from requests import RequestException
 
@@ -407,7 +408,7 @@ class TestCordraClient:
 class TestCordraConfig:
     """Test the CordraConfig class."""
 
-    def test_default_config(self):
+    def test_default_config(self) -> None:
         """Test default configuration values."""
         config = CordraConfig()
         assert config.base_url == "https://localhost:8443"

tests/test_server.py

@@ -1,6 +1,7 @@
 """Unit tests for the MCP server."""
 
 import json
+from typing import Any
 from unittest.mock import AsyncMock, patch
 
 import pytest
@@ -11,11 +12,17 @@ from cordra_mcp.client import (
     CordraNotFoundError,
     DigitalObject,
 )
-from cordra_mcp.server import get_cordra_design, get_cordra_object, search_objects
+from cordra_mcp.server import (
+    count_objects,
+    get_cordra_design,
+    get_cordra_object,
+    get_object,
+    search_objects,
+)
 
 
 @pytest.fixture
-def sample_digital_object():
+def sample_digital_object() -> DigitalObject:
     """Create a sample DigitalObject for testing."""
     return DigitalObject(
         id="people/john-doe-123",
@@ -32,17 +39,19 @@ def sample_digital_object():
                 "name": "profile_photo",
                 "filename": "john_doe_profile.jpg",
                 "size": 125440,
-                "mediaType": "image/jpeg"
+                "mediaType": "image/jpeg",
             }
-        ]
+        ],
     )
 
 
 class TestGetCordraObject:
     """Test the get_cordra_object resource handler."""
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_object_success(self, mock_client, sample_digital_object):
+    async def test_get_object_success(
+        self, mock_client: Any, sample_digital_object: DigitalObject
+    ) -> None:
         """Test successful object retrieval."""
         mock_client.get_object = AsyncMock(return_value=sample_digital_object)
 
@@ -61,8 +70,8 @@ class TestGetCordraObject:
         # Verify the client was called with the correct object ID
         mock_client.get_object.assert_called_once_with("people/john-doe-123")
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_object_not_found(self, mock_client):
+    async def test_get_object_not_found(self, mock_client: Any) -> None:
         """Test object not found exception."""
         mock_client.get_object = AsyncMock(
             side_effect=CordraNotFoundError("Object not found: people/nonexistent")
@@ -74,8 +83,8 @@ class TestGetCordraObject:
         assert "Object not found: people/nonexistent" in str(exc_info.value)
         mock_client.get_object.assert_called_once_with("people/nonexistent")
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_object_client_error(self, mock_client):
+    async def test_get_object_client_error(self, mock_client: Any) -> None:
         """Test general client error handling."""
         mock_client.get_object = AsyncMock(
             side_effect=CordraClientError("Connection failed")
@@ -88,8 +97,10 @@ class TestGetCordraObject:
         assert "Connection failed" in str(exc_info.value)
         mock_client.get_object.assert_called_once_with("people/john-doe-123")
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_object_id_construction(self, mock_client, sample_digital_object):
+    async def test_object_id_construction(
+        self, mock_client: Any, sample_digital_object: DigitalObject
+    ) -> None:
         """Test that object ID is correctly constructed from prefix and suffix."""
         mock_client.get_object = AsyncMock(return_value=sample_digital_object)
 
@@ -104,8 +115,10 @@ class TestGetCordraObject:
             await get_cordra_object(prefix, suffix)
             mock_client.get_object.assert_called_with(expected_id)
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_json_formatting(self, mock_client, sample_digital_object):
+    async def test_json_formatting(
+        self, mock_client: Any, sample_digital_object: DigitalObject
+    ) -> None:
         """Test that the returned JSON is properly formatted."""
         mock_client.get_object = AsyncMock(return_value=sample_digital_object)
 
@@ -126,8 +139,8 @@ class TestGetCordraObject:
         assert "acl" in parsed_result
         assert "payloads" in parsed_result
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_minimal_object(self, mock_client):
+    async def test_minimal_object(self, mock_client: Any) -> None:
         """Test handling of object with minimal data."""
         minimal_object = DigitalObject(
             id="test/minimal",
@@ -135,7 +148,7 @@ class TestGetCordraObject:
             content={"id": "test/minimal"},
             metadata=None,
             acl=None,
-            payloads=None
+            payloads=None,
         )
         mock_client.get_object = AsyncMock(return_value=minimal_object)
 
@@ -150,20 +163,82 @@ class TestGetCordraObject:
         assert parsed_result["payloads"] is None
 
 
+class TestGetObject:
+    """Test the get_object tool."""
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_get_object_success(
+        self, mock_client: Any, sample_digital_object: DigitalObject
+    ) -> None:
+        """Test successful object retrieval with complete ID."""
+        mock_client.get_object = AsyncMock(return_value=sample_digital_object)
+
+        result = await get_object("people/john-doe-123")
+
+        # Verify the result is valid JSON
+        parsed_result = json.loads(result)
+        assert parsed_result["id"] == "people/john-doe-123"
+        assert parsed_result["type"] == "Person"
+        assert parsed_result["content"]["name"] == "John Doe"
+
+        # Verify the client was called with the correct object ID
+        mock_client.get_object.assert_called_once_with("people/john-doe-123")
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_get_object_not_found(self, mock_client: Any) -> None:
+        """Test object not found exception."""
+        mock_client.get_object = AsyncMock(
+            side_effect=CordraNotFoundError("Object not found: test/nonexistent")
+        )
+
+        with pytest.raises(RuntimeError) as exc_info:
+            await get_object("test/nonexistent")
+
+        assert "Object not found: test/nonexistent" in str(exc_info.value)
+        mock_client.get_object.assert_called_once_with("test/nonexistent")
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_get_object_client_error(self, mock_client: Any) -> None:
+        """Test general client error handling."""
+        mock_client.get_object = AsyncMock(
+            side_effect=CordraClientError("Connection failed")
+        )
+
+        with pytest.raises(RuntimeError) as exc_info:
+            await get_object("test/obj123")
+
+        assert "Failed to retrieve object test/obj123" in str(exc_info.value)
+        mock_client.get_object.assert_called_once_with("test/obj123")
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_get_object_authentication_error(self, mock_client: Any) -> None:
+        """Test authentication error handling."""
+        mock_client.get_object = AsyncMock(
+            side_effect=CordraAuthenticationError("Authentication failed")
+        )
+
+        with pytest.raises(RuntimeError) as exc_info:
+            await get_object("test/obj123")
+
+        assert "Authentication failed" in str(exc_info.value)
+        mock_client.get_object.assert_called_once_with("test/obj123")
+
+
 class TestSchemaResourceFunctions:
     """Test the schema resource functions."""
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_create_schema_resource_success(self, mock_client):
+    async def test_create_schema_resource_success(self, mock_client: Any) -> None:
         """Test successful schema resource creation."""
         mock_schema = DigitalObject(
             id="test/user-schema",
             type="Schema",
-            content={"name": "User", "type": "object", "properties": {}}
+            content={"name": "User", "type": "object", "properties": {}},
         )
         mock_client.get_schema = AsyncMock(return_value=mock_schema)
 
         from cordra_mcp.server import create_schema_resource
+
         result = await create_schema_resource("User")
 
         # Verify the result is valid JSON
@@ -175,88 +250,105 @@ class TestSchemaResourceFunctions:
         # Verify the client was called with correct schema name
         mock_client.get_schema.assert_called_once_with("User")
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_create_schema_resource_not_found(self, mock_client):
+    async def test_create_schema_resource_not_found(self, mock_client: Any) -> None:
         """Test schema resource creation with schema not found."""
-        mock_client.get_schema = AsyncMock(side_effect=CordraNotFoundError("Schema not found"))
+        mock_client.get_schema = AsyncMock(
+            side_effect=CordraNotFoundError("Schema not found")
+        )
 
         from cordra_mcp.server import create_schema_resource
+
         with pytest.raises(RuntimeError) as exc_info:
             await create_schema_resource("NonExistent")
 
         assert "Schema not found: NonExistent" in str(exc_info.value)
         mock_client.get_schema.assert_called_once_with("NonExistent")
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_register_schema_resources_success(self, mock_client):
+    async def test_register_schema_resources_success(self, mock_client: Any) -> None:
         """Test successful schema resource registration."""
         mock_search_result = {
             "results": [
                 {"content": {"name": "User"}, "id": "test/user-schema"},
                 {"content": {"name": "Project"}, "id": "test/project-schema"},
-                {"content": {"name": "Document"}, "id": "test/doc-schema"}
+                {"content": {"name": "Document"}, "id": "test/doc-schema"},
             ],
             "total_size": 3,
             "page_num": 0,
-            "page_size": 20
+            "page_size": 20,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
         # Mock the mcp.add_resource method
-        with patch('cordra_mcp.server.mcp') as mock_mcp:
+        with patch("cordra_mcp.server.mcp") as mock_mcp:
             from cordra_mcp.server import register_schema_resources
+
             await register_schema_resources()
 
         # Verify the client was called with correct query
-        mock_client.find.assert_called_once_with("type:Schema", page_size=20, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "type:Schema", page_size=20, page_num=0
+        )
 
         # Verify add_resource was called for each schema
         assert mock_mcp.add_resource.call_count == 3
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_register_schema_resources_missing_name(self, mock_client):
+    async def test_register_schema_resources_missing_name(
+        self, mock_client: Any
+    ) -> None:
         """Test schema resource registration with objects missing name field."""
         mock_search_result = {
             "results": [
                 {"content": {"name": "User"}, "id": "test/user-schema"},
                 {"content": {}, "id": "test/no-name-schema"},  # Missing name field
-                {"content": {"name": "Project"}, "id": "test/project-schema"}
+                {"content": {"name": "Project"}, "id": "test/project-schema"},
             ],
             "total_size": 3,
             "page_num": 0,
-            "page_size": 20
+            "page_size": 20,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
-        with patch('cordra_mcp.server.mcp') as mock_mcp:
+        with patch("cordra_mcp.server.mcp") as mock_mcp:
             from cordra_mcp.server import register_schema_resources
+
             await register_schema_resources()
 
         # Only 2 schemas should be registered (those with name field)
         assert mock_mcp.add_resource.call_count == 2
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_register_schema_resources_client_error(self, mock_client):
+    async def test_register_schema_resources_client_error(
+        self, mock_client: Any
+    ) -> None:
         """Test schema resource registration with client error."""
         mock_client.find = AsyncMock(side_effect=CordraClientError("Search failed"))
 
         # Should not raise an exception, just log a warning
         from cordra_mcp.server import register_schema_resources
+
         await register_schema_resources()  # Should complete without raising
 
-        mock_client.find.assert_called_once_with("type:Schema", page_size=20, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "type:Schema", page_size=20, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_register_schema_resources_pagination(self, mock_client):
+    async def test_register_schema_resources_pagination(self, mock_client: Any) -> None:
         """Test schema resource registration with pagination."""
         # Mock multiple pages of results
         # First page with full 20 results (simulating more schemas)
-        first_page_schemas = [{"content": {"name": f"Schema{i}"}, "id": f"test/schema{i}"} for i in range(20)]
+        first_page_schemas = [
+            {"content": {"name": f"Schema{i}"}, "id": f"test/schema{i}"}
+            for i in range(20)
+        ]
         first_page = {
             "results": first_page_schemas,
             "total_size": 25,
             "page_num": 0,
-            "page_size": 20
+            "page_size": 20,
         }
 
         # Second page with fewer results (indicating last page)
@@ -266,14 +358,15 @@ class TestSchemaResourceFunctions:
             ],
             "total_size": 25,
             "page_num": 1,
-            "page_size": 20
+            "page_size": 20,
         }
 
         # Return first page, then second page (with fewer results indicating last page)
         mock_client.find = AsyncMock(side_effect=[first_page, second_page])
 
-        with patch('cordra_mcp.server.mcp') as mock_mcp:
+        with patch("cordra_mcp.server.mcp") as mock_mcp:
             from cordra_mcp.server import register_schema_resources
+
             await register_schema_resources()
 
         # Verify pagination calls
@@ -288,17 +381,25 @@ class TestSchemaResourceFunctions:
 class TestSearchObjects:
     """Test the search_objects tool."""
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_success(self, mock_client):
+    async def test_search_objects_success(self, mock_client: Any) -> None:
         """Test successful object search."""
         mock_search_result = {
             "results": [
-                {"id": "people/john-doe", "type": "Person", "content": {"name": "John Doe"}},
+                {
-                {"id": "people/jane-smith", "type": "Person", "content": {"name": "Jane Smith"}},
+                    "id": "people/john-doe",
+                    "type": "Person",
+                    "content": {"name": "John Doe"},
+                },
+                {
+                    "id": "people/jane-smith",
+                    "type": "Person",
+                    "content": {"name": "Jane Smith"},
+                },
             ],
             "total_size": 2,
             "page_num": 0,
-            "page_size": 1000
+            "page_size": 1000,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
@@ -306,23 +407,30 @@ class TestSearchObjects:
 
         # Verify the result is valid JSON
         parsed_result = json.loads(result)
-        assert len(parsed_result) == 2
+        assert parsed_result["results"] == ["people/john-doe", "people/jane-smith"]
-        assert parsed_result[0]["id"] == "people/john-doe"
+        assert parsed_result["total_count"] == 2
-        assert parsed_result[1]["id"] == "people/jane-smith"
+        assert parsed_result["page_num"] == 0
+        assert parsed_result["page_size"] == 1000
 
         # Verify the client was called with correct parameters
-        mock_client.find.assert_called_once_with("name:John", object_type=None, page_size=1, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "name:John", object_type=None, page_size=25, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_with_type_filter(self, mock_client):
+    async def test_search_objects_with_type_filter(self, mock_client: Any) -> None:
         """Test object search with type filter."""
         mock_search_result = {
             "results": [
-                {"id": "people/john-doe", "type": "Person", "content": {"name": "John Doe"}},
+                {
+                    "id": "people/john-doe",
+                    "type": "Person",
+                    "content": {"name": "John Doe"},
+                },
             ],
             "total_size": 1,
             "page_num": 0,
-            "page_size": 1000
+            "page_size": 1000,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
@@ -330,44 +438,57 @@ class TestSearchObjects:
 
         # Verify the result is valid JSON
         parsed_result = json.loads(result)
-        assert len(parsed_result) == 1
+        assert parsed_result["results"] == ["people/john-doe"]
-        assert parsed_result[0]["type"] == "Person"
+        assert parsed_result["total_count"] == 1
 
         # Verify the client was called with type filter
-        mock_client.find.assert_called_once_with("name:John", object_type="Person", page_size=1, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "name:John", object_type="Person", page_size=25, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_with_limit(self, mock_client):
+    async def test_search_objects_with_limit(self, mock_client: Any) -> None:
         """Test object search with custom limit."""
         mock_search_result = {
             "results": [
-                {"id": "people/john-doe", "type": "Person", "content": {"name": "John Doe"}},
+                {
+                    "id": "people/john-doe",
+                    "type": "Person",
+                    "content": {"name": "John Doe"},
+                },
             ],
             "total_size": 1,
             "page_num": 0,
-            "page_size": 50
+            "page_size": 50,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
         result = await search_objects("name:John", limit=50)
 
-        # Verify the result is valid JSON
+        # Verify the result is valid JSON with new format
         parsed_result = json.loads(result)
-        assert len(parsed_result) == 1
+        assert parsed_result["results"] == ["people/john-doe"]
+        assert parsed_result["page_size"] == 50
 
         # Verify the client was called with custom limit
-        mock_client.find.assert_called_once_with("name:John", object_type=None, page_size=50, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "name:John", object_type=None, page_size=50, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_with_all_parameters(self, mock_client):
+    async def test_search_objects_with_all_parameters(self, mock_client: Any) -> None:
         """Test object search with all parameters."""
         mock_search_result = {
             "results": [
-                {"id": "documents/report-123", "type": "Document", "content": {"title": "Report"}},
+                {
+                    "id": "documents/report-123",
+                    "type": "Document",
+                    "content": {"title": "Report"},
+                },
             ],
             "total_size": 1,
             "page_num": 0,
-            "page_size": 25
+            "page_size": 25,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
@@ -375,20 +496,22 @@ class TestSearchObjects:
 
         # Verify the result is valid JSON
         parsed_result = json.loads(result)
-        assert len(parsed_result) == 1
+        assert parsed_result["results"] == ["documents/report-123"]
-        assert parsed_result[0]["type"] == "Document"
+        assert parsed_result["total_count"] == 1
 
         # Verify the client was called with all parameters
-        mock_client.find.assert_called_once_with("title:Report", object_type="Document", page_size=25, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "title:Report", object_type="Document", page_size=25, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_empty_results(self, mock_client):
+    async def test_search_objects_empty_results(self, mock_client: Any) -> None:
         """Test object search with no results."""
         mock_search_result = {
             "results": [],
             "total_size": 0,
             "page_num": 0,
-            "page_size": 1000
+            "page_size": 1000,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
@@ -396,12 +519,48 @@ class TestSearchObjects:
 
         # Verify the result is valid JSON with empty array
         parsed_result = json.loads(result)
-        assert parsed_result == []
+        assert parsed_result["results"] == []
+        assert parsed_result["total_count"] == 0
 
-        mock_client.find.assert_called_once_with("nonexistent:data", object_type=None, page_size=1, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "nonexistent:data", object_type=None, page_size=25, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_client_error(self, mock_client):
+    async def test_search_objects_with_slash_prefixed_properties(
+        self, mock_client: Any
+    ) -> None:
+        """Test object search with correct slash-prefixed property syntax."""
+        mock_search_result = {
+            "results": [
+                {
+                    "id": "reports/2024-annual",
+                    "type": "Document",
+                    "content": {"title": "Annual Report 2024"},
+                },
+            ],
+            "total_size": 1,
+            "page_num": 0,
+            "page_size": 25,
+        }
+        mock_client.find = AsyncMock(return_value=mock_search_result)
+
+        # Test with slash-prefixed property and nested property
+        result = await search_objects("/title:*report* AND /author/name:Daniel")
+
+        parsed_result = json.loads(result)
+        assert parsed_result["results"] == ["reports/2024-annual"]
+        assert parsed_result["total_count"] == 1
+
+        mock_client.find.assert_called_once_with(
+            "/title:*report* AND /author/name:Daniel",
+            object_type=None,
+            page_size=25,
+            page_num=0,
+        )
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_search_objects_client_error(self, mock_client: Any) -> None:
         """Test object search with client error."""
         mock_client.find = AsyncMock(side_effect=CordraClientError("Search failed"))
 
@@ -409,10 +568,12 @@ class TestSearchObjects:
             await search_objects("test:query")
 
         assert "Search failed:" in str(exc_info.value)
-        mock_client.find.assert_called_once_with("test:query", object_type=None, page_size=1, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "test:query", object_type=None, page_size=25, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_value_error(self, mock_client):
+    async def test_search_objects_value_error(self, mock_client: Any) -> None:
         """Test object search with value error."""
         mock_client.find = AsyncMock(side_effect=ValueError("Invalid query"))
 
@@ -420,10 +581,12 @@ class TestSearchObjects:
             await search_objects("invalid:query")
 
         assert "Invalid search parameters:" in str(exc_info.value)
-        mock_client.find.assert_called_once_with("invalid:query", object_type=None, page_size=1, page_num=0)
+        mock_client.find.assert_called_once_with(
+            "invalid:query", object_type=None, page_size=25, page_num=0
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_json_formatting(self, mock_client):
+    async def test_search_objects_json_formatting(self, mock_client: Any) -> None:
         """Test that search results are properly formatted as JSON."""
         mock_search_result = {
             "results": [
@@ -431,7 +594,7 @@ class TestSearchObjects:
             ],
             "total_size": 1,
             "page_num": 0,
-            "page_size": 1000
+            "page_size": 1000,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
@@ -439,58 +602,71 @@ class TestSearchObjects:
 
         # Verify it's valid JSON with proper indentation
         parsed_result = json.loads(result)
-        assert isinstance(parsed_result, list)
+        assert isinstance(parsed_result, dict)
 
         # Check that the result contains indentation (pretty-printed)
         assert "  " in result  # Should have 2-space indentation
 
         # Verify the content is correctly formatted
-        assert parsed_result[0]["id"] == "test/object"
+        assert parsed_result["results"] == ["test/object"]
-        assert parsed_result[0]["type"] == "Test"
+        assert parsed_result["total_count"] == 1
-        assert parsed_result[0]["content"]["data"] == "value"
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_with_page_num(self, mock_client):
+    async def test_search_objects_with_page_num(self, mock_client: Any) -> None:
         """Test object search with page number parameter."""
         mock_search_result = {
             "results": [
-                {"id": "documents/doc-21", "type": "Document", "content": {"title": "Page 2 Doc"}},
+                {
+                    "id": "documents/doc-21",
+                    "type": "Document",
+                    "content": {"title": "Page 2 Doc"},
+                },
             ],
             "total_size": 50,
             "page_num": 1,
-            "page_size": 20
+            "page_size": 20,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
         await search_objects("type:Document", page_num=1)
 
         # Verify the client was called with correct page number
-        mock_client.find.assert_called_once_with("type:Document", object_type=None, page_size=1, page_num=1)
+        mock_client.find.assert_called_once_with(
+            "type:Document", object_type=None, page_size=25, page_num=1
+        )
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_search_objects_with_all_pagination_params(self, mock_client):
+    async def test_search_objects_with_all_pagination_params(
+        self, mock_client: Any
+    ) -> None:
         """Test object search with all pagination parameters."""
         mock_search_result = {
             "results": [
-                {"id": "reports/report-51", "type": "Report", "content": {"title": "Report 51"}},
+                {
+                    "id": "reports/report-51",
+                    "type": "Report",
+                    "content": {"title": "Report 51"},
+                },
             ],
             "total_size": 100,
             "page_num": 5,
-            "page_size": 10
+            "page_size": 10,
         }
         mock_client.find = AsyncMock(return_value=mock_search_result)
 
         await search_objects("type:Report", type="Report", limit=10, page_num=5)
 
         # Verify the client was called with all parameters
-        mock_client.find.assert_called_once_with("type:Report", object_type="Report", page_size=10, page_num=5)
+        mock_client.find.assert_called_once_with(
+            "type:Report", object_type="Report", page_size=10, page_num=5
+        )
 
 
 class TestGetCordraDesign:
     """Test the get_cordra_design resource handler."""
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_design_success(self, mock_client):
+    async def test_get_design_success(self, mock_client: Any) -> None:
         """Test successful design object retrieval."""
         mock_design = DigitalObject(
             id="design",
@@ -498,9 +674,9 @@ class TestGetCordraDesign:
             content={
                 "types": {"User": {}, "Project": {}},
                 "workflows": {},
-                "systemConfig": {"serverName": "test-cordra"}
+                "systemConfig": {"serverName": "test-cordra"},
             },
-            metadata={"created": "2023-01-01", "modified": "2023-06-15"}
+            metadata={"created": "2023-01-01", "modified": "2023-06-15"},
         )
         mock_client.get_design = AsyncMock(return_value=mock_design)
 
@@ -517,8 +693,8 @@ class TestGetCordraDesign:
         # Verify the client was called
         mock_client.get_design.assert_called_once()
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_design_not_found(self, mock_client):
+    async def test_get_design_not_found(self, mock_client: Any) -> None:
         """Test design object not found exception."""
         mock_client.get_design = AsyncMock(
             side_effect=CordraNotFoundError("Design object not found")
@@ -530,8 +706,8 @@ class TestGetCordraDesign:
         assert "Design object not found" in str(exc_info.value)
         mock_client.get_design.assert_called_once()
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_design_authentication_error(self, mock_client):
+    async def test_get_design_authentication_error(self, mock_client: Any) -> None:
         """Test design object authentication error."""
         mock_client.get_design = AsyncMock(
             side_effect=CordraAuthenticationError("Authentication failed")
@@ -543,8 +719,8 @@ class TestGetCordraDesign:
         assert "Authentication failed" in str(exc_info.value)
         mock_client.get_design.assert_called_once()
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_design_client_error(self, mock_client):
+    async def test_get_design_client_error(self, mock_client: Any) -> None:
         """Test design object general client error."""
         mock_client.get_design = AsyncMock(
             side_effect=CordraClientError("Connection failed")
@@ -557,14 +733,14 @@ class TestGetCordraDesign:
         assert "Connection failed" in str(exc_info.value)
         mock_client.get_design.assert_called_once()
 
-    @patch('cordra_mcp.server.cordra_client')
+    @patch("cordra_mcp.server.cordra_client")
-    async def test_get_design_json_formatting(self, mock_client):
+    async def test_get_design_json_formatting(self, mock_client: Any) -> None:
         """Test that the design object is properly formatted as JSON."""
         mock_design = DigitalObject(
             id="design",
             type="CordraDesign",
             content={"data": "value"},
-            metadata={"created": "2023-01-01"}
+            metadata={"created": "2023-01-01"},
         )
         mock_client.get_design = AsyncMock(return_value=mock_design)
 
@@ -582,3 +758,110 @@ class TestGetCordraDesign:
         assert "type" in parsed_result
         assert "content" in parsed_result
         assert "metadata" in parsed_result
+
+
+class TestCountObjects:
+    """Test the count_objects tool."""
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_count_objects_success(self, mock_client: Any) -> None:
+        """Test successful object count."""
+        mock_search_result = {
+            "results": [{"id": "people/john-doe", "type": "Person"}],
+            "total_size": 42,
+            "page_num": 0,
+            "page_size": 1,
+        }
+        mock_client.find = AsyncMock(return_value=mock_search_result)
+
+        result = await count_objects("name:John")
+
+        # Verify the result is a string representation of the count
+        assert result == "42"
+
+        # Verify the client was called with correct parameters
+        mock_client.find.assert_called_once_with(
+            "name:John", object_type=None, page_size=1, page_num=0
+        )
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_count_objects_with_type_filter(self, mock_client: Any) -> None:
+        """Test object count with type filter."""
+        mock_search_result = {
+            "results": [{"id": "people/john-doe", "type": "Person"}],
+            "total_size": 15,
+            "page_num": 0,
+            "page_size": 1,
+        }
+        mock_client.find = AsyncMock(return_value=mock_search_result)
+
+        result = await count_objects("name:John", type="Person")
+
+        # Verify the result is a string representation of the count
+        assert result == "15"
+
+        # Verify the client was called with type filter
+        mock_client.find.assert_called_once_with(
+            "name:John", object_type="Person", page_size=1, page_num=0
+        )
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_count_objects_zero_results(self, mock_client: Any) -> None:
+        """Test object count with zero results."""
+        mock_search_result = {
+            "results": [],
+            "total_size": 0,
+            "page_num": 0,
+            "page_size": 1,
+        }
+        mock_client.find = AsyncMock(return_value=mock_search_result)
+
+        result = await count_objects("nonexistent:data")
+
+        # Verify the result is "0"
+        assert result == "0"
+
+        mock_client.find.assert_called_once_with(
+            "nonexistent:data", object_type=None, page_size=1, page_num=0
+        )
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_count_objects_client_error(self, mock_client: Any) -> None:
+        """Test object count with client error."""
+        mock_client.find = AsyncMock(side_effect=CordraClientError("Search failed"))
+
+        with pytest.raises(RuntimeError) as exc_info:
+            await count_objects("test:query")
+
+        assert "Count failed:" in str(exc_info.value)
+        mock_client.find.assert_called_once_with(
+            "test:query", object_type=None, page_size=1, page_num=0
+        )
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_count_objects_value_error(self, mock_client: Any) -> None:
+        """Test object count with value error."""
+        mock_client.find = AsyncMock(side_effect=ValueError("Invalid query"))
+
+        with pytest.raises(RuntimeError) as exc_info:
+            await count_objects("invalid:query")
+
+        assert "Invalid search parameters:" in str(exc_info.value)
+        mock_client.find.assert_called_once_with(
+            "invalid:query", object_type=None, page_size=1, page_num=0
+        )
+
+    @patch("cordra_mcp.server.cordra_client")
+    async def test_count_objects_authentication_error(self, mock_client: Any) -> None:
+        """Test object count with authentication error."""
+        mock_client.find = AsyncMock(
+            side_effect=CordraAuthenticationError("Authentication failed")
+        )
+
+        with pytest.raises(RuntimeError) as exc_info:
+            await count_objects("test:query")
+
+        assert "Authentication failed:" in str(exc_info.value)
+        mock_client.find.assert_called_once_with(
+            "test:query", object_type=None, page_size=1, page_num=0
+        )

uv.lock

@@ -113,7 +113,7 @@ wheels = [
 
 [[package]]
 name = "cordra-mcp"
-version = "1.1.1"
+version = "1.3.2"
 source = { editable = "." }
 dependencies = [
     { name = "mcp", extra = ["cli"] },